Sorry Lars. That was a mistake - it wasn't meant to go directly back
into trunk but rather to my own branch. Got confused with mirroring
trunk and pulling ands pushing. Anyway I fixed the build and all
tests are passing. Please take a look. If its ok we can leave it
where it is is.
Main points:
staxwax is back in src (but still org.amplecode)
dxf import has converter separated out from it.
We are still using cave process so nothing fundamental should be different.
Cheers
Bob
···
---------- Forwarded message ----------
From: Bob Jolliffe <bobjolliffe@gmail.com>
Date: 2010/2/15
Subject: Fwd: [Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev
1427: brought staxwax src back into dhis, implemented transformer, uri
resolver and xml event pipe.
To: Lars Helge Øverland <larshelge@gmail.com>
---------- Forwarded message ----------
From: <noreply@launchpad.net>
Date: 14 February 2010 16:00
Subject: [Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1427:
brought staxwax src back into dhis, implemented transformer, uri
resolver and xml event pipe.
To: DHIS 2 developers <dhis2-devs@lists.launchpad.net>
------------------------------------------------------------
revno: 1427
committer: Bob Jolliffe <bobj@bobj-laptop>
branch nick: trunk
timestamp: Sun 2010-02-14 15:55:41 +0000
message:
brought staxwax src back into dhis, implemented transformer, uri
resolver and xml event pipe.
implemented locationmanager based uri resolver for xslt
Refactoreed dxf import - separation of dxf converter class
implemented logging xslt error handler
added:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/external/location/LocationManagerResolver.java
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/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/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/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/XMLConverter.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/pom.xml
dhis-2/pom.xml
The size of the diff (5116 lines) is larger than your specified limit
of 1000 lines
--
lp:dhis2
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\.
_______________________________________________
Mailing list: DHIS 2 developers in Launchpad
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : DHIS 2 developers in Launchpad
More help : ListHelp - Launchpad Help