Merge authors:
Bob Jolliffe (bobjolliffe)
revision-diff.txt (82.9 KB)
···
------------------------------------------------------------
revno: 6604 [merge]
committer: Bob Jolliffe <bobjolliffe@gmail.com>
branch nick: dhis2
timestamp: Mon 2012-04-16 16:12:08 +0100
message:
apache camel based integration service - WIP
added:
dhis-2/dhis-services/dhis-service-integration/
dhis-2/dhis-services/dhis-service-integration/pom.xml
dhis-2/dhis-services/dhis-service-integration/src/
dhis-2/dhis-services/dhis-service-integration/src/main/
dhis-2/dhis-services/dhis-service-integration/src/main/java/
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/components/
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/components/Dxf2Component.java
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/components/Dxf2DataEndpoint.java
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/components/Dxf2DataProducer.java
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/components/Dxf2MetaDataEndpoint.java
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/components/Dxf2MetaDataProducer.java
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/converters/
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/converters/XMLConverterWrappers.java
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/management/
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/management/DHIS2LifecycleStrategy.java
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/routes/
dhis-2/dhis-services/dhis-service-integration/src/main/resources/
dhis-2/dhis-services/dhis-service-integration/src/main/resources/META-INF/
dhis-2/dhis-services/dhis-service-integration/src/main/resources/META-INF/dhis/
dhis-2/dhis-services/dhis-service-integration/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-integration/src/main/resources/META-INF/services/
dhis-2/dhis-services/dhis-service-integration/src/main/resources/META-INF/services/org/
dhis-2/dhis-services/dhis-service-integration/src/main/resources/META-INF/services/org/apache/
dhis-2/dhis-services/dhis-service-integration/src/main/resources/META-INF/services/org/apache/camel/
dhis-2/dhis-services/dhis-service-integration/src/main/resources/META-INF/services/org/apache/camel/component/
dhis-2/dhis-services/dhis-service-integration/src/main/resources/META-INF/services/org/apache/camel/component/dhis2
dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform/
dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform/cross2dxf.xsl
dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform/cross2dxf2.xsl
dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform/gml2dxf.xsl
dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform/imr2dxf.xsl
dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform/transforms.xml
dhis-2/dhis-services/dhis-service-integration/src/test/
dhis-2/dhis-services/dhis-service-integration/src/test/java/
dhis-2/dhis-services/dhis-service-integration/src/test/java/org/
dhis-2/dhis-services/dhis-service-integration/src/test/java/org/hisp/
dhis-2/dhis-services/dhis-service-integration/src/test/java/org/hisp/dhis/
dhis-2/dhis-services/dhis-service-integration/src/test/java/org/hisp/dhis/integration/
dhis-2/dhis-services/dhis-service-integration/src/test/java/org/hisp/dhis/integration/dxf2/
dhis-2/dhis-services/dhis-service-integration/src/test/java/org/hisp/dhis/integration/dxf2/Dxf2ComponentTest.java
dhis-2/dhis-services/dhis-service-integration/src/test/resources/
dhis-2/dhis-services/dhis-service-integration/src/test/resources/test-context.xml
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/integration/
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/integration/AddRouteAction.java
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/integration/DisplayRoutesAction.java
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/integration/ShowAddRouteFormAction.java
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/displayRoutes.vm
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/routes.js
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/showAddRouteForm.vm
modified:
dhis-2/dhis-services/pom.xml
dhis-2/dhis-web/dhis-web-importexport/pom.xml
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/index.vm
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/mainMenu.vm
dhis-2/pom.xml
--
lp:dhis2
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to OpenID transaction in progress