dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1961
committer: Lars <larshelg@larshelg-laptop>
branch nick: trunk
timestamp: Thu 2010-06-03 19:21:57 +0200
message:
  Using latest version 1.1 of DXF for transformed import files
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/importer/DefaultXMLImportService.java
  dhis-2/dhis-services/dhis-service-importexport/src/test/resources/changeroot.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/importer/DefaultXMLImportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/importer/DefaultXMLImportService.java	2010-05-25 12:10:26 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/importer/DefaultXMLImportService.java	2010-06-03 17:21:57 +0000
@@ -201,7 +201,7 @@
             dxfReader = new DefaultXMLEventReader( (XMLEventReader2) pipeoutput ); // Set dxfReader to output of pipe
             
             params.setNamespace( NAMESPACE_10 ); // Use default namespace and version, should be upgraded as we go
-            params.setMinorVersion( MINOR_VERSION_10 );
+            params.setMinorVersion( MINOR_VERSION_11 );
         }
 
         // ---------------------------------------------------------------------

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/resources/changeroot.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/test/resources/changeroot.xml	2010-02-19 18:38:02 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/test/resources/changeroot.xml	2010-06-03 17:21:57 +0000
@@ -420,6 +420,10 @@
             <active>true</active>
             <comment>CommentA</comment>
             <geoCode>GeoCode</geoCode>
+            <feature type="Polygon">
+              <coordinates>11.11,22.22 33.33,44.44 55.55,66.66</coordinates>
+            </feature>
+            <lastUpdated>2010-01-01</lastUpdated>
         </organisationUnit>
         <organisationUnit>
             <id>66</id>
@@ -432,6 +436,10 @@
             <active>true</active>
             <comment>CommentB</comment>
             <geoCode>GeoCode</geoCode>
+            <feature type="Polygon">
+              <coordinates>11.11,22.22 33.33,44.44 55.55,66.66</coordinates>
+            </feature>
+            <lastUpdated>2010-01-01</lastUpdated>
         </organisationUnit>
         <organisationUnit>
             <id>67</id>
@@ -444,6 +452,10 @@
             <active>true</active>
             <comment>CommentC</comment>
             <geoCode>GeoCode</geoCode>
+            <feature type="Polygon">
+              <coordinates>11.11,22.22 33.33,44.44 55.55,66.66</coordinates>
+            </feature>
+            <lastUpdated>2010-01-01</lastUpdated>
         </organisationUnit>
     </organisationUnits>
     <organisationUnitRelationships>