dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5465
committer: Bob Jolliffe bobjolliffe@xxxxxxxxx
branch nick: dhis2
timestamp: Sun 2011-12-18 21:21:20 +0000
message:
  Bumped new minor version of dxf v1
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DXFConverter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/exporter/DefaultDXFExportService.java


--
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/dxf/converter/DXFConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DXFConverter.java	2011-07-13 11:32:13 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DXFConverter.java	2011-12-18 21:21:20 +0000
@@ -145,6 +145,8 @@
 
     public static final String MINOR_VERSION_12 = "1.2";
 
+    public static final String MINOR_VERSION_121 = "1.2.1";
+
     private final Log log = LogFactory.getLog( DXFConverter.class );
 
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/exporter/DefaultDXFExportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/exporter/DefaultDXFExportService.java	2011-07-13 11:32:13 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/exporter/DefaultDXFExportService.java	2011-12-18 21:21:20 +0000
@@ -31,7 +31,7 @@
 import static org.hisp.dhis.importexport.dxf.converter.DXFConverter.ATTRIBUTE_EXPORTED;
 import static org.hisp.dhis.importexport.dxf.converter.DXFConverter.ATTRIBUTE_MINOR_VERSION;
 import static org.hisp.dhis.importexport.dxf.converter.DXFConverter.DXFROOT;
-import static org.hisp.dhis.importexport.dxf.converter.DXFConverter.MINOR_VERSION_12;
+import static org.hisp.dhis.importexport.dxf.converter.DXFConverter.MINOR_VERSION_121;
 import static org.hisp.dhis.importexport.dxf.converter.DXFConverter.NAMESPACE_10;
 
 import java.io.BufferedInputStream;
@@ -274,7 +274,7 @@
             // Writes to one end of the pipe
             // -----------------------------------------------------------------
 
-            String[] rootProperties = { ATTRIBUTE_NAMESPACE, NAMESPACE_10, ATTRIBUTE_MINOR_VERSION, MINOR_VERSION_12,
+            String[] rootProperties = { ATTRIBUTE_NAMESPACE, NAMESPACE_10, ATTRIBUTE_MINOR_VERSION, MINOR_VERSION_121,
                 ATTRIBUTE_EXPORTED, DateUtils.getMediumDateString() };
 
             ExportPipeThread thread = new ExportPipeThread( sessionFactory );