svn commit: r1309934 [5/5] - in /camel/trunk: camel-core/src/main/java/org/apache/camel/builder/ camel-core/src/main/java/org/apache/camel/model/dataformat/ components/camel-xmljson/ components/camel-xmljson/src/ components/camel-xmljson/src/main/ comp...

[davsclaus]

Propchange: 
camel/trunk/components/camel-xmljson/src/test/resources/org/apache/camel/dataformat/xmljson/testMessage3-large.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
camel/trunk/components/camel-xmljson/src/test/resources/org/apache/camel/dataformat/xmljson/testMessage3-large.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: 
camel/trunk/components/camel-xmljson/src/test/resources/org/apache/camel/dataformat/xmljson/testMessage3-large.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1309934&r1=1309933&r2=1309934&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu Apr  5 16:38:07 2012
@@ -116,6 +116,7 @@
     <jruby-version>1.6.7</jruby-version>
     <jsmpp-version>2.1.0_4</jsmpp-version>
     <jsch-version>0.1.46</jsch-version>
+    <jsonlib-version>2.4</jsonlib-version>
     <juel-version>2.1.3</juel-version>
     <junit-version>4.10</junit-version>
     <jt400-version>6.0</jt400-version>
@@ -183,6 +184,7 @@
     <xalan-version>2.7.1</xalan-version>
     <xmlunit-version>1.3</xmlunit-version>
     <xmlbeans-version>2.5.0</xmlbeans-version>
+    <xom-version>1.2.5</xom-version>
     <zookeeper-version>3.3.4</zookeeper-version>
     <!-- used by camel archetypes -->
     <maven-compiler-plugin-version>2.3.2</maven-compiler-plugin-version>

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1309934&r1=1309933&r2=1309934&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Thu Apr  5 16:38:07 2012
@@ -56,6 +56,7 @@
       <commons-dbcp-bundle-version>1.4_2</commons-dbcp-bundle-version>
       <dom4j-bundle-version>1.6.1_5</dom4j-bundle-version>
       <el-api-1.0-version>1.0.1</el-api-1.0-version>
+      <ezmorph-bundle-version>1.0.6_1-SNAPSHOT</ezmorph-bundle-version>
       <fastinfoset-version>1.2.7_4</fastinfoset-version>
       <features.file>features.xml</features.file>
       <flatpack-bundle-version>3.2.0_2</flatpack-bundle-version>
@@ -86,6 +87,7 @@
       <josql-bundle-version>1.5_5</josql-bundle-version>
       <jsch-bundle-version>0.1.45_1</jsch-bundle-version>
       <jsendnsca-bundle-version>1.3.1_3</jsendnsca-bundle-version>
+      <jsonlib-bundle-version>2.4_1-SNAPSHOT</jsonlib-bundle-version>
       <jsp-api-2.1-version>1.0.1</jsp-api-2.1-version>
       <juel-bundle-version>2.1.2_2</juel-bundle-version>
       <junit-bundle-version>4.10_1</junit-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=1309934&r1=1309933&r2=1309934&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml 
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Thu 
Apr  5 16:38:07 2012
@@ -782,6 +782,15 @@
     <feature version='${project.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-xmlbeans/${project.version}</bundle>
   </feature>
+  <feature name='camel-xmljson' version='${project.version}' resolver='(obr)' 
start-level='50'>
+    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
+    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro-bundle-version}</bundle>
+    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ezmorph/${ezmorph-bundle-version}</bundle>
+    <bundle dependency='true'>mvn:xom/xom/${xom-version}</bundle>
+    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json-lib/${jsonlib-bundle-version}</bundle>
+    <feature version='${project.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-xmljson/${project.version}</bundle>
+  </feature>
   <feature name='camel-xmlsecurity' version='${project.version}' 
resolver='(obr)' start-level='50'>
     <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}</bundle>
     <bundle 
dependency='true'>mvn:org.apache.santuario/xmlsec/${xmlsec-version}</bundle>