svn commit: r1301911 - in /camel/trunk: platforms/karaf/features/src/main/resources/features.xml tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java

[davsclaus]

Author: davsclaus
Date: Sat Mar 17 10:35:07 2012
New Revision: 1301911

URL: http://svn.apache.org/viewvc?rev=1301911&view=rev
Log:
Enabled camel-apns feature

Modified:
    camel/trunk/platforms/karaf/features/src/main/resources/features.xml
    
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java

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=1301911&r1=1301910&r2=1301911&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml 
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Sat 
Mar 17 10:35:07 2012
@@ -155,15 +155,13 @@
     <feature version='${project.version}'>camel-jms</feature>
     <bundle>mvn:org.apache.camel/camel-amqp/${project.version}</bundle>
   </feature>
-  <!-- TODO: apns bundle does not work - SMX4-857
-       apn has the depenency of mina 2.0, we need to provide that bundle in 
servicemix
   <feature name='camel-apns' version='${project.version}' resolver='(obr)' 
start-level='50'>
     <feature version='${project.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.apache.mina/mina-core/${mina2-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/${project.version}</bundle>
-  </feature--> 
+  </feature> 
   <feature name='camel-atom' version='${project.version}' resolver='(obr)' 
start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <bundle 
dependency='true'>mvn:javax.mail/mail/${javax-mail-version}</bundle>

Modified: 
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java?rev=1301911&r1=1301910&r2=1301911&view=diff
==============================================================================
--- 
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java
 (original)
+++ 
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java
 Sat Mar 17 10:35:07 2012
@@ -16,7 +16,6 @@
  */
 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;
@@ -24,7 +23,6 @@ import org.ops4j.pax.exam.junit.Configur
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
 @RunWith(JUnit4TestRunner.class)
-@Ignore("camel-apns feature.xml does not work yet")
 public class CamelApnsTest extends AbstractFeatureTest {
 
     public static final String COMPONENT = extractName(CamelApnsTest.class);