You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ff...@apache.org on 2011/11/14 08:07:39 UTC
svn commit: r1201613 - in /camel/branches/camel-2.8.x: ./
platforms/karaf/features/src/main/resources/features.xml
Author: ffang
Date: Mon Nov 14 07:07:38 2011
New Revision: 1201613
URL: http://svn.apache.org/viewvc?rev=1201613&view=rev
Log:
Merged revisions 1201612 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1201612 | ffang | 2011-11-14 14:57:13 +0800 (δΈ€, 14 11 2011) | 1 line
[CAMEL-4676]use fine-grained granularity feature for camel-script-optional
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml?rev=1201613&r1=1201612&r2=1201613&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml Mon Nov 14 07:07:38 2011
@@ -522,12 +522,17 @@
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-scala/${pom.version}</bundle>
</feature>
- <feature name='camel-script-optional' version='${pom.version}' resolver='(obr)' start-level='50'>
- <!-- Not available in Maven Central. To use these, you will need to configure an additional -->
- <!-- maven repo into your Karaf etc/org.ops4j.pax.url.mvn.cfg file -->
- <bundle>mvn:com.google.code.scriptengines/scriptengines-groovy/${scriptengines.version}</bundle>
- <bundle>mvn:com.google.code.scriptengines/scriptengines-javascript/${scriptengines.version}</bundle>
- <bundle>mvn:com.google.code.scriptengines/scriptengines-jruby/${scriptengines.version}</bundle>
+ <feature name='camel-script-jruby' version='${pom.version}' resolver='(obr)' start-level='50'>
+ <bundle>mvn:http://scriptengines.googlecode.com/svn/m2-repo/!com.google.code.scriptengines/scriptengines-jruby/${scriptengines-version}</bundle>
+ <bundle dependency="true">mvn:org.jruby/jruby/${jruby-version}</bundle>
+ </feature>
+ <feature name='camel-script-javascript' version='${pom.version}' resolver='(obr)' start-level='50'>
+ <bundle>mvn:http://scriptengines.googlecode.com/svn/m2-repo/!com.google.code.scriptengines/scriptengines-javascript/${scriptengines-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/${rhino-bundle-version}</bundle>
+ </feature>
+ <feature name='camel-script-groovy' version='${pom.version}' resolver='(obr)' start-level='50'>
+ <bundle>mvn:http://scriptengines.googlecode.com/svn/m2-repo/!com.google.code.scriptengines/scriptengines-groovy/${scriptengines-version}</bundle>
+ <bundle>mvn:org.codehaus.groovy/groovy-all/${groovy-version}</bundle>
</feature>
<feature name='camel-script' version='${pom.version}' resolver='(obr)' start-level='50'>
<feature version='${pom.version}'>camel-core</feature>