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 2013/01/31 17:18:20 UTC
svn commit: r1441042 -
/camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Author: davsclaus
Date: Thu Jan 31 16:18:19 2013
New Revision: 1441042
URL: http://svn.apache.org/viewvc?rev=1441042&view=rev
Log:
Sort features.xml A-Z
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
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=1441042&r1=1441041&r2=1441042&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Thu Jan 31 16:18:19 2013
@@ -145,12 +145,6 @@
<feature version='${project.version}'>camel-http</feature>
<bundle>mvn:org.apache.camel/camel-jetty/${project.version}</bundle>
</feature>
- <feature name='camel-servlet' version='${project.version}' resolver='(obr)' start-level='50'>
- <!-- camel-servlet need to access the http OSGi services -->
- <feature>http</feature>
- <feature version='${project.version}'>camel-http</feature>
- <bundle>mvn:org.apache.camel/camel-servlet/${project.version}</bundle>
- </feature>
<feature name='camel-jms' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${spring-version-range}'>spring</feature>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
@@ -328,10 +322,6 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-ftp/${project.version}</bundle>
</feature>
- <feature name='camel-jsch' version='${project.version}' resolver='(obr)' start-level='50'>
- <feature version='${project.version}'>camel-ftp</feature>
- <bundle>mvn:org.apache.camel/camel-jsch/${project.version}</bundle>
- </feature>
<feature name='camel-guava-eventbus' version='${project.version}' resolver='(obr)' start-level='50'>
<bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
@@ -552,14 +542,15 @@
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jpa/${project.version}</bundle>
</feature>
- <feature name='camel-jxpath' version='${project.version}' resolver='(obr)' start-level='50'>
- <!-- All those bundles should be optional I think, but the commons-jxpath osgi metadata is not really good -->
- <feature>war</feature>
- <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.jdom/${jdom-bundle-version}</bundle>
- <bundle dependency='true'>mvn:commons-jxpath/commons-jxpath/${commons-jxpath-version}</bundle>
+ <feature name='camel-jsch' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-ftp</feature>
+ <bundle>mvn:org.apache.camel/camel-jsch/${project.version}</bundle>
+ </feature>
+ <feature name='camel-jt400' version='${project.version}' resolver='(obr)' start-level='50'>
+ <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet-spec-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jt400/${jt400-bundle-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
- <bundle>mvn:org.apache.camel/camel-jxpath/${project.version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-jt400/${project.version}</bundle>
</feature>
<feature name='camel-juel' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
@@ -567,11 +558,14 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.juel/${juel-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-juel/${project.version}</bundle>
</feature>
- <feature name='camel-jt400' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet-spec-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jt400/${jt400-bundle-version}</bundle>
+ <feature name='camel-jxpath' version='${project.version}' resolver='(obr)' start-level='50'>
+ <!-- All those bundles should be optional I think, but the commons-jxpath osgi metadata is not really good -->
+ <feature>war</feature>
+ <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.jdom/${jdom-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:commons-jxpath/commons-jxpath/${commons-jxpath-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
- <bundle>mvn:org.apache.camel/camel-jt400/${project.version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-jxpath/${project.version}</bundle>
</feature>
<feature name='camel-kestrel' version='${project.version}' resolver='(obr)' start-level='50'>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spymemcached/${spymemcached-bundle-version}</bundle>
@@ -708,16 +702,16 @@
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-routebox/${project.version}</bundle>
</feature>
- <feature name='camel-ruby' version='${project.version}' start-level='50'>
- <feature version='${project.version}'>camel-script</feature>
- <bundle>mvn:org.jruby/jruby/${jruby-version}</bundle>
- </feature>
<feature name='camel-rss' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-atom</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rome/${rome-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-rss/${project.version}</bundle>
</feature>
+ <feature name='camel-ruby' version='${project.version}' start-level='50'>
+ <feature version='${project.version}'>camel-script</feature>
+ <bundle>mvn:org.jruby/jruby/${jruby-version}</bundle>
+ </feature>
<feature name='camel-saxon' 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.xmlresolver/${xmlresolver-bundle-version}</bundle>
@@ -757,11 +751,17 @@
<bundle dependency='true'>mvn:org.jruby/jruby/${jruby-version}</bundle>
<bundle>mvn:org.apache.camel/camel-script/${project.version}</bundle>
</feature>
- <feature name='camel-sip' version='${project.version}' resolver='(obr)' start-level='50'>
- <feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jain-sip-api-1.2/${servicemix-specs-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jain-sip-ri/${jain-sip-ri-bundle-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-sip/${project.version}</bundle>
+ <feature name='camel-servlet' version='${project.version}' resolver='(obr)' start-level='50'>
+ <!-- camel-servlet need to access the http OSGi services -->
+ <feature>http</feature>
+ <feature version='${project.version}'>camel-http</feature>
+ <bundle>mvn:org.apache.camel/camel-servlet/${project.version}</bundle>
+ </feature>
+ <feature name='camel-servletlistener' version='${project.version}' resolver='(obr)' start-level='50'>
+ <!-- camel-servletlistener need to access the http OSGi services -->
+ <feature>http</feature>
+ <feature version='${project.version}'>camel-http</feature>
+ <bundle>mvn:org.apache.camel/camel-servletlistener/${project.version}</bundle>
</feature>
<feature name='camel-shiro' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
@@ -769,6 +769,12 @@
<bundle dependency='true'>mvn:org.apache.shiro/shiro-core/${shiro-version}</bundle>
<bundle>mvn:org.apache.camel/camel-shiro/${project.version}</bundle>
</feature>
+ <feature name='camel-sip' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jain-sip-api-1.2/${servicemix-specs-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jain-sip-ri/${jain-sip-ri-bundle-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-sip/${project.version}</bundle>
+ </feature>
<feature name='camel-sjms' version='${project.version}' resolver='(obr)' start-level='50'>
<!-- JTA is not currently supported by SJMS but is a required dependency of the Geronimo JMS Bundle -->
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>