dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 943
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Fri 2009-10-30 20:08:52 +0100
message:
  Put struts dependency back into root pom.
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/importer/DefaultDXFImportService.java
  dhis-2/pom.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/dxf/importer/DefaultDXFImportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/importer/DefaultDXFImportService.java	2009-10-30 18:20:30 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/importer/DefaultDXFImportService.java	2009-10-30 19:08:52 +0000
@@ -350,29 +350,33 @@
 
         // move to root element
         reader.next();
-	
+
         if ( reader.isStartElement( ROOT_NAME ) )
-	    {
-		if (reader.getXmlStreamReader().getNamespaceURI() ==  DXF2_NAMESPACE_URI)
-		    {
-			dxfVersion = 2;
-			log.info("parsing dxf version "+dxfVersion);
-			try {
-			    V2Parser v2parser = new V2Parser();
-			    
-			    v2parser.getMetadata(reader.getXmlStreamReader());
-			    v2parser.getDataValues(reader.getXmlStreamReader());
-			} catch (javax.xml.bind.JAXBException ex) {
-			    log.info("Parsing error: " + ex);
-			    // report something to GUI ....
-			}
-		    }
-		else
-		    {
-			dxfVersion = 1;
-			parseDXFv1(params, reader);
-		    }
-	    }
+        {
+            if ( reader.getXmlStreamReader().getNamespaceURI() == DXF2_NAMESPACE_URI )
+            {
+                dxfVersion = 2;
+                log.info( "parsing dxf version " + dxfVersion );
+                
+                try
+                {
+                    V2Parser v2parser = new V2Parser();
+
+                    v2parser.getMetadata( reader.getXmlStreamReader() );
+                    v2parser.getDataValues( reader.getXmlStreamReader() );
+                }
+                catch ( javax.xml.bind.JAXBException ex )
+                {
+                    log.info( "Parsing error: " + ex );
+                    // report something to GUI ....
+                }
+            }
+            else
+            {
+                dxfVersion = 1;
+                parseDXFv1( params, reader );
+            }
+        }
 
         // setMessage( "import_process_done" );
 

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2009-10-30 18:20:30 +0000
+++ dhis-2/pom.xml	2009-10-30 19:08:52 +0000
@@ -229,6 +229,11 @@
       <!--Other -->
       <dependency>
         <groupId>org.apache.struts</groupId>
+        <artifactId>struts2-core</artifactId>
+        <version>2.1.6</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.struts</groupId>
         <artifactId>struts2-spring-plugin</artifactId>
         <version>2.1.6</version>
       </dependency>