Author: ningjiang
Date: Tue Apr 6 04:30:21 2010
New Revision: 931010
URL: http://svn.apache.org/viewvc?rev=931010&view=rev
Log:
CAMEL-2615 fixed the camel-juel feature install issue in servicemix
Modified:
camel/trunk/components/camel-juel/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-juel/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-juel/pom.xml?rev=931010&r1=931009&r2=931010&view=diff
==============================================================================
--- camel/trunk/components/camel-juel/pom.xml (original)
+++ camel/trunk/components/camel-juel/pom.xml Tue Apr 6 04:30:21 2010
@@ -31,6 +31,7 @@
<description>Camel JUEL support</description>
<properties>
+
<camel.osgi.import.before.defaults>javax.el;version="[2,3)"</camel.osgi.import.before.defaults>
<camel.osgi.export.pkg>org.apache.camel.language.juel.*</camel.osgi.export.pkg>
</properties>
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=931010&r1=931009&r2=931010&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Tue Apr 6 04:30:21 2010
@@ -93,6 +93,7 @@
<openjpa-bundle-version>1.2.1_2</openjpa-bundle-version>
<oscache-bundle-version>2.4_3</oscache-bundle-version>
<protobuf-java-bundle-version>2.2.0_1</protobuf-java-bundle-version>
+ <pax.web.version>0.7.1</pax.web.version>
<quartz-bundle-version>1.6.6_1</quartz-bundle-version>
<qpid-bundle-version>0.5.0_2</qpid-bundle-version>
<saxon-bundle-version>9.1.0.1_3</saxon-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=931010&r1=931009&r2=931010&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue
Apr 6 04:30:21 2010
@@ -316,7 +316,8 @@
</feature>
<feature name='camel-juel' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version}</bundle>
+ <feature version='${karaf-version}'>http</feature>
+ <bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.juel/${juel-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-juel/${pom.version}</bundle>
</feature>
