Author: ningjiang
Date: Wed Jan 12 11:13:27 2011
New Revision: 1058075
URL: http://svn.apache.org/viewvc?rev=1058075&view=rev
Log:
CAMEL-3532 Added camel-jibx, camel-syslog, camel-pax-logging and
camel-eventAdmin features
Modified:
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1058075&r1=1058074&r2=1058075&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Jan 12 11:13:27 2011
@@ -112,6 +112,7 @@
<osgi-version>4.1.0</osgi-version>
<pax-exam-version>1.2.3</pax-exam-version>
<pax-tiny-bundle-version>1.2.0</pax-tiny-bundle-version>
+ <pax-logging-version>1.5.3</pax-logging-version>
<protobuf-version>2.3.0</protobuf-version>
<qpid-version>0.5.0</qpid-version>
<quartz-version>1.8.4</quartz-version>
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1058075&r1=1058074&r2=1058075&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Wed Jan 12 11:13:27 2011
@@ -77,7 +77,7 @@
<isorelax-bundle-version>20050913_1</isorelax-bundle-version>
<jackrabbit-version>1.5.3</jackrabbit-version>
<jaxb-bundle-version>2.2.1.1_1</jaxb-bundle-version>
- <jasypt-bundle-version>1.6_1</jasypt-bundle-version>
+ <jasypt-bundle-version>1.7_2-SNAPSHOT</jasypt-bundle-version>
<jetty6-bundle-version>6.1.22_1</jetty6-bundle-version>
<jexcelapi-bundle-version>2.4.2_2</jexcelapi-bundle-version>
<javax.el-bundle-version>2.1.0</javax.el-bundle-version>
@@ -85,6 +85,7 @@
<jdom-bundle-version>1.1_2</jdom-bundle-version>
<jettison-bundle-version>1.2</jettison-bundle-version>
<jing-bundle-version>20030619_1</jing-bundle-version>
+ <jibx-bundle-version>1.2.2_1-SNAPSHOT</jibx-bundle-version>
<jodatime-bundle-version>1.5.2_2</jodatime-bundle-version>
<josql-bundle-version>1.5_3</josql-bundle-version>
<jsch-bundle-version>0.1.44_1</jsch-bundle-version>
@@ -146,14 +147,20 @@
<artifactId>org.osgi.core</artifactId>
<version>4.2.0</version>
<scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.logging</groupId>
- <artifactId>pax-logging-api</artifactId>
- <version>1.4</version>
- <scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ <version>${pax-logging-version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-service</artifactId>
+ <version>${pax-logging-version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>${felix.framework.version}</version>
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml?rev=1058075&r1=1058074&r2=1058075&view=diff
==============================================================================
---
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
(original)
+++
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
Wed Jan 12 11:13:27 2011
@@ -142,6 +142,7 @@
</feature>
<feature name='camel-dozer' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
<bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
<bundle>mvn:net.sf.dozer/dozer-osgi/${dozer-bundle-version}</bundle>
<bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
@@ -150,6 +151,10 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-dozer/${pom.version}</bundle>
</feature>
+ <feature name='camel-eventAdmin' version='${pom.version}'>
+ <feature version='${pom.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel/camel-eventAdmin/${pom.version}</bundle>
+ </feature>
<feature name='camel-exec' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.commons/commons-exec/${commons-exec-version}</bundle>
@@ -182,10 +187,24 @@
<feature version='${pom.version}'>camel-http</feature>
<bundle>mvn:org.apache.camel/camel-jetty/${pom.version}</bundle>
</feature>
+ <feature name='camel-jibx' version='${pom.version}'>
+ <feature version='${pom.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel/camel-jibx/${pom.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jibx/${jibx-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j-bundle-version}</bundle>
+ </feature>
<feature name='camel-servlet' version='${pom.version}'>
<feature version='${pom.version}'>camel-http</feature>
<bundle>mvn:org.apache.camel/camel-servlet/${pom.version}</bundle>
</feature>
+ <feature name='camel-syslog' version='${pom.version}'>
+ <feature version='${pom.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel/camel-syslog/${pom.version}</bundle>
+ </feature>
<feature name='camel-jms' version='${pom.version}'>
<bundle>mvn:org.springframework/spring-core/${spring-version}</bundle>
<bundle>mvn:org.springframework/spring-beans/${spring-version}</bundle>
@@ -404,6 +423,7 @@
</feature>
<feature name='camel-juel' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
<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>
@@ -469,6 +489,10 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javassist/${javassist-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-ognl/${pom.version}</bundle>
</feature>
+ <feature name='camel-paxlogging' version='${pom.version}'>
+ <feature version='${pom.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel/camel-paxlogging/${pom.version}</bundle>
+ </feature>
<feature name='camel-printer' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-printer/${pom.version}</bundle>
@@ -573,6 +597,9 @@
</feature-->
<feature name='camel-spring-ws' version='${pom.version}'>
<feature version='${pom.version}'>camel-spring</feature>
+ <bundle>mvn:javax.mail/mail/${javax-mail-version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
+ <bundle>mvn:org.springframework/spring-jms/${spring-version}</bundle>
<bundle>mvn:org.springframework/spring-web/${spring-version}</bundle>
<bundle>mvn:org.springframework/spring-webmvc/${spring-version}</bundle>
<bundle>mvn:org.springframework.ws/spring-xml/${spring-ws-version}</bundle>
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=1058075&r1=1058074&r2=1058075&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed
Jan 12 11:13:27 2011
@@ -260,6 +260,7 @@
</feature>
<feature name='camel-dozer' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
<bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
<bundle>mvn:net.sf.dozer/dozer-osgi/${dozer-bundle-version}</bundle>
<bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
@@ -268,6 +269,10 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-dozer/${pom.version}</bundle>
</feature>
+ <feature name='camel-eventAdmin' version='${pom.version}'>
+ <feature version='${pom.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel/camel-eventAdmin/${pom.version}</bundle>
+ </feature>
<feature name='camel-exec' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.commons/commons-exec/${commons-exec-version}</bundle>
@@ -371,6 +376,16 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jing/${jing-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-jing/${pom.version}</bundle>
</feature>
+ <feature name='camel-jibx' version='${pom.version}'>
+ <feature version='${pom.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel/camel-jibx/${pom.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jibx/${jibx-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j-bundle-version}</bundle>
+ </feature>
<feature name='camel-jdbc' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jdbc/${pom.version}</bundle>
@@ -473,6 +488,10 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javassist/${javassist-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-ognl/${pom.version}</bundle>
</feature>
+ <feature name='camel-paxlogging' version='${pom.version}'>
+ <feature version='${pom.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel/camel-paxlogging/${pom.version}</bundle>
+ </feature>
<feature name='camel-printer' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-printer/${pom.version}</bundle>
@@ -580,6 +599,9 @@
</feature>
<feature name='camel-spring-ws' version='${pom.version}'>
<feature version='${pom.version}'>camel-spring</feature>
+ <bundle>mvn:javax.mail/mail/${javax-mail-version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
+ <bundle>mvn:org.springframework/spring-jms/${spring3-version}</bundle>
<bundle>mvn:org.springframework/spring-web/${spring3-version}</bundle>
<bundle>mvn:org.springframework/spring-webmvc/${spring3-version}</bundle>
<bundle>mvn:org.springframework.ws/spring-xml/${spring-ws-version}</bundle>
@@ -605,6 +627,10 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.stringtemplate/${stringtemplate-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-stringtemplate/${pom.version}</bundle>
</feature>
+ <feature name='camel-syslog' version='${pom.version}'>
+ <feature version='${pom.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel/camel-syslog/${pom.version}</bundle>
+ </feature>
<feature name='camel-tagsoup' version='${pom.version}'>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.tagsoup/${tagsoup-bundle-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
