You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/11/14 10:14:58 UTC
svn commit: r1201639 - in /camel/branches/camel-2.8.x: ./
components/camel-hl7/pom.xml parent/pom.xml
platforms/karaf/features/src/main/resources/features.xml
tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodec2Test.java
Author: davsclaus
Date: Mon Nov 14 09:14:57 2011
New Revision: 1201639
URL: http://svn.apache.org/viewvc?rev=1201639&view=rev
Log:
CAMEL-4437: Upgraded to HAPI 1.2
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-hl7/pom.xml
camel/branches/camel-2.8.x/parent/pom.xml
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodec2Test.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 14 09:14:57 2011
@@ -1 +1 @@
-/camel/trunk:1186106,1186625,1186772,1187221,1187485,1187882,1187893,1188070-1188085,1188642,1188674,1188879,1188881,1189139,1189600,1189681,1189693,1189737,1190212-1190213,1190246,1190303,1195317,1195616,1196210,1197450,1197933,1197948,1198199,1198338,1198340,1199123,1199137,1199654,1199683,1199703,1199739,1199804,1200214,1200771,1200819,1200861,1201263,1201276,1201623
+/camel/trunk:1186106,1186625,1186772,1187221,1187485,1187882,1187893,1188070-1188085,1188642,1188674,1188879,1188881,1189139,1189600,1189681,1189693,1189737,1190212-1190213,1190246,1190303,1195317,1195616,1196210,1197450,1197933,1197948,1198199,1198338,1198340,1199123,1199137,1199654,1199683,1199703,1199739,1199804,1200214,1200771,1200819,1200861,1201263,1201276,1201623,1201637
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/components/camel-hl7/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-hl7/pom.xml?rev=1201639&r1=1201638&r2=1201639&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-hl7/pom.xml (original)
+++ camel/branches/camel-2.8.x/components/camel-hl7/pom.xml Mon Nov 14 09:14:57 2011
@@ -33,17 +33,8 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.hl7.*</camel.osgi.export.pkg>
- <hapi-version>1.0.1</hapi-version>
</properties>
- <repositories>
- <repository>
- <id>hapi</id>
- <name>HAPI Maven Repository</name>
- <url>http://hl7api.sourceforge.net/m2/</url>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
Modified: camel/branches/camel-2.8.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/parent/pom.xml?rev=1201639&r1=1201638&r2=1201639&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/parent/pom.xml (original)
+++ camel/branches/camel-2.8.x/parent/pom.xml Mon Nov 14 09:14:57 2011
@@ -83,6 +83,7 @@
<h2-version>1.2.144</h2-version>
<hadoop-version>0.20.203.0</hadoop-version>
<hamcrest-version>1.1</hamcrest-version>
+ <hapi-version>1.2</hapi-version>
<hawtbuf-version>1.2</hawtbuf-version>
<hawtdb-version>1.5</hawtdb-version>
<hazelcast-version>1.9.3</hazelcast-version>
Modified: camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml?rev=1201639&r1=1201638&r2=1201639&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml Mon Nov 14 09:14:57 2011
@@ -301,8 +301,8 @@
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hapi/${hapi-bundle-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina-bundle-version}</bundle>
+ <bundle dependency="true">mvn:ca.uhn.hapi/hapi-osgi-base/${hapi-version}</bundle>
<bundle>mvn:org.apache.camel/camel-hl7/${pom.version}</bundle>
</feature>
<feature name='camel-ibatis' version='${pom.version}' resolver='(obr)' start-level='50'>
Modified: camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodec2Test.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodec2Test.java?rev=1201639&r1=1201638&r2=1201639&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodec2Test.java (original)
+++ camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodec2Test.java Mon Nov 14 09:14:57 2011
@@ -21,7 +21,6 @@ import ca.uhn.hl7v2.model.v24.segment.MS
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -33,7 +32,6 @@ import static org.ops4j.pax.exam.OptionU
import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
@RunWith(JUnit4TestRunner.class)
-@Ignore("HAPI bundle is wrong")
public class HL7MLLPCodec2Test extends OSGiIntegrationSpringTestSupport implements Processor {
@Override