dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #40096
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20300: Removed mfl2dxf2. Moved to https://github.com/dhis2/mfl2dxf2.
------------------------------------------------------------
revno: 20300
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-09-23 09:15:59 +0200
message:
Removed mfl2dxf2. Moved to https://github.com/dhis2/mfl2dxf2.
removed:
local/ke/
local/ke/mfl2dxf2/
local/ke/mfl2dxf2/pom.xml
local/ke/mfl2dxf2/src/
local/ke/mfl2dxf2/src/main/
local/ke/mfl2dxf2/src/main/java/
local/ke/mfl2dxf2/src/main/java/org/
local/ke/mfl2dxf2/src/main/java/org/hisp/
local/ke/mfl2dxf2/src/main/java/org/hisp/dhis/
local/ke/mfl2dxf2/src/main/java/org/hisp/dhis/integration/
local/ke/mfl2dxf2/src/main/java/org/hisp/dhis/integration/routes/
local/ke/mfl2dxf2/src/main/java/org/hisp/dhis/integration/routes/MFLTransformRoute.java
local/ke/mfl2dxf2/src/main/resources/
local/ke/mfl2dxf2/src/main/resources/log4j.properties
local/ke/mfl2dxf2/src/main/resources/routes/
local/ke/mfl2dxf2/src/main/resources/routes/mfl2dxf2.xml
local/ke/mfl2dxf2/src/main/resources/transform/
local/ke/mfl2dxf2/src/main/resources/transform/mfl2dxf2.xsl
local/ke/mfl2dxf2/src/test/
local/ke/mfl2dxf2/src/test/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
=== removed directory 'local/ke'
=== removed directory 'local/ke/mfl2dxf2'
=== removed file 'local/ke/mfl2dxf2/pom.xml'
--- local/ke/mfl2dxf2/pom.xml 2013-07-26 08:57:12 +0000
+++ local/ke/mfl2dxf2/pom.xml 1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>mfl2dxf2</groupId>
- <artifactId>mfl2dxf2</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- <fork>true</fork>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
- <dependencies>
-
- <!-- Spring -->
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jms</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
- </dependency>
-
- <!-- 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-context</artifactId>
- <version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-quartz</artifactId>
- <version>${camel.version}</version>
- </dependency>
-
- <!-- Additional dependencies -->
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.10</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.6.1</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- </dependency>
-
- </dependencies>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <spring.version>3.2.3.RELEASE</spring.version>
- <camel.version>2.10.2</camel.version>
- </properties>
-
-</project>
=== removed directory 'local/ke/mfl2dxf2/src'
=== removed directory 'local/ke/mfl2dxf2/src/main'
=== removed directory 'local/ke/mfl2dxf2/src/main/java'
=== removed directory 'local/ke/mfl2dxf2/src/main/java/org'
=== removed directory 'local/ke/mfl2dxf2/src/main/java/org/hisp'
=== removed directory 'local/ke/mfl2dxf2/src/main/java/org/hisp/dhis'
=== removed directory 'local/ke/mfl2dxf2/src/main/java/org/hisp/dhis/integration'
=== removed directory 'local/ke/mfl2dxf2/src/main/java/org/hisp/dhis/integration/routes'
=== removed 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 2013-10-01 15:59:23 +0000
+++ local/ke/mfl2dxf2/src/main/java/org/hisp/dhis/integration/routes/MFLTransformRoute.java 1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-package org.hisp.dhis.integration.routes;
-
-/*
- * Copyright (c) 2012, 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 java.io.InputStream;
-import org.apache.camel.LoggingLevel;
-
-/**
- * @author Morten Olav Hansen <mortenoh@xxxxxxxxx>
- */
-public class MFLTransformRoute
- extends RouteBuilder
-{
- @Override
- 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" ).
- 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" ).
- to( "log:org.hisp.dhis.camel?level=INFO" );
- }
-}
=== removed directory 'local/ke/mfl2dxf2/src/main/resources'
=== removed file 'local/ke/mfl2dxf2/src/main/resources/log4j.properties'
--- local/ke/mfl2dxf2/src/main/resources/log4j.properties 2012-06-27 07:06:47 +0000
+++ local/ke/mfl2dxf2/src/main/resources/log4j.properties 1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-## ------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ------------------------------------------------------------------------
-
-#
-# The logging properties used for eclipse testing, We want to see INFO output on the console.
-#
-log4j.rootLogger=INFO, out
-
-#log4j.logger.org.apache.activemq=DEBUG
-
-# uncomment the next line to debug Camel
-log4j.logger.org.apache.camel=INFO
-
-log4j.logger.org.apache.camel.impl.converter=INFO
-log4j.logger.org.apache.camel.util.ResolverUtil=INFO
-
-log4j.logger.org.springframework=WARN
-log4j.logger.org.hibernate=WARN
-
-# CONSOLE appender not used by default
-log4j.appender.out=org.apache.log4j.ConsoleAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=[%15.15t] %-30.30c{1} %-5p %m%n
-#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-
-log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file
=== removed directory 'local/ke/mfl2dxf2/src/main/resources/routes'
=== removed file 'local/ke/mfl2dxf2/src/main/resources/routes/mfl2dxf2.xml'
--- local/ke/mfl2dxf2/src/main/resources/routes/mfl2dxf2.xml 2012-06-27 13:28:16 +0000
+++ local/ke/mfl2dxf2/src/main/resources/routes/mfl2dxf2.xml 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<route xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://camel.apache.org/schema/spring camel-spring-2.9.2.xsd"
- xmlns="http://camel.apache.org/schema/spring"; id="mfl2dxf2">
-
- <description>Synch with MFL every 5 second</description>
-
- <!-- <from uri="file:/Users/mortenoh/GDrive/HISP/ke/mfl/data/inbox?consumer.initialDelay=10000&consumer.delay=5000" /> -->
- <from uri="quartz://every1minute?cron=0+0/1+*+*+*+%3F" />
- <to uri="http://api.ehealth.or.ke/api/facilities?lastDays=720&paging=off&scheme=code"; />
- <to uri="xslt:transform/mfl2dxf2.xsl" />
- <convertBodyTo type="java.io.InputStream"/>
- <inOut uri="dhis2:metadata" />
- <to uri="log:org.hisp.dhis.camel?level=INFO" />
-</route>
=== removed directory 'local/ke/mfl2dxf2/src/main/resources/transform'
=== removed file 'local/ke/mfl2dxf2/src/main/resources/transform/mfl2dxf2.xsl'
--- local/ke/mfl2dxf2/src/main/resources/transform/mfl2dxf2.xsl 2012-06-27 13:05:18 +0000
+++ local/ke/mfl2dxf2/src/main/resources/transform/mfl2dxf2.xsl 1970-01-01 00:00:00 +0000
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<stylesheet version="1.0" xmlns="http://www.w3.org/1999/XSL/Transform"; xmlns:mfl="http://ehealth.or.ke/schema";
- xmlns:dxf2="http://dhis2.org/schema/dxf/2.0";>
-
- <template match="mfl:Facilities">
-
- <element name="dxf2:metaData">
- <element name="dxf2:organisationUnits">
- <apply-templates />
- </element>
- </element>
- </template>
-
- <template match="mfl:Facility">
- <element name="dxf2:organisationUnit">
- <attribute name="name">
- <value-of select="mfl:OfficialName" />
- </attribute>
- <attribute name="shortName">
- <value-of select="substring(mfl:OfficialName, 0, 49)" />
- </attribute>
- <attribute name="code">
- <value-of select="mfl:Code" />
- </attribute>
-
- <element name="dxf2:parent">
- <attribute name="code">
- <value-of select="mfl:District" />
- </attribute>
- </element>
-
- <element name="dxf2:active">
- <value-of select="mfl:Active" />
- </element>
-
- <if test="mfl:LocationDescription">
- <element name="dxf2:description">
- <value-of select="mfl:LocationDescription" />
- </element>
- </if>
-
- <if test="mfl:Latitude and mfl:Longitude">
- <element name="dxf2:featureType">
- <text>Point</text>
- </element>
-
- <element name="dxf2:coordinates">
- <text>[</text>
- <value-of select="mfl:Longitude" />
- <text>,</text>
- <value-of select="mfl:Latitude" />
- <text>]</text>
- </element>
- </if>
-
- <if test="string-length(mfl:OfficialEmail) > 0">
- <element name="dxf2:email">
- <value-of select="mfl:OfficialEmail" />
- </element>
- </if>
-
- <choose>
- <when test="string-length(mfl:OfficialLandline) > 0">
- <element name="dxf2:phoneNumber">
- <value-of select="mfl:OfficalLandline" />
- </element>
- </when>
- <when test="string-length(mfl:OfficialMobile) > 0">
- <element name="dxf2:phoneNumber">
- <value-of select="mfl:OfficialMobile" />
- </element>
- </when>
- </choose>
-
- <if
- test="string-length(mfl:AddressBox) > 0 and string-length(mfl:AddressTown) > 0 and string-length(mfl:AddressPostCode) > 0">
- <element name="dxf2:address">
- <value-of select="mfl:AddressBox" />
- <text>, </text>
- <value-of select="mfl:AddressPostCode" />
- <text> </text>
- <value-of select="mfl:AddressTown" />
- </element>
- </if>
-
- </element>
- </template>
-
-</stylesheet>
=== removed directory 'local/ke/mfl2dxf2/src/test'
=== removed directory 'local/ke/mfl2dxf2/src/test/java'
