dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #25097
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12367: Removed integration service module
------------------------------------------------------------
revno: 12367
committer: Bob Jolliffe <bobjolliffe@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-10-01 16:59:23 +0100
message:
Removed integration service module
Added dependency to servlet-api on web modules which refused to build
removed:
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/DefaultIntegrationService.java
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/IntegrationService.java
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/java/org/hisp/dhis/integration/routes/SDMXDataIn.java
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/routes/XMLDataIn.java
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/RoutesTest.java
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/data/
dhis-2/dhis-services/dhis-service-integration/src/test/resources/data/dataValueSetA.xml
dhis-2/dhis-services/dhis-service-integration/src/test/resources/data/sdmx_test.xml
dhis-2/dhis-services/dhis-service-integration/src/test/resources/log4j.properties
dhis-2/dhis-services/dhis-service-integration/src/test/resources/test-context.xml
modified:
dhis-2/dhis-services/dhis-service-dxf2/pom.xml
dhis-2/dhis-services/pom.xml
dhis-2/dhis-web/dhis-web-api-fred/pom.xml
dhis-2/dhis-web/dhis-web-dashboard-integration/pom.xml
dhis-2/dhis-web/dhis-web-importexport/pom.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/pom.xml
dhis-2/dhis-web/dhis-web-mobile/pom.xml
dhis-2/dhis-web/dhis-web-visualizer/pom.xml
dhis-2/pom.xml
local/ke/mfl2dxf2/src/main/java/org/hisp/dhis/integration/routes/MFLTransformRoute.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-dxf2/pom.xml'
--- dhis-2/dhis-services/dhis-service-dxf2/pom.xml 2013-08-22 13:19:57 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/pom.xml 2013-10-01 15:59:23 +0000
@@ -51,7 +51,6 @@
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
</dependency>
-
</dependencies>
<properties>
=== removed directory 'dhis-2/dhis-services/dhis-service-integration'
=== removed file 'dhis-2/dhis-services/dhis-service-integration/pom.xml'
--- dhis-2/dhis-services/dhis-service-integration/pom.xml 2013-08-22 13:19:57 +0000
+++ dhis-2/dhis-services/dhis-service-integration/pom.xml 1970-01-01 00:00:00 +0000
@@ -1,79 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-services</artifactId>
- <version>2.13-SNAPSHOT</version>
- </parent>
-
- <artifactId>dhis-service-integration</artifactId>
- <packaging>jar</packaging>
- <name>DHIS Integration Service</name>
-
- <dependencies>
-
- <!-- DHIS -->
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-dxf2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-core</artifactId>
- </dependency>
-
- <!-- Jaxb -->
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
-
- <!-- Camel core -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- </dependency>
-
- <!-- Camel components -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-mail</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-http</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-quartz</artifactId>
- </dependency>
-
- <!-- for testing -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <version>2.9.1</version>
- <scope>test</scope>
- </dependency>
-
-
- </dependencies>
- <properties>
- <rootDir>../../</rootDir>
- </properties>
-</project>
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src'
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/main'
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/main/java'
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/main/java/org'
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp'
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis'
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration'
=== removed file 'dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/DefaultIntegrationService.java'
--- dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/DefaultIntegrationService.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/DefaultIntegrationService.java 1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-package org.hisp.dhis.integration;
-
-/*
- * Copyright (c) 2004-2013, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.camel.EndpointInject;
-import org.apache.camel.ProducerTemplate;
-import org.hisp.dhis.dxf2.importsummary.ImportSummary;
-import org.hisp.dhis.dxf2.metadata.ImportOptions;
-import org.hisp.dhis.integration.routes.SDMXDataIn;
-import org.hisp.dhis.integration.routes.XMLDataIn;
-import org.hisp.dhis.scheduling.TaskId;
-
-/**
- * @author bobj
- */
-public class DefaultIntegrationService
- implements IntegrationService
-{
- @EndpointInject( uri = XMLDataIn.XMLDATA_IN )
- private ProducerTemplate xmlIn;
-
- @EndpointInject( uri = SDMXDataIn.SDMXDATA_IN )
- private ProducerTemplate sdmxIn;
-
- @Override
- public ImportSummary importXMLDataValueSet( InputStream in, ImportOptions importOptions )
- {
- return (ImportSummary) xmlIn.requestBodyAndHeader( in, IMPORT_OPTIONS_HDR, importOptions );
- }
-
- @Override
- public ImportSummary importSDMXDataValueSet( InputStream in, ImportOptions importOptions )
- {
- return (ImportSummary) sdmxIn.requestBodyAndHeader( in, IMPORT_OPTIONS_HDR, importOptions );
- }
-
- @Override
- public ImportSummary importXMLDataValueSet( InputStream in, ImportOptions options, TaskId taskId )
- {
- Map<String, Object> headers = new HashMap<String, Object>();
- headers.put( TASK_ID_HDR, taskId );
- headers.put( IMPORT_OPTIONS_HDR, options );
-
- return (ImportSummary) xmlIn.requestBodyAndHeaders( in, headers );
- }
-
- @Override
- public ImportSummary importSDMXDataValueSet( InputStream in, ImportOptions options, TaskId taskId )
- {
- Map<String, Object> headers = new HashMap<String, Object>();
- headers.put( TASK_ID_HDR, taskId );
- headers.put( IMPORT_OPTIONS_HDR, options );
-
- return (ImportSummary) sdmxIn.requestBodyAndHeaders( in, headers );
- }
-}
=== removed file 'dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/IntegrationService.java'
--- dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/IntegrationService.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/IntegrationService.java 1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-package org.hisp.dhis.integration;
-
-/*
- * Copyright (c) 2004-2013, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.io.InputStream;
-import org.hisp.dhis.dxf2.importsummary.ImportSummary;
-import org.hisp.dhis.dxf2.metadata.ImportOptions;
-import org.hisp.dhis.scheduling.TaskId;
-
-/**
- *
- * @author bobj
- */
-public interface IntegrationService
-{
- public static final String IMPORT_OPTIONS_HDR = "ImportOptions";
-
- public static final String TASK_ID_HDR = "TASK_ID";
-
- ImportSummary importXMLDataValueSet( InputStream in, ImportOptions options );
-
- ImportSummary importSDMXDataValueSet( InputStream in, ImportOptions options );
-
- ImportSummary importXMLDataValueSet( InputStream in, ImportOptions options, TaskId taskId );
-
- ImportSummary importSDMXDataValueSet( InputStream in, ImportOptions options, TaskId taskId );
-}
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/components'
=== removed file '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/Dxf2Component.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/components/Dxf2Component.java 1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-package org.hisp.dhis.integration.components;
-
-/*
- * Copyright (c) 2004-2013, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import org.apache.camel.Endpoint;
-import org.apache.camel.impl.DefaultComponent;
-import org.hisp.dhis.dxf2.datavalueset.DataValueSetService;
-import org.hisp.dhis.dxf2.metadata.ImportService;
-import org.hisp.dhis.user.CurrentUserService;
-import org.hisp.dhis.user.User;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.Map;
-
-/**
- * A DHIS 2 specific camel component for creating dhis2 endpoints
- * <p/>
- * Two forms of uri are supported for the endpoints:
- * 1. uri="dhis2:metadata?<options>" creates a metadata endpoint for importing metadata
- * 2. uri="dhis2:data?<options>" creates a datavalueset endpoint for importing data
- * <p/>
- * See the respective endpoint classes for details of the options supported on each
- *
- * @author bobj
- */
-public class Dxf2Component
- extends DefaultComponent
-{
- public static final String DATA = "data";
-
- public static final String METADATA = "metadata";
-
- @Autowired
- private ImportService importService;
-
- @Autowired
- private DataValueSetService dataValueSetService;
-
- @Autowired
- private CurrentUserService currentUserService;
-
- @Override
- protected Endpoint createEndpoint( String uri, String remaining, Map<String, Object> parameters ) throws Exception
- {
- if ( !remaining.equals( DATA ) && !remaining.equals( METADATA ) )
- {
- throw new UnsupportedOperationException( "Invalid dhis2 uri part " + remaining );
- }
-
- User user = currentUserService == null ? null : currentUserService.getCurrentUser();
-
- Endpoint endpoint = remaining.equals( DATA ) ?
- new Dxf2DataEndpoint( user, uri, this, dataValueSetService ) :
- new Dxf2MetaDataEndpoint( user, uri, this, importService );
-
- setProperties( endpoint, parameters );
- return endpoint;
- }
-}
=== removed file '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/Dxf2DataEndpoint.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/components/Dxf2DataEndpoint.java 1970-01-01 00:00:00 +0000
@@ -1,115 +0,0 @@
-package org.hisp.dhis.integration.components;
-
-/*
- * Copyright (c) 2004-2013, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import org.apache.camel.Consumer;
-import org.apache.camel.Processor;
-import org.apache.camel.Producer;
-import org.apache.camel.impl.DefaultEndpoint;
-import org.hisp.dhis.dxf2.datavalueset.DataValueSetService;
-import org.hisp.dhis.dxf2.metadata.ImportOptions;
-import org.hisp.dhis.importexport.ImportStrategy;
-import org.hisp.dhis.user.User;
-
-/**
- * dataendpoint is created using a uri of the form:
- * dhis2:metadata?dryRun=true|false&importStrategy=NEW|NEW_AND_UPDATES|UPDATES
- *
- * @author bobj
- */
-public class Dxf2DataEndpoint
- extends DefaultEndpoint
-{
- protected DataValueSetService dataValueSetService;
-
- protected User user;
-
- public DataValueSetService getDataValueSetService()
- {
- return dataValueSetService;
- }
-
- // -------------------------------------------------------------------------
- // Parameters supported by this endpoint
- // -------------------------------------------------------------------------
-
- protected ImportOptions importOptions;
-
- public ImportOptions getImportOptions()
- {
- return importOptions;
- }
-
- public void setImportStrategy( ImportStrategy importStrategy )
- {
- importOptions.setImportStrategy( importStrategy.toString() );
- }
-
- public void setDryRun( Boolean dryRun )
- {
- importOptions.setDryRun( dryRun );
- }
-
- public void setDataElementIdScheme( String dataElementIdScheme )
- {
- importOptions.setDataElementIdScheme( dataElementIdScheme );
- }
-
- public void setOrgUnitIdScheme( String orgUnitIdScheme )
- {
- importOptions.setOrgUnitIdScheme( orgUnitIdScheme );
- }
-
- public Dxf2DataEndpoint( User user, String uri, Dxf2Component component, DataValueSetService dataValueSetService )
- {
- super( uri, component );
- this.importOptions = new ImportOptions();
- this.dataValueSetService = dataValueSetService;
- this.user = user;
- }
-
- @Override
- public Producer createProducer() throws Exception
- {
- return new Dxf2DataProducer( this );
- }
-
- @Override
- public Consumer createConsumer( Processor prcsr ) throws Exception
- {
- throw new UnsupportedOperationException(
- "You can't consume messages from this endpoint: " + getEndpointUri() );
- }
-
- @Override
- public boolean isSingleton()
- {
- return true;
- }
-}
=== removed file '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/Dxf2DataProducer.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/components/Dxf2DataProducer.java 1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-package org.hisp.dhis.integration.components;
-
-/*
- * Copyright (c) 2004-2013, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.io.InputStream;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.impl.DefaultProducer;
-import org.hisp.dhis.dxf2.importsummary.ImportSummary;
-import org.hisp.dhis.dxf2.metadata.ImportOptions;
-import org.hisp.dhis.dxf2.utils.JacksonUtils;
-import org.hisp.dhis.integration.IntegrationService;
-import org.hisp.dhis.scheduling.TaskId;
-
-/**
- * @author bobj
- */
-public class Dxf2DataProducer
- extends DefaultProducer
-{
- public Dxf2DataProducer( Dxf2DataEndpoint endpoint )
- {
- super( endpoint );
- }
-
- @Override
- public void process( Exchange exchange ) throws Exception
- {
- log.debug( this.getEndpoint().getEndpointUri() + " : " + exchange.getIn().getBody() );
-
- Dxf2DataEndpoint endpoint = (Dxf2DataEndpoint) this.getEndpoint();
-
- // get importOptions off the message header or default to options set on the end point
- ImportOptions options = (ImportOptions) exchange.getIn().
- getHeader( IntegrationService.IMPORT_OPTIONS_HDR, endpoint.getImportOptions() );
-
- TaskId taskId = (TaskId) exchange.getIn().getHeader( IntegrationService.TASK_ID_HDR );
-
- ImportSummary summary = endpoint.getDataValueSetService().saveDataValueSet( (InputStream)exchange.getIn().getBody(),
- options, taskId );
-
- exchange.getOut().setBody( summary );
- log.debug( this.getEndpoint().getEndpointUri() + " : " + JacksonUtils.toXmlAsString(exchange.getOut().getBody()) );
- }
-}
=== removed file '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/Dxf2MetaDataEndpoint.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/components/Dxf2MetaDataEndpoint.java 1970-01-01 00:00:00 +0000
@@ -1,104 +0,0 @@
-package org.hisp.dhis.integration.components;
-
-/*
- * Copyright (c) 2004-2013, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import org.apache.camel.Consumer;
-import org.apache.camel.Processor;
-import org.apache.camel.Producer;
-import org.apache.camel.impl.DefaultEndpoint;
-import org.hisp.dhis.dxf2.metadata.ImportOptions;
-import org.hisp.dhis.dxf2.metadata.ImportService;
-import org.hisp.dhis.user.User;
-
-/**
- * metadataendpoint is created using a uri of the form:
- * dhis2:metadata?dryRun=true|false
- *
- * @author bobj
- */
-public class Dxf2MetaDataEndpoint
- extends DefaultEndpoint
-{
- protected ImportService importService;
-
- protected User user;
-
- public ImportService getImportService()
- {
- return importService;
- }
-
- protected ImportOptions options;
-
- public ImportOptions getImportOptions()
- {
- return this.options;
- }
-
- // -------------------------------------------------------------------------
- // Parameters supported by this end point
- // -------------------------------------------------------------------------
-
- public void setDryRun( Boolean dryRun )
- {
- options.setDryRun( dryRun );
- }
-
- public void setStrategy( String strategy )
- {
- options.setStrategy( strategy );
- }
-
- public Dxf2MetaDataEndpoint( User user, String uri, Dxf2Component component, ImportService importService )
- {
- super( uri, component );
- this.importService = importService;
- this.options = new ImportOptions();
- this.user = user;
- }
-
- @Override
- public Producer createProducer() throws Exception
- {
- return new Dxf2MetaDataProducer( user, this );
- }
-
- @Override
- public Consumer createConsumer( Processor prcsr ) throws Exception
- {
- throw new UnsupportedOperationException(
- "You can't consume messages from this endpoint: " + getEndpointUri() );
- }
-
- @Override
- public boolean isSingleton()
- {
- return true;
- }
-}
=== removed file '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/components/Dxf2MetaDataProducer.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/components/Dxf2MetaDataProducer.java 1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-package org.hisp.dhis.integration.components;
-
-/*
- * Copyright (c) 2004-2013, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import org.apache.camel.Exchange;
-import org.apache.camel.impl.DefaultProducer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.hisp.dhis.dxf2.metadata.ImportSummary;
-import org.hisp.dhis.dxf2.metadata.MetaData;
-import org.hisp.dhis.dxf2.utils.JacksonUtils;
-import org.hisp.dhis.user.User;
-
-import java.io.InputStream;
-
-/**
- * @author bobj
- */
-public class Dxf2MetaDataProducer
- extends DefaultProducer
-{
- private static final Log log = LogFactory.getLog( Dxf2MetaDataProducer.class );
-
- private User user;
-
- public Dxf2MetaDataProducer( User user, Dxf2MetaDataEndpoint endpoint )
- {
- super( endpoint );
- this.user = user;
- }
-
- @Override
- public void process( Exchange exchange ) throws Exception
- {
- log.info( this.getEndpoint().getEndpointUri() + " : " + exchange.getIn().getBody() );
-
- Dxf2MetaDataEndpoint endpoint = (Dxf2MetaDataEndpoint) this.getEndpoint();
- MetaData metadata = JacksonUtils.fromXml( (InputStream) exchange.getIn().getBody(), MetaData.class );
-
- ImportSummary summary = endpoint.getImportService().importMetaData( user.getUid(), metadata, endpoint.getImportOptions() );
- exchange.getOut().setBody( JacksonUtils.toXmlAsString( summary ) );
- }
-}
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/converters'
=== removed file '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/converters/XMLConverterWrappers.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/converters/XMLConverterWrappers.java 1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-package org.hisp.dhis.integration.converters;
-
-/*
- * Copyright (c) 2004-2013, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.io.IOException;
-import java.io.InputStream;
-import org.apache.camel.Converter;
-import org.hisp.dhis.dxf2.metadata.MetaData;
-import org.hisp.dhis.dxf2.utils.JacksonUtils;
-
-/**
- * This class contains annotated static methods to allow various conversions between
- * dhis api objects and dxf2 representations within integration routes
- *
- * @author bobj
- */
-@Converter
-public class XMLConverterWrappers
-{
- @Converter
- public static MetaData toMetaData( InputStream inputStream )
- throws IOException
- {
- return JacksonUtils.fromXml( inputStream, MetaData.class );
- }
-}
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/management'
=== removed file '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/management/DHIS2LifecycleStrategy.java 2013-09-03 15:04:30 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/management/DHIS2LifecycleStrategy.java 1970-01-01 00:00:00 +0000
@@ -1,202 +0,0 @@
-package org.hisp.dhis.integration.management;
-
-/*
- * Copyright (c) 2004-2013, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.Collection;
-import java.util.concurrent.ThreadPoolExecutor;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Component;
-import org.apache.camel.Endpoint;
-import org.apache.camel.ErrorHandlerFactory;
-import org.apache.camel.Processor;
-import org.apache.camel.Route;
-import org.apache.camel.Service;
-import org.apache.camel.VetoCamelContextStartException;
-import org.apache.camel.model.RoutesDefinition;
-import org.apache.camel.spi.LifecycleStrategy;
-import org.apache.camel.spi.RouteContext;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.hisp.dhis.external.location.LocationManager;
-import org.hisp.dhis.external.location.LocationManagerException;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * @author bobj
- */
-public class DHIS2LifecycleStrategy
- implements LifecycleStrategy
-{
- private final Log log = LogFactory.getLog( DHIS2LifecycleStrategy.class );
-
- @Autowired
- private LocationManager locationManager;
-
- @Override
- public void onContextStart( CamelContext context )
- throws VetoCamelContextStartException
- {
- try
- {
- log.info( "Camel context started" );
-
- if ( locationManager == null )
- {
- throw new LocationManagerException( "No locationManager configured" );
- }
-
- File rootsDir = new File( locationManager.getExternalDirectory().getAbsolutePath() + "/routes/" );
-
- if ( !rootsDir.exists() )
- {
- rootsDir.mkdir();
- }
-
- log.info( "Searching for routes in directory: " + rootsDir.getAbsolutePath() );
-
- File[] routeFiles = rootsDir.listFiles();
-
- for ( File routeFile : routeFiles )
- {
- if ( routeFile != null && routeFile.getName().endsWith( ".xml" ) )
- {
- InputStream is = null;
- try
- {
- is = new FileInputStream( routeFile );
- RoutesDefinition routes = context.loadRoutesDefinition( is );
- context.addRouteDefinitions( routes.getRoutes() );
- log.info( "Loaded route from " + routeFile.getName() );
- }
- catch ( Exception ex )
- {
- log.info( "Unable to load routes from " + routeFile.getName() + " : " + ex.getMessage() );
- }
- finally
- {
- IOUtils.closeQuietly( is );
- }
- }
- }
- }
- catch ( LocationManagerException ex )
- {
- // no dhis2_home directory configured .. no routes to load ...
- log.info( "Not loading external routes from DHIS2_HOME" );
- }
- }
-
- @Override
- public void onContextStop( CamelContext cc )
- {
- log.info( "Camel context stopped" );
- }
-
- @Override
- public void onComponentAdd( String name, Component cmpnt )
- {
- log.debug( "Camel component added: " + name );
- }
-
- @Override
- public void onComponentRemove( String name, Component cmpnt )
- {
- log.debug( "Camel component removed: " + name );
- }
-
- @Override
- public void onEndpointAdd( Endpoint endpnt )
- {
- log.debug( "Camel endpoint added: " + endpnt.getEndpointUri() );
- }
-
- @Override
- public void onEndpointRemove( Endpoint endpnt )
- {
- log.debug( "Camel endpoint removed: " + endpnt.getEndpointUri() );
- }
-
- @Override
- public void onServiceAdd( CamelContext cc, Service srvc, Route route )
- {
- }
-
- @Override
- public void onServiceRemove( CamelContext cc, Service srvc, Route route )
- {
- }
-
- @Override
- public void onRoutesAdd( Collection<Route> clctn )
- {
- log.debug( "Camel routes added" );
- }
-
- @Override
- public void onRoutesRemove( Collection<Route> clctn )
- {
- log.debug( "Camel routes removed" );
- }
-
- @Override
- public void onRouteContextCreate( RouteContext rc )
- {
- log.debug( "Camel route context created" );
- }
-
- @Override
- public void onErrorHandlerAdd( RouteContext rc, Processor prcsr, ErrorHandlerFactory ehf )
- {
- log.debug( "Camel error handler added: " + ehf.toString() );
- }
-
- @Override
- public void onErrorHandlerRemove( RouteContext routeContext, Processor errorHandler, ErrorHandlerFactory ehf )
- {
- log.debug( "Camel error handler removed: " + ehf.toString() );
- }
-
- @Override
- public void onThreadPoolAdd( CamelContext cc, ThreadPoolExecutor tpe, String string, String string1,
- String string2, String string3 )
- {
- log.debug( "Camel threadPool added" );
- }
-
- @Override
- public void onThreadPoolRemove( CamelContext camelContext, ThreadPoolExecutor threadPool )
- {
- log.debug( "Camel threadPool removed" );
- }
-}
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/routes'
=== removed file 'dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/routes/SDMXDataIn.java'
--- dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/routes/SDMXDataIn.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/routes/SDMXDataIn.java 1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-package org.hisp.dhis.integration.routes;
-
-/*
- * Copyright (c) 2004-2013, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.model.DescriptionDefinition;
-import org.apache.camel.model.RouteDefinition;
-import java.io.InputStream;
-
-/**
- * SDMXDataIn route takes an SDMX cross-sectional message, transforms to dxf2
- * datavalueset and sends to dxf2 endpoint
- *
- * @author bobj
- */
-public class SDMXDataIn
- extends RouteBuilder
-{
- // DataInput endpoint
- public static final String SDMXDATA_IN = "direct:sdmxDataIn";
-
- // Route description and ID
- public static final String SDMXDATA_IN_DESC = "Internal: SDMX Data to DXF2 Input";
-
- // IDs beginning with 'internal-*' do not show up in UI
- public static final String SDMXDATA_IN_ID = "internal-sdmx-datain";
-
- @Override
- public void configure()
- throws Exception
- {
- DescriptionDefinition desc = new DescriptionDefinition();
- desc.setText( SDMXDATA_IN_DESC );
-
- RouteDefinition sdmxDataIn = from( SDMXDATA_IN ).convertBodyTo( String.class, "UTF-8" )
- .to( "log:org.hisp.dhis.integration?level=INFO" ).to( "xslt:transform/cross2dxf2.xsl" )
- .convertBodyTo( InputStream.class )
- .inOut( "dhis2:data?orgUnitIdScheme=CODE&dataElementIdScheme=CODE&importStrategy=NEW_AND_UPDATES" );
-
- sdmxDataIn.setDescription( desc );
- sdmxDataIn.setId( SDMXDATA_IN_ID );
- }
-}
=== removed file 'dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/routes/XMLDataIn.java'
--- dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/routes/XMLDataIn.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/routes/XMLDataIn.java 1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-package org.hisp.dhis.integration.routes;
-
-/*
- * Copyright (c) 2004-2013, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.builder.xml.Namespaces;
-import org.apache.camel.model.DescriptionDefinition;
-import org.apache.camel.model.RouteDefinition;
-import java.io.InputStream;
-
-/**
- * XMLDataIn route implements a Content Based Routing pattern
- *
- *
- * @author bobj
- */
-public class XMLDataIn
- extends RouteBuilder
-{
- // DataInput endpoint
- public static final String XMLDATA_IN = "direct:xmlDataIn";
-
- // Route description and ID
- public static final String XMLDATA_IN_DESC = "Internal: XML Data to DXF2 Input";
-
- // IDs beginning with 'internal-*' do not show up in UI
- public static final String XMLDATA_IN_ID = "internal-xml-datain";
-
- // Route definitions
- @Override
- public void configure() throws Exception
- {
- // add namespaces to the XPath context
- Namespaces ns = new Namespaces( "m", "http://www.SDMX.org/resources/SDMXML/schemas/v2_0/message";);
- ns.add( "d", "http://dhis2.org/schema/dxf/2.0";);
-
- DescriptionDefinition xmlDesc = new DescriptionDefinition();
- xmlDesc.setText( XMLDATA_IN_DESC);
-
- RouteDefinition xmlDataIn = (RouteDefinition) from( XMLDATA_IN ).convertBodyTo( String.class, "UTF-8" )
- .choice()
- // send native dxf2 data directly to dhis2:data
- .when().xpath( "boolean(/d:dataValueSet)", ns).convertBodyTo( InputStream.class).to( "dhis2:data" )
- // send sdmx data to sdmx route
- .when().xpath( "boolean(/m:CrossSectionalData)", ns).to( "direct:sdmxDataIn" )
- // unknown xml
- .otherwise().to( "log:org.hisp.dhis.integration?level=DEBUG" ).end();
-
- xmlDataIn.setDescription( xmlDesc );
- xmlDataIn.setId( XMLDATA_IN_ID );
- }
-}
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/main/resources'
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/main/resources/META-INF'
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/main/resources/META-INF/dhis'
=== removed file '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/dhis/beans.xml 2012-12-14 13:46:47 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/main/resources/META-INF/dhis/beans.xml 1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:camel="http://camel.apache.org/schema/spring";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd";>
-
- <bean id="importService" class="org.hisp.dhis.dxf2.metadata.DefaultImportService" />
-
- <bean id="integrationService" class="org.hisp.dhis.integration.DefaultIntegrationService" />
-
- <!-- Custom lifecycle strategy -->
-
- <bean id="lifecyclestrategy" class="org.hisp.dhis.integration.management.DHIS2LifecycleStrategy" />
-
- <camel:camelContext id="camel-builtin">
-
- <!-- route scanner -->
- <camel:packageScan>
- <camel:package>org.hisp.dhis.integration.routes</camel:package>
- <camel:excludes>**.*Excluded*</camel:excludes>
- <camel:includes>**.*</camel:includes>
- </camel:packageScan>
-
- <!-- producer templates -->
- <camel:template id="web-api" />
-
- </camel:camelContext>
-
-</beans>
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/main/resources/META-INF/services'
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/main/resources/META-INF/services/org'
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/main/resources/META-INF/services/org/apache'
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/main/resources/META-INF/services/org/apache/camel'
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/main/resources/META-INF/services/org/apache/camel/component'
=== removed file '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/META-INF/services/org/apache/camel/component/dhis2 2013-08-23 16:11:13 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/main/resources/META-INF/services/org/apache/camel/component/dhis2 1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-# Copyright (c) 2004-2013, University of Oslo
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-## Redistributions of source code must retain the above copyright notice, this
-# list of conditions and the following disclaimer.
-## Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-## Neither the name of the HISP project nor the names of its contributors may
-# be used to endorse or promote products derived from this software without
-# specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-class=org.hisp.dhis.integration.components.Dxf2Component
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform'
=== removed file 'dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform/cross2dxf.xsl'
--- dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform/cross2dxf.xsl 2012-04-08 11:39:56 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform/cross2dxf.xsl 1970-01-01 00:00:00 +0000
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
- xmlns:msg="http://www.SDMX.org/resources/SDMXML/schemas/v2_0/message";
- exclude-result-prefixes="msg">
-
- <xd:doc xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"; scope="stylesheet">
- <xd:desc>
- <xd:p><xd:b>Created on:</xd:b> Jun 8, 2010</xd:p>
- <xd:p><xd:b>Author:</xd:b> bobj</xd:p>
- <xd:p>SDMX Cross-Sectional Data to DXF</xd:p>
- </xd:desc>
- </xd:doc>
-
- <xsl:output method="xml" indent="yes"/>
-
- <!-- This parameter should contain the relative file path to the zip package -->
- <xsl:param name="zip_url"/>
- <!-- This parameter should contain the relative file path to the dxf metadata directory -->
- <xsl:param name="metadata_url_base"/>
- <!-- This parameter should contain the dxf minor version attribute -->
- <xsl:param name="dxf_minor_version">1.1</xsl:param>
- <!-- This parameter should contain the current date -->
- <xsl:param name="timestamp"/>
-
- <!-- Construct a "jar" protocol base-uri for finding streams in the zip file-->
- <xsl:variable name="base-uri" select="concat('jar:file:',$zip_url,'!')"/>
- <!-- Open the dxf metadata stream-->
- <xsl:variable name="dxf_meta" select="document(concat($metadata_url_base,'Export.xml'))/dxf"/>
- <!-- Get comment from header -->
- <xsl:variable name="comment">
- <xsl:value-of select="//msg:Header/msg:Sender/msg:Name"/>
- </xsl:variable>
-
- <xsl:template match="/">
- <xsl:element name="dxf" namespace="http://dhis2.org/schema/dxf/1.0";>
- <xsl:attribute name="minor_version"><xsl:value-of select="$dxf_minor_version"/></xsl:attribute>
-
- <xsl:call-template name="dxf-metadata">
- <xsl:with-param name="dxf_meta" select="$dxf_meta"/>
- </xsl:call-template>
- <!-- Create period metadata for datavalues-->
- <xsl:element name="periods">
- <xsl:apply-templates select="//*[local-name()='Group']" mode="create-period"/>
- </xsl:element>
- <!-- Process the dataset-->
- <xsl:element name="dataValues">
- <xsl:apply-templates select="child::node()/child::node()[local-name()='DataSet']"/>
- </xsl:element>
- </xsl:element>
- </xsl:template>
-
-<!-- This template selects only the required referenced dxf metadata from the dxf metadata stream-->
- <xsl:template name="dxf-metadata">
- <!-- McDonalds ... just include them all for now -->
- <xsl:copy-of select="$dxf_meta/categoryOptions"/>
- <xsl:copy-of select="$dxf_meta/categories"/>
- <xsl:copy-of select="$dxf_meta/categoryCombos"/>
- <xsl:copy-of select="$dxf_meta/categoryOptionCombos"/>
- <xsl:copy-of select="$dxf_meta/categoryCategoryOptionAssociations"/>
- <xsl:copy-of select="$dxf_meta/categoryComboCategoryAssociations"/>
-
- <!--select the unique dataelements referenced by OBS_VALUES with DATAELEMENT attributes-->
- <xsl:element name="dataElements">
- <xsl:variable name="dataelements"
- select="//*[(local-name()='OBS_VALUE') and
- not(preceding-sibling::*/@DATAELEMENT = @DATAELEMENT)]"/>
- <xsl:for-each select="$dataelements">
- <xsl:variable name="dataelementid" select="@DATAELEMENT"/>
- <xsl:copy-of select="$dxf_meta/dataElements/dataElement[id = $dataelementid]"/>
- </xsl:for-each>
- </xsl:element>
-
- <!--select the unique orgunits referenced by OBS_VALUES with FACILITY attributes-->
- <xsl:element name="organisationUnits">
- <xsl:variable name="orgunits"
- select="//*[(local-name()='OBS_VALUE') and
- not(preceding-sibling::*/@FACILITY = @FACILITY)]"/>
- <xsl:for-each select="$orgunits">
- <xsl:variable name="orgunitid" select="@FACILITY"/>
- <xsl:copy-of select="$dxf_meta/organisationUnits/organisationUnit[id = $orgunitid]"/>
- </xsl:for-each>
- </xsl:element>
-
- </xsl:template>
-
- <xsl:template match="*[local-name()='DataSet']">
- <!-- The namespace uri was formed from the category combo -->
- <!-- ... payback time ... find the categoryOptionCombo node in dxf metadata -->
- <xsl:variable name="catcombo"
- select="substring-before(substring-after(namespace-uri(),'KF_'),':')"/>
- <!-- catoptcombos is the nodeset containing all categoryOptionCombos for the categorycombo-->
- <xsl:variable name="catoptcombos"
- select="$dxf_meta/categoryOptionCombos/categoryOptionCombo[categoryCombo/id=$catcombo]"/>
-<!-- <xsl:message>Dataset catoptcombos = <xsl:value-of select="count($catoptcombos)"/></xsl:message>-->
- <xsl:apply-templates select="child::node()[local-name()='Group']" mode="data">
- <xsl:with-param name="catoptcombos" select="$catoptcombos"/>
- </xsl:apply-templates>
- </xsl:template>
-
- <xsl:template match="*[local-name()='Group']" mode="data">
- <xsl:param name="catoptcombos"/>
- <xsl:variable name="period" select="position()"/>
- <xsl:apply-templates select="child::node()[local-name()='Section']">
- <xsl:with-param name="period" select="$period"/>
- <xsl:with-param name="catoptcombos" select="$catoptcombos"/>
- </xsl:apply-templates>
- </xsl:template>
-
- <xsl:template match="*[local-name()='Section']">
- <xsl:param name="period"></xsl:param>
- <xsl:param name="catoptcombos"/>
-<!-- <xsl:message>Period: <xsl:value-of select="$period"/></xsl:message>-->
- <xsl:apply-templates select="child::node()[local-name()='OBS_VALUE']" mode="data">
- <xsl:with-param name="period" select="$period"/>
- <xsl:with-param name="catoptcombos" select="$catoptcombos"/>
- </xsl:apply-templates>
- </xsl:template>
-
- <xsl:template match="*[local-name()='OBS_VALUE']" mode="data">
- <xsl:param name="period"/>
- <xsl:param name="catoptcombos"/>
-
- <xsl:element name="dataValue">
- <xsl:attribute name="dataElement"><xsl:value-of select="@DATAELEMENT"/></xsl:attribute>
- <xsl:attribute name="period"><xsl:value-of select="$period"/></xsl:attribute>
- <xsl:attribute name="source"><xsl:value-of select="@FACILITY"/></xsl:attribute>
- <xsl:attribute name="value"><xsl:value-of select="@value"/></xsl:attribute>
- <xsl:attribute name="timeStamp">2010-01-01</xsl:attribute>
- <xsl:attribute name="comment"><xsl:value-of select="$comment"/></xsl:attribute>
-
- <!-- Find all categoryoption attributes-->
- <xsl:variable name="keys"
- select="@*[not(local-name()='DATAELEMENT' or local-name()='FACILITY' or local-name()='value' or local-name()='VALUE_TYPE')]"/>
- <!--<xsl:for-each select="$keys">
- <xsl:message><xsl:value-of select="local-name()"/>: <xsl:value-of select="."/></xsl:message>
- </xsl:for-each>-->
- <xsl:attribute name="categoryOptionCombo"><xsl:call-template name="find-catoptcombo">
- <xsl:with-param name="keys" select="$keys"/>
- <xsl:with-param name = "last-key" select="count($keys)"/>
- <xsl:with-param name="catoptcombos" select="$catoptcombos"></xsl:with-param>
- </xsl:call-template></xsl:attribute>
-
-
- </xsl:element>
- </xsl:template>
-
- <xsl:template name="find-catoptcombo">
- <xsl:param name="keys"/>
- <xsl:param name="last-key"/>
- <xsl:param name="catoptcombos"/>
-
-<!-- <xsl:message>key: <xsl:value-of select="$keys[$last-key]"/></xsl:message>
- <xsl:message>number of last key: <xsl:value-of select="$last-key"/></xsl:message>-->
-<!-- <xsl:message><xsl:value-of select="count($catoptcombos)"/></xsl:message>-->
-
- <xsl:variable name="sub-catoptcombos"
- select="$catoptcombos[categoryOptions/categoryOption/id=$keys[$last-key]]"></xsl:variable>
-
- <xsl:if test="$last-key=0">
- <xsl:value-of select="$catoptcombos/id"/>
- </xsl:if>
-
- <xsl:if test="$last-key>0">
- <xsl:call-template name="find-catoptcombo">
- <xsl:with-param name="keys" select="$keys"/>
- <xsl:with-param name="last-key" select="$last-key - 1"></xsl:with-param>
- <xsl:with-param name="catoptcombos" select="$sub-catoptcombos"></xsl:with-param>
- </xsl:call-template>
- </xsl:if>
- </xsl:template>
-
- <xsl:template match="*[local-name()='Group']" mode="create-period">
-<!-- Create period id based on the position() of the Group-->
- <xsl:variable name="period" select="@TIME_PERIOD"/>
- <xsl:variable name="start"><xsl:value-of select="$period"/>-01</xsl:variable>
- <xsl:variable name="end"><xsl:value-of select="$period"/>-<xsl:call-template name="last-day-of-month">
- <xsl:with-param name="period" select="$period"/>
- </xsl:call-template></xsl:variable>
- <period>
- <id><xsl:value-of select="position()"/></id>
- <!-- TODO: This periodType needs to be made correct-->
- <periodType>Monthly</periodType>
- <startDate><xsl:value-of select="$start"/></startDate>
- <endDate><xsl:value-of select="$end"/></endDate>
- </period>
- <xsl:message>Created period: <xsl:value-of select="$start"/>, <xsl:value-of select="$end"/></xsl:message>
- </xsl:template>
-
- <!-- Find last day of month
- (Algorithm from 'XSLT CookBook, 2nd Edition')-->
- <xsl:template name="last-day-of-month">
- <xsl:param name="period"/>
- <xsl:variable name="month" select="substring-after($period,'-')"/>
- <xsl:variable name="year" select="substring-before($period,'-')"/>
- <xsl:message>Month: <xsl:value-of select="$month"/></xsl:message>
- <xsl:message>Year: <xsl:value-of select="$year"/></xsl:message>
-
- <xsl:choose>
- <xsl:when
- test="$month = 2 and
- not($year mod 4) and
- ($year mod 100 or not($year mod 400) ) ">
- <xsl:value-of select="29"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
- select="substring('312831303130313130313031' ,
- 2 * $month - 1, 2) "
- />
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
-
-</xsl:stylesheet>
=== removed file 'dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform/cross2dxf2.xsl'
--- dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform/cross2dxf2.xsl 2012-11-01 08:55:35 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform/cross2dxf2.xsl 1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
- xmlns:d="http://dhis2.org/schema/dxf/2.0";
- version="1.0">
-
- <xsl:output method="xml" indent="yes" />
-
- <xsl:template match="/">
- <xsl:for-each select="//*[local-name()='DataSet']">
- <d:dataValueSet period='{@TIME_PERIOD}'
- orgUnitIdScheme='code'
- dataElementIdScheme='code'
- dataSet='{@datasetID}'
- orgUnit='{@FACILITY}'>
- <xsl:apply-templates />
- </d:dataValueSet>
- </xsl:for-each>
- </xsl:template>
-
- <xsl:template match='*[local-name()="OBS_VALUE"]'>
- <xsl:element name="d:dataValue" >
- <xsl:attribute name="dataElement"><xsl:value-of select="@DATAELEMENT"/></xsl:attribute>
- <xsl:if test="@DISAGG">
- <xsl:attribute name="categoryOptionCombo"><xsl:value-of select="@DISAGG"/></xsl:attribute>
- </xsl:if>
- <xsl:attribute name="value"><xsl:value-of select="@value"/></xsl:attribute>
- </xsl:element>
-
- </xsl:template>
-</xsl:stylesheet>
=== removed file 'dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform/gml2dxf.xsl'
--- dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform/gml2dxf.xsl 2012-04-08 11:39:56 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform/gml2dxf.xsl 1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
- xmlns:gml="http://www.opengis.net/gml";
->
-
-<xsl:param name="decimalPlaces">4</xsl:param>
-
-<xsl:template match="gml:coordinates">
- <coordinatesTuple>
- <xsl:value-of select="dhis:gmlToCoords(normalize-space(.),$decimalPlaces)"
- disable-output-escaping="yes"
- xmlns:dhis="org.hisp.dhis.importexport.xml.Util" />
- </coordinatesTuple>
-</xsl:template>
-
-<xsl:template match="gml:Polygon">
- <feature type="Polygon">
- <xsl:apply-templates select=".//gml:coordinates"/>
- </feature>
-</xsl:template>
-
-<xsl:template match="gml:MultiPolygon">
- <feature type="MultiPolygon">
- <xsl:apply-templates select=".//gml:coordinates"/>
- </feature>
-</xsl:template>
-
-<xsl:template match="gml:Point">
- <feature type="Point">
- <xsl:apply-templates select=".//gml:coordinates"/>
- </feature>
-</xsl:template>
-
-<xsl:template match="gml:featureMember">
- <xsl:variable name="name" select=".//*[local-name()='Name' or local-name()='NAME' or local-name()='name']"/>
- <organisationUnit>
- <id>0</id>
- <uuid/>
- <name><xsl:value-of select="$name"/></name>
- <shortName><xsl:value-of select="$name"/></shortName>
- <code/>
- <openingDate/>
- <closedDate/>
- <active>true</active>
- <comment/>
- <geoCode/>
- <xsl:apply-templates select="./child::node()/child::node()/gml:Polygon|./child::node()/child::node()/gml:MultiPolygon|./child::node()/child::node()/gml:Point"/>
- <lastUpdated/>
- </organisationUnit>
-</xsl:template>
-
-<xsl:template match="/">
-<dxf xmlns="http://dhis2.org/schema/dxf/1.0"; minorVersion="1.1">
-<organisationUnits>
- <xsl:apply-templates select=".//gml:featureMember"/>
-</organisationUnits>
-</dxf>
-</xsl:template>
-
-
-</xsl:stylesheet>
=== removed file 'dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform/imr2dxf.xsl'
--- dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform/imr2dxf.xsl 2012-04-08 11:39:56 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform/imr2dxf.xsl 1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
- xmlns:gm="http://www.SDMX.org/resources/SDMXML/schemas/v2_0/genericmetadata";
- version="1.0">
-
- <xsl:output indent="yes" method="xml"/>
-
- <xsl:key name="indicator-types"
- match="/Indicators/Indicator[not (DataType = preceding::Indicator/DataType)]" use="DataType"/>
-
- <!--Construct tree of unique indicator types -->
- <xsl:template name="indicator-types">
- <xsl:element name="indicatorTypes">
- <xsl:for-each
- select="/Indicators/Indicator[not (DataType = preceding::Indicator/DataType)]">
- <xsl:element name="indicatorType">
- <xsl:element name="name">
- <xsl:value-of select="DataType"/>
- </xsl:element>
- <xsl:element name="id">
- <xsl:value-of select="IndicatorId"/>
- </xsl:element>
- <!-- This will have to be edited manually -->
- <xsl:element name="factor">1</xsl:element>
- </xsl:element>
- </xsl:for-each>
- </xsl:element>
- </xsl:template>
-
- <xsl:template name="indicators">
- <xsl:element name="indicators">
- <xsl:for-each select="//gm:AttributeValueSet">
- <xsl:message>New indicator</xsl:message>
- <indicator>
- <id>
- <xsl:value-of select="position()"/>
- </id>
- <uuid/>
- <name>
- <xsl:value-of select="gm:ReportedAttribute[@conceptID='SHORT_NAME']/gm:Value"/>
- </name>
- <alternativeName/>
- <!--ShortName is a pain ... imr has a few of value "short name" ... dhis requires uniquess :-( -->
- <shortName>
- <!-- <xsl:if test="contains(Shortname,'short name')">
- <xsl:value-of select="substring(Name,1,25)"/>
- </xsl:if>
- <xsl:if test="not(contains(Shortname,'short name'))">
- <xsl:value-of select="substring(ShortName,1,25)"/>
- </xsl:if>-->
-
- <!-- Bugger it - random strings ...-->
- <xsl:value-of select="gm:ReportedAttribute[@conceptID='SHORT_NAME']/gm:Value"/>
- </shortName>
- <code/>
- <description>
- <xsl:value-of select="gm:ReportedAttribute[@conceptID='_DESCRIPTION']/gm:Value"/>
- <!-- Rationale: <xsl:value-of select="Rationale"/>
- Preferred Data sources: <xsl:value-of select="PreferredDataSources"/>-->
- </description>
- <xsl:variable name="DataType" select="DataType"/>
- <annualized/>
- <indicatorType>1
-<!-- <xsl:value-of select="key('indicator-types',$DataType)/IndicatorId"/>-->
- </indicatorType>
- </indicator>
- </xsl:for-each>
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="/">
- <xsl:element name="dxf">
- <xsl:call-template name="indicator-types"/>
- <xsl:call-template name="indicators"/>
- </xsl:element>
- </xsl:template>
-
-</xsl:stylesheet>
=== removed file 'dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform/transforms.xml'
--- dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform/transforms.xml 2012-04-08 11:39:56 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform/transforms.xml 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<transforms>
- <transform tag="{http://ogr.maptools.org/}FeatureCollection";>
- <xslt>gml2dxf.xsl</xslt>
- <description>GML to DXF orgunits</description>
- </transform>
- <transform tag="{http://www.SDMX.org/resources/SDMXML/schemas/v2_0/message}CrossSectionalData";>
- <xslt>cross2dxf2.xsl</xslt>
- <description>SDMX-HD Cross Sectional Data Import</description>
- </transform>
- <transform tag="{http://www.SDMX.org/resources/SDMXML/schemas/v2_0/message}GenericMetadata";>
- <xslt>imr2dxf.xsl</xslt>
- <description>SDMX-HD Cross Sectional Data Import</description>
- </transform>
-</transforms>
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/test'
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/test/java'
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/test/java/org'
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/test/java/org/hisp'
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/test/java/org/hisp/dhis'
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/test/java/org/hisp/dhis/integration'
=== removed file 'dhis-2/dhis-services/dhis-service-integration/src/test/java/org/hisp/dhis/integration/RoutesTest.java'
--- dhis-2/dhis-services/dhis-service-integration/src/test/java/org/hisp/dhis/integration/RoutesTest.java 2013-09-30 11:42:51 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/test/java/org/hisp/dhis/integration/RoutesTest.java 1970-01-01 00:00:00 +0000
@@ -1,148 +0,0 @@
-package org.hisp.dhis.integration;
-
-/*
- * Copyright (c) 2004-2013, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import static org.hisp.dhis.common.IdentifiableObject.IdentifiableProperty.CODE;
-import static org.hisp.dhis.importexport.ImportStrategy.NEW_AND_UPDATES;
-import static org.junit.Assert.assertNotNull;
-
-import org.hisp.dhis.DhisSpringTest;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementCategoryService;
-import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.dataset.CompleteDataSetRegistrationService;
-import org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.dataset.DataSetService;
-import org.hisp.dhis.datavalue.DataValueService;
-import org.hisp.dhis.dxf2.importsummary.ImportSummary;
-import org.hisp.dhis.dxf2.metadata.ImportOptions;
-import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.period.MonthlyPeriodType;
-import org.hisp.dhis.period.Period;
-import org.hisp.dhis.period.PeriodService;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ClassPathResource;
-
-public class RoutesTest
- extends DhisSpringTest
-{
- @Autowired
- private DataElementService dataElementService;
-
- @Autowired
- private DataElementCategoryService categoryService;
-
- @Autowired
- private DataSetService dataSetService;
-
- @Autowired
- private OrganisationUnitService organisationUnitService;
-
- @Autowired
- private PeriodService periodService;
-
- @Autowired
- private IntegrationService integrationService;
-
- @Autowired
- private DataValueService dataValueService;
-
- @Autowired
- private CompleteDataSetRegistrationService registrationService;
-
- private DataElement deA;
- private DataElement deB;
- private DataElement deC;
- private DataSet dsA;
- private OrganisationUnit ouA;
- private OrganisationUnit ouB;
- private Period peA;
- private Period peB;
-
- @Override
- public void setUpTest()
- {
- deA = createDataElement( 'A' );
- deB = createDataElement( 'B' );
- deC = createDataElement( 'C' );
- dsA = createDataSet( 'A', new MonthlyPeriodType() );
- ouA = createOrganisationUnit( 'A' );
- ouB = createOrganisationUnit( 'B' );
- peA = createPeriod( getDate( 2012, 1, 1 ), getDate( 2012, 1, 31 ) );
- peB = createPeriod( getDate( 2012, 2, 1 ), getDate( 2012, 2, 29 ) );
-
- deA.setUid( "f7n9E0hX8qk" );
- deB.setUid( "Ix2HsbDMLea" );
- deC.setUid( "eY5ehpbEsB7" );
- dsA.setUid( "pBOMPrpg1QX" );
- ouA.setUid( "DiszpKrYNg8" );
- ouB.setUid( "BdfsJfj87js" );
-
- deA.setCode( "DE_A" );
- deB.setCode( "DE_B" );
- deC.setCode( "DE_C" );
- dsA.setCode( "DS_A" );
- ouA.setCode( "OU_A" );
- ouB.setCode( "OU_B" );
-
- dataElementService.addDataElement( deA );
- dataElementService.addDataElement( deB );
- dataElementService.addDataElement( deC );
- dataSetService.addDataSet( dsA );
- organisationUnitService.addOrganisationUnit( ouA );
- organisationUnitService.addOrganisationUnit( ouB );
- periodService.addPeriod( peA );
- periodService.addPeriod( peB );
- }
-
- @Test
- public void testImportDataValueSetSDMX()
- throws Exception
- {
- ImportOptions options = new ImportOptions( CODE, CODE, false, NEW_AND_UPDATES, false );
- ImportSummary summary = integrationService.importSDMXDataValueSet( new ClassPathResource( "data/sdmx_test.xml" ).getInputStream(), options );
-
- assertNotNull( summary );
- assertNotNull( summary.getDataValueCount() );
-
- }
-
- @Test
- public void testImportDataValueSetXML()
- throws Exception
- {
- ImportOptions options = new ImportOptions( CODE, CODE, false, NEW_AND_UPDATES, false );
- ImportSummary summary = integrationService.importXMLDataValueSet( new ClassPathResource( "data/dataValueSetA.xml" ).getInputStream(), options );
-
- assertNotNull( summary );
- assertNotNull( summary.getDataValueCount() );
- }
-}
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/test/java/org/hisp/dhis/integration/dxf2'
=== removed file '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/java/org/hisp/dhis/integration/dxf2/Dxf2ComponentTest.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/test/java/org/hisp/dhis/integration/dxf2/Dxf2ComponentTest.java 1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-package org.hisp.dhis.integration.dxf2;
-
-/*
- * Copyright (c) 2004-2013, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelSpringTestSupport;
-import org.junit.Test;
-import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-import java.io.InputStream;
-
-public class Dxf2ComponentTest extends CamelSpringTestSupport
-{
- // just send some strings to the route and check they arrived
- // note we can't send to the actual endpoints yet till we wire in dhis2 services to the test context.
- // So for now this is only testing component endpoint creation :-(
- @Test
- public void testDxf2() throws Exception
- {
- MockEndpoint mock = getMockEndpoint( "mock:result" );
- mock.expectedMinimumMessageCount( 3 );
- //template.sendBody("direct:test","<dxf2 xmlns='http://dhis2.org/schema/dxf/2.0'/>");
- //template.sendBody("direct:test","<dxf2 xmlns='http://dhis2.org/schema/dxf/2.0'/>");
- //template.sendBody("direct:test","<dxf2 xmlns='http://dhis2.org/schema/dxf/2.0'/>");
- //assertMockEndpointsSatisfied();
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception
- {
- return new RouteBuilder()
- {
- public void configure()
- {
- from( "direct:test" )
- .convertBodyTo( InputStream.class )
- .to( "dhis2:data?dryRun=true&importStrategy=NEW_AND_UPDATES" )
- .to( "mock:result" );
- }
- };
- }
-
- @Override
- protected AbstractApplicationContext createApplicationContext()
- {
- AbstractApplicationContext springContext = new ClassPathXmlApplicationContext( "test-context.xml" );
-
- return springContext;
- }
-}
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/test/resources'
=== removed directory 'dhis-2/dhis-services/dhis-service-integration/src/test/resources/data'
=== removed file 'dhis-2/dhis-services/dhis-service-integration/src/test/resources/data/dataValueSetA.xml'
--- dhis-2/dhis-services/dhis-service-integration/src/test/resources/data/dataValueSetA.xml 2012-06-01 21:56:18 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/test/resources/data/dataValueSetA.xml 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-<dataValueSet xmlns="http://dhis2.org/schema/dxf/2.0"; dataSet="pBOMPrpg1QX" completeDate="2012-01-09" period="201201" orgUnit="DiszpKrYNg8">
- <dataValue dataElement="f7n9E0hX8qk" value="10001" storedBy="john" timestamp="2012-01-01" comment="comment" followup="false"/>
- <dataValue dataElement="Ix2HsbDMLea" value="10002" storedBy="john" timestamp="2012-01-02" comment="comment" followup="false"/>
- <dataValue dataElement="eY5ehpbEsB7" value="10003" storedBy="john" timestamp="2012-01-03" comment="comment" followup="false"/>
-</dataValueSet>
\ No newline at end of file
=== removed file 'dhis-2/dhis-services/dhis-service-integration/src/test/resources/data/sdmx_test.xml'
--- dhis-2/dhis-services/dhis-service-integration/src/test/resources/data/sdmx_test.xml 2012-06-01 21:56:18 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/test/resources/data/sdmx_test.xml 1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<CrossSectionalData xmlns="http://www.SDMX.org/resources/SDMXML/schemas/v2_0/message";
- xmlns:ns="urn:sdmx:org.sdmx.infomodel.keyfamily.KeyFamily=HP_MOH:OPENMRS:1.0:cross" >
-
- <Header>
- <ID>SDMX-HD-CSD</ID>
- <Test>false</Test>
- <Truncated>false</Truncated>
- <Name xml:lang="en">Monthly Facility Report</Name>
- <Prepared>2012-05-25</Prepared>
- <Sender id="OpenMRS">
- <Name>DDU</Name>
- </Sender>
- </Header>
- <ns:DataSet datasetID="DS_A" >
- <ns:Group VALUE_TYPE="0" FREQ="M" TIME_PERIOD="201201">
- <ns:Section>
- <ns:OBS_VALUE FACILITY="OU_A" DATAELEMENT="DE_A" value="180"/>
- <ns:OBS_VALUE FACILITY="OU_A" DATAELEMENT="DE_B" value="180"/>
- <ns:OBS_VALUE FACILITY="OU_A" DATAELEMENT="DE_C" value="180"/>
- <ns:OBS_VALUE FACILITY="OU_B" DATAELEMENT="DE_A" value="180"/>
- <ns:OBS_VALUE FACILITY="OU_B" DATAELEMENT="DE_B" value="180"/>
- <ns:OBS_VALUE FACILITY="OU_B" DATAELEMENT="DE_C" value="180"/>
- </ns:Section>
- </ns:Group>
- </ns:DataSet>
-</CrossSectionalData>
\ No newline at end of file
=== removed file 'dhis-2/dhis-services/dhis-service-integration/src/test/resources/log4j.properties'
--- dhis-2/dhis-services/dhis-service-integration/src/test/resources/log4j.properties 2012-06-01 21:56:18 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/test/resources/log4j.properties 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-
-# Configuration file for log4j
-
-# Log to console setup
-log4j.appender.console = org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout = org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern = * %-5p %d{ABSOLUTE} %m (%F [%t])%n
-
-# Categories (order: DEBUG, INFO, WARN, ERROR, FATAL)
-log4j.rootCategory = WARN, console
-log4j.category.org.hisp.dhis = INFO, console
-log4j.category.smslib = INFO
\ No newline at end of file
=== removed file 'dhis-2/dhis-services/dhis-service-integration/src/test/resources/test-context.xml'
--- dhis-2/dhis-services/dhis-service-integration/src/test/resources/test-context.xml 2012-12-14 13:46:47 +0000
+++ dhis-2/dhis-services/dhis-service-integration/src/test/resources/test-context.xml 1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:camel="http://camel.apache.org/schema/spring";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd";
- xmlns:d="http://dhis2.org/schema/dxf/2.0";>
-
- <!-- custom lifecycle strategy -->
- <bean id="lifecyclestrategy" class="org.hisp.dhis.integration.management.DHIS2LifecycleStrategy" />
-
- <bean id="integrationService" class="org.hisp.dhis.integration.DefaultIntegrationService" />
-
- <camel:camelContext id="camel-builtin">
-
- <camel:packageScan>
- <camel:package>org.hisp.dhis.integration.routes</camel:package>
- <camel:excludes>**.*Excluded*</camel:excludes>
- <camel:includes>**.*</camel:includes>
- </camel:packageScan>
-
- </camel:camelContext>
-
-</beans>
=== modified file 'dhis-2/dhis-services/pom.xml'
--- dhis-2/dhis-services/pom.xml 2013-10-01 09:02:04 +0000
+++ dhis-2/dhis-services/pom.xml 2013-10-01 15:59:23 +0000
@@ -32,7 +32,6 @@
<module>dhis-service-analytics</module>
<module>dhis-service-mobile</module>
<!-- Level 4 -->
- <module>dhis-service-integration</module>
<module>dhis-service-mapgeneration</module>
<module>dhis-service-eventreporting</module>
<!-- Level 5 -->
=== modified file 'dhis-2/dhis-web/dhis-web-api-fred/pom.xml'
--- dhis-2/dhis-web/dhis-web-api-fred/pom.xml 2013-08-22 13:19:57 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/pom.xml 2013-10-01 15:59:23 +0000
@@ -44,10 +44,6 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-integration</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-core</artifactId>
</dependency>
<dependency>
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/pom.xml'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/pom.xml 2013-09-19 14:01:30 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/pom.xml 2013-10-01 15:59:23 +0000
@@ -54,9 +54,14 @@
<artifactId>dhis-service-mapgeneration</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
</dependencies>
- <properties>
- <rootDir>../../</rootDir>
- </properties>
+ <properties>
+ <rootDir>../../</rootDir>
+ </properties>
</project>
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/pom.xml'
--- dhis-2/dhis-web/dhis-web-importexport/pom.xml 2013-10-01 13:18:53 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/pom.xml 2013-10-01 15:59:23 +0000
@@ -58,6 +58,11 @@
<artifactId>dhis-service-dxf2</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
</dependencies>
<properties>
<rootDir>../../</rootDir>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/pom.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/pom.xml 2013-09-19 14:01:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/pom.xml 2013-10-01 15:59:23 +0000
@@ -50,6 +50,11 @@
<artifactId>dhis-service-importexport</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
</dependencies>
<properties>
<rootDir>../../../</rootDir>
=== modified file 'dhis-2/dhis-web/dhis-web-mobile/pom.xml'
--- dhis-2/dhis-web/dhis-web-mobile/pom.xml 2013-09-19 14:01:30 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/pom.xml 2013-10-01 15:59:23 +0000
@@ -48,10 +48,6 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-integration</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-importexport</artifactId>
</dependency>
<dependency>
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/pom.xml'
--- dhis-2/dhis-web/dhis-web-visualizer/pom.xml 2013-09-19 14:01:30 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/pom.xml 2013-10-01 15:59:23 +0000
@@ -69,6 +69,11 @@
<artifactId>batik-codec</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
</dependencies>
<properties>
=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml 2013-10-01 09:45:16 +0000
+++ dhis-2/pom.xml 2013-10-01 15:59:23 +0000
@@ -273,11 +273,6 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-integration</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-mapping</artifactId>
<version>${project.version}</version>
</dependency>
@@ -903,33 +898,6 @@
<version>2.2.6</version>
</dependency>
- <!-- Apache Camel -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-mail</artifactId>
- <version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-http</artifactId>
- <version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-quartz</artifactId>
- <version>${camel.version}</version>
- </dependency>
-
<!-- SMS -->
<dependency>
<groupId>org.smslib</groupId>
=== modified file 'local/ke/mfl2dxf2/src/main/java/org/hisp/dhis/integration/routes/MFLTransformRoute.java'
--- local/ke/mfl2dxf2/src/main/java/org/hisp/dhis/integration/routes/MFLTransformRoute.java 2012-06-27 13:28:16 +0000
+++ local/ke/mfl2dxf2/src/main/java/org/hisp/dhis/integration/routes/MFLTransformRoute.java 2013-10-01 15:59:23 +0000
@@ -30,6 +30,7 @@
import org.apache.camel.builder.RouteBuilder;
import java.io.InputStream;
+import org.apache.camel.LoggingLevel;
/**
* @author Morten Olav Hansen <mortenoh@xxxxxxxxx>
@@ -41,10 +42,11 @@
public void configure() throws Exception
{
// from( "file:/Users/mortenoh/GDrive/HISP/ke/mfl/data/inbox?consumer.initialDelay=10000&consumer.delay=5000" ).
- from( "quartz://every1minute?cron=0+0/1+*+*+*+%3F" ).
- to( "http://api.ehealth.or.ke/api/facilities?lastDays=720&paging=off&scheme=code"; ).
+ // from( "quartz://every1minute?cron=0+0/1+*+*+*+%3F" ).
+ from( "quartz://every1minute?trigger.repeatInterval=60000&fireNow=true" ).
+ to( "http://api.ehealth.or.ke/api/facilities?lastDays=720&paging=off&scheme=code&httpClient.soTimeout=120000"; ).
to( "xslt:transform/mfl2dxf2.xsl" ).
- convertBodyTo( InputStream.class ).inOut( "dhis2:metadata" ).
+ // convertBodyTo( InputStream.class ).inOut( "dhis2:metadata" ).
to( "log:org.hisp.dhis.camel?level=INFO" );
}
}
