← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1455: Implemented xslt transform on import. Detail:

 

------------------------------------------------------------
revno: 1455
committer: Bob Jolliffe <bobj@bobj-laptop>
branch nick: trunk
timestamp: Fri 2010-02-19 18:38:02 +0000
message:
  Implemented xslt transform on import.  Detail:
  
  1. implemented extended staxwax from amplecode as dhis-service-xml
  2. separated dxf convertor from importer
  3. transparent test on import for zip, gzip or uncompressed streams
  4. import of xml other than dxf will trigger transform to dxf if one is available
  5. improved import error reporting to UI - failed import will indicate failed import.
added:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/external/location/LocationManagerResolver.java
  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/xml/
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/importer/
  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
  dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.xml
  dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.xml.gz
  dhis-2/dhis-services/dhis-service-importexport/src/test/resources/formattedCSDS2.xml
  dhis-2/dhis-services/dhis-service-xml/
  dhis-2/dhis-services/dhis-service-xml/pom.xml
  dhis-2/dhis-services/dhis-service-xml/src/
  dhis-2/dhis-services/dhis-service-xml/src/main/
  dhis-2/dhis-services/dhis-service-xml/src/main/java/
  dhis-2/dhis-services/dhis-service-xml/src/main/java/org/
  dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/
  dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/
  dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/factory/
  dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/factory/XMLFactory.java
  dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/framework/
  dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/framework/InputPort.java
  dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/framework/OutputPort.java
  dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/framework/XMLPipe.java
  dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/framework/XPathFilter.java
  dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/reader/
  dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/reader/DefaultXMLEventReader.java
  dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/reader/DefaultXMLStreamReader.java
  dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/reader/XMLReader.java
  dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/transformer/
  dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/transformer/LoggingErrorListener.java
  dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/transformer/TransformerTask.java
  dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/writer/
  dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/writer/DefaultIndentingXMLStreamWriter.java
  dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/writer/DefaultLineBreakingXMLStreamWriter.java
  dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/writer/DefaultXMLStreamWriter.java
  dhis-2/dhis-services/dhis-service-xml/src/main/java/org/amplecode/staxwax/writer/XMLWriter.java
  dhis-2/dhis-services/dhis-service-xml/src/main/resources/
  dhis-2/dhis-services/dhis-service-xml/src/main/resources/META-INF/
  dhis-2/dhis-services/dhis-service-xml/src/main/resources/META-INF/dhis/
  dhis-2/dhis-services/dhis-service-xml/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-services/dhis-service-xml/src/test/
  dhis-2/dhis-services/dhis-service-xml/src/test/java/
  dhis-2/dhis-services/dhis-service-xml/src/test/java/org/
  dhis-2/dhis-services/dhis-service-xml/src/test/java/org/amplecode/
  dhis-2/dhis-services/dhis-service-xml/src/test/java/org/amplecode/staxwax/
  dhis-2/dhis-services/dhis-service-xml/src/test/java/org/amplecode/staxwax/framework/
  dhis-2/dhis-services/dhis-service-xml/src/test/java/org/amplecode/staxwax/framework/XMLPipeTest.java
  dhis-2/dhis-services/dhis-service-xml/src/test/java/org/amplecode/staxwax/framework/XPathFilterTest.java
  dhis-2/dhis-services/dhis-service-xml/src/test/java/org/amplecode/staxwax/reader/
  dhis-2/dhis-services/dhis-service-xml/src/test/java/org/amplecode/staxwax/reader/XMLReaderTest.java
  dhis-2/dhis-services/dhis-service-xml/src/test/java/org/amplecode/staxwax/transformer/
  dhis-2/dhis-services/dhis-service-xml/src/test/java/org/amplecode/staxwax/transformer/TransformerTaskTest.java
  dhis-2/dhis-services/dhis-service-xml/src/test/java/org/amplecode/staxwax/writer/
  dhis-2/dhis-services/dhis-service-xml/src/test/java/org/amplecode/staxwax/writer/XMLWriterTest.java
  dhis-2/dhis-services/dhis-service-xml/src/test/resources/
  dhis-2/dhis-services/dhis-service-xml/src/test/resources/dataA.xml
  dhis-2/dhis-services/dhis-service-xml/src/test/resources/dataB.rng
  dhis-2/dhis-services/dhis-service-xml/src/test/resources/dataB.xml
  dhis-2/dhis-services/dhis-service-xml/src/test/resources/dataC.xml
  dhis-2/dhis-services/dhis-service-xml/src/test/resources/transform.xsl
  dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/location/DefaultLocationManagerResolver.java
modified:
  dhis-2/dhis-services/dhis-service-importexport/pom.xml
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ImportInternalProcess.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ImportPreviewInternalProcess.java
  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/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dxf/DXFImportServiceTest.java
  dhis-2/dhis-services/pom.xml
  dhis-2/dhis-support/dhis-support-external/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-dashboard-integration/pom.xml
  dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/ImportAction.java
  dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties
  dhis-2/pom.xml
The size of the diff (9345 lines) is larger than your specified limit of 1000 lines

--
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.