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/06/06 21:09:04 UTC
svn commit: r1132727 - in /camel/trunk: components/camel-apns/pom.xml
platforms/karaf/features/pom.xml
platforms/karaf/features/src/main/resources/features.xml
tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java
Author: davsclaus
Date: Mon Jun 6 19:09:04 2011
New Revision: 1132727
URL: http://svn.apache.org/viewvc?rev=1132727&view=rev
Log:
CAMEL-3868: camel-apns prepared for feature
Added:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java
- copied, changed from r1132722, camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtomTest.java
Modified:
camel/trunk/components/camel-apns/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-apns/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-apns/pom.xml?rev=1132727&r1=1132726&r2=1132727&view=diff
==============================================================================
--- camel/trunk/components/camel-apns/pom.xml (original)
+++ camel/trunk/components/camel-apns/pom.xml Mon Jun 6 19:09:04 2011
@@ -54,11 +54,31 @@
<artifactId>apns</artifactId>
<version>${java-apns-version}</version>
<exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- </exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- lets use the same version as in camel-jackson -->
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>${jackson-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${jackson-version}</version>
</dependency>
<!-- Camel for test -->
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1132727&r1=1132726&r2=1132727&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Mon Jun 6 19:09:04 2011
@@ -82,6 +82,7 @@
<irclib-bundle-version>1.10_2</irclib-bundle-version>
<isorelax-bundle-version>20050913_1</isorelax-bundle-version>
<jackrabbit-version>1.5.3</jackrabbit-version>
+ <java-apns-bundle-version>0.1.6_1</java-apns-bundle-version>
<jaxb-bundle-version>2.2.1.1_1</jaxb-bundle-version>
<jasypt-bundle-version>1.7_2</jasypt-bundle-version>
<jetty-bundle-version>6.1.26_3</jetty-bundle-version>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1132727&r1=1132726&r2=1132727&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Mon Jun 6 19:09:04 2011
@@ -170,6 +170,14 @@
<feature version='${pom.version}'>camel-jms</feature>
<bundle>mvn:org.apache.camel/camel-amqp/${pom.version}</bundle>
</feature>
+<!-- TODO: apns bundle does not work - SMX4-857
+ <feature name='camel-apns' version='${pom.version}' resolver='(obr)'>
+ <feature version='${pom.version}'>camel-core</feature>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina-bundle-version}</bundle>
+ <bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.java-apns/${java-apns-bundle-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-apns/${pom.version}</bundle>
+ </feature> -->
<feature name='camel-atom' version='${pom.version}' resolver='(obr)'>
<feature version='${pom.version}'>camel-core</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera-bundle-version}</bundle>
Copied: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java (from r1132722, camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtomTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java?p2=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java&p1=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtomTest.java&r1=1132722&r2=1132727&rev=1132727&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtomTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java Mon Jun 6 19:09:04 2011
@@ -16,6 +16,7 @@
*/
package org.apache.camel.itest.karaf;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -23,9 +24,10 @@ import org.ops4j.pax.exam.junit.Configur
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@RunWith(JUnit4TestRunner.class)
-public class CamelAtomTest extends AbstractFeatureTest {
+@Ignore("camel-apns feature.xml does not work yet")
+public class CamelApnsTest extends AbstractFeatureTest {
- public static final String COMPONENT = extractName(CamelAtomTest.class);
+ public static final String COMPONENT = extractName(CamelApnsTest.class);
@Test
public void test() throws Exception {