camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1224868 - in /camel/trunk/platforms/karaf/features/src/main/resources: config.properties features.xml
Date Tue, 27 Dec 2011 03:22:57 GMT
Author: dkulp
Date: Tue Dec 27 03:22:57 2011
New Revision: 1224868

URL: http://svn.apache.org/viewvc?rev=1224868&view=rev
Log:
[CAMEL-4671] Reverting 1201768 (with permission from gnodet, the orinal
author) due to issues it is causing as discussed on dev list.

Modified:
    camel/trunk/platforms/karaf/features/src/main/resources/config.properties
    camel/trunk/platforms/karaf/features/src/main/resources/features.xml

Modified: camel/trunk/platforms/karaf/features/src/main/resources/config.properties
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/config.properties?rev=1224868&r1=1224867&r2=1224868&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/config.properties (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/config.properties Tue Dec 27 03:22:57
2011
@@ -178,7 +178,7 @@ jre-1.6=, \
  com.sun.org.apache.xerces.internal.xni, \
  com.sun.jndi.ldap, \
  javax.accessibility, \
- javax.activation, \
+# javax.activation, \
  javax.activity, \
  javax.annotation, \
  javax.annotation.processing, \
@@ -258,12 +258,12 @@ jre-1.6=, \
  javax.tools, \
  javax.transaction, javax.transaction.xa, \
  javax.xml, \
- javax.xml.bind, \
- javax.xml.bind.annotation, \
- javax.xml.bind.annotation.adapters, \
- javax.xml.bind.attachment, \
- javax.xml.bind.helpers, \
- javax.xml.bind.util, \
+# javax.xml.bind, \
+# javax.xml.bind.annotation, \
+# javax.xml.bind.annotation.adapters, \
+# javax.xml.bind.attachment, \
+# javax.xml.bind.helpers, \
+# javax.xml.bind.util, \
  javax.xml.crypto, \
  javax.xml.crypto.dom, \
  javax.xml.crypto.dsig, \
@@ -273,10 +273,10 @@ jre-1.6=, \
  javax.xml.datatype, \
  javax.xml.namespace, \
  javax.xml.parsers, \
- javax.xml.soap, \
- javax.xml.stream, \
- javax.xml.stream.events, \
- javax.xml.stream.util, \
+# javax.xml.soap, \
+# javax.xml.stream, \
+# javax.xml.stream.events, \
+# javax.xml.stream.util, \
  javax.xml.transform, \
  javax.xml.transform.dom, \
  javax.xml.transform.sax, \

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=1224868&r1=1224867&r2=1224868&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue Dec 27 03:22:57
2011
@@ -23,10 +23,11 @@
 
   <feature name='xml-specs-api' version='${servicemix-specs-version}' resolver='(obr)'
start-level='10'>
     <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}</bundle>
-    <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${servicemix-specs-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${servicemix-specs-version}</bundle>
     <bundle dependency='true'>mvn:org.codehaus.woodstox/stax2-api/${stax2-api-bundle-version}</bundle>
     <bundle dependency='true'>mvn:org.codehaus.woodstox/woodstox-core-asl/${woodstox-core-bundle-version}</bundle>

+    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-bundle-version}</bundle>
   </feature>
   <feature name='camel' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
@@ -34,6 +35,7 @@
   </feature>
   <feature name='camel-core' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='[3,4)'>spring</feature>
+    <feature version='${servicemix-specs-version}'>xml-specs-api</feature>
     <bundle>mvn:org.apache.camel/camel-core/${project.version}</bundle>
     <bundle>mvn:org.apache.camel.karaf/camel-karaf-commands/${project.version}</bundle>
   </feature>



Mime
View raw message