Upgrade to Okapi 0.22; remove workaround for https://code.google.com/…

…p/okapi/issues/detail?id=342

pom.xml

@@ -30,7 +30,7 @@
       <lucene.version>3.5.0</lucene.version>
       <seam.version>2.3.0.Final</seam.version>
       <gwteventservice.version>1.2.1</gwteventservice.version>
-      <okapi.version>0.21</okapi.version>
+      <okapi.version>0.22</okapi.version>
 
       <zanata.api.version>3.0.1-SNAPSHOT</zanata.api.version>
       <!-- This should always be the previous version of the used api version above -->

zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java

@@ -22,6 +22,7 @@
 package org.zanata.rest.service;
 
 import lombok.extern.slf4j.Slf4j;
+import net.sf.okapi.common.filterwriter.TMXWriter;
 import net.sf.okapi.common.resource.ITextUnit;
 import net.sf.okapi.common.resource.TextFragment;
 import net.sf.okapi.common.resource.TextUnit;
@@ -56,7 +57,7 @@ public ExportTUStrategy(LocaleId localeId)
     * @param tuidPrefix String to be prepended to all resIds when generating tuids
     * @param tf the SourceContents (TextFlow) whose contents and translations are to be exported
     */
-   public void exportTranslationUnit(ZanataTMXWriter tmxWriter, SourceContents tf, net.sf.okapi.common.LocaleId sourceLocaleId)
+   public void exportTranslationUnit(TMXWriter tmxWriter, SourceContents tf, net.sf.okapi.common.LocaleId sourceLocaleId)
    {
       String tuid = tf.getQualifiedId();
       // Perhaps we could encode plurals using TMX attributes?

zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java

@@ -35,6 +35,7 @@
 
 import lombok.Cleanup;
 import net.sf.okapi.common.XMLWriter;
+import net.sf.okapi.common.filterwriter.TMXWriter;
 
 import org.zanata.common.LocaleId;
 import org.zanata.model.SourceContents;
@@ -83,7 +84,7 @@ public void write(OutputStream output) throws IOException, WebApplicationExcepti
       @Cleanup
       XMLWriter xmlWriter = new XMLWriter(writer);
       @Cleanup
-      ZanataTMXWriter tmxWriter = new ZanataTMXWriter(xmlWriter);
+      TMXWriter tmxWriter = new TMXWriter(xmlWriter);
       String segType = "block"; // TODO other segmentation types
       String dataType = "unknown"; // TODO track data type metadata throughout the system
 

zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java

@@ -195,6 +195,7 @@ private Document writeToXmlWithValidation(StreamingOutput output) throws IOExcep
       output.write(writerOutputStream);
       writerOutputStream.close();
       String xml = sbWriter.toString();
+      System.out.println(xml);
       assertValidTMX(xml);
       Document doc = XMLUnit.buildControlDocument(xml);
       return doc;