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

[da...@apache.org]

Author: davsclaus
Date: Sat Jan 28 12:19:34 2012
New Revision: 1237052

URL: http://svn.apache.org/viewvc?rev=1237052&view=rev
Log:
CAMEL-4944: Added camel-gson to osgi features

Added:
    camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java
      - copied, changed from r1237030, camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java
Modified:
    camel/trunk/apache-camel/pom.xml
    camel/trunk/platforms/karaf/features/src/main/resources/features.xml

Modified: camel/trunk/apache-camel/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/pom.xml?rev=1237052&r1=1237051&r2=1237052&view=diff
==============================================================================
--- camel/trunk/apache-camel/pom.xml (original)
+++ camel/trunk/apache-camel/pom.xml Sat Jan 28 12:19:34 2012
@@ -165,6 +165,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
+      <artifactId>camel-gson</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-hawtdb</artifactId>
     </dependency>
     <dependency>

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=1237052&r1=1237051&r2=1237052&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Sat Jan 28 12:19:34 2012
@@ -285,6 +285,11 @@
     <bundle dependency='true'>mvn:org.codehaus.groovy/groovy-all/${groovy-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-groovy/${project.version}</bundle>
   </feature>
+  <feature name='camel-gson' version='${project.version}' resolver='(obr)' start-level='50'>
+    <bundle dependency='true'>mvn:com.google.code.gson/gson/${gson-version}</bundle>
+    <feature version='${project.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-gson/${project.version}</bundle>
+  </feature>
   <feature name='camel-hazelcast' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <bundle dependency='true'>mvn:com.hazelcast/hazelcast/${hazelcast-version}</bundle>

Copied: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java (from r1237030, camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java?p2=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java&p1=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java&r1=1237030&r2=1237052&rev=1237052&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java Sat Jan 28 12:19:34 2012
@@ -17,7 +17,8 @@
 package org.apache.camel.itest.karaf;
 
 import org.apache.camel.model.DataFormatDefinition;
-import org.apache.camel.model.dataformat.FlatpackDataFormat;
+import org.apache.camel.model.dataformat.JsonDataFormat;
+import org.apache.camel.model.dataformat.JsonLibrary;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
@@ -25,12 +26,14 @@ import org.ops4j.pax.exam.junit.Configur
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
 @RunWith(JUnit4TestRunner.class)
-public class CamelFlatpackTest extends AbstractFeatureTest {
+public class CamelGsonTest extends AbstractFeatureTest {
 
-    public static final String COMPONENT = extractName(CamelFlatpackTest.class);
+    public static final String COMPONENT = extractName(CamelGsonTest.class);
 
     protected DataFormatDefinition createDataformatDefinition(String format) {
-        return new FlatpackDataFormat();
+        JsonDataFormat answer = new JsonDataFormat();
+        answer.setLibrary(JsonLibrary.Gson);
+        return answer;
     }
 
     @Test