camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1214732 - in /camel/branches/camel-2.8.x: parent/pom.xml platforms/karaf/features/pom.xml platforms/karaf/features/src/main/resources/bundles.properties platforms/karaf/features/src/main/resources/features.xml
Date Thu, 15 Dec 2011 12:42:10 GMT
Author: jbonofre
Date: Thu Dec 15 12:42:09 2011
New Revision: 1214732

URL: http://svn.apache.org/viewvc?rev=1214732&view=rev
Log:
[CAMEL-4777] Features now uses jetty or war features in place of referencing geronimo-servlet,
geronimo-jsp, geronimo-el

Modified:
    camel/branches/camel-2.8.x/parent/pom.xml
    camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml
    camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/bundles.properties
    camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml

Modified: camel/branches/camel-2.8.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/parent/pom.xml?rev=1214732&r1=1214731&r2=1214732&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/parent/pom.xml (original)
+++ camel/branches/camel-2.8.x/parent/pom.xml Thu Dec 15 12:42:09 2011
@@ -75,7 +75,6 @@
     <geronimo-j2ee-management-spec-version>1.1</geronimo-j2ee-management-spec-version>
     <geronimo-jms-spec-version>1.1.1</geronimo-jms-spec-version>
     <geronimo-jpa-spec-version>1.1.1</geronimo-jpa-spec-version>
-    <geronimo-jsp-spec-version>1.0.1</geronimo-jsp-spec-version>
     <geronimo-jta-spec-version>1.1.1</geronimo-jta-spec-version>
     <geronimo-servlet-spec-version>1.1.2</geronimo-servlet-spec-version>
     <groovy-version>1.8.4</groovy-version>
@@ -1024,11 +1023,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jsp_2.1_spec</artifactId>
-        <version>${geronimo-jsp-spec-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jta_1.1_spec</artifactId>
         <version>${geronimo-jta-spec-version}</version>
       </dependency>

Modified: camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml?rev=1214732&r1=1214731&r2=1214732&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml Thu Dec 15 12:42:09 2011
@@ -45,7 +45,7 @@
       <cometd-java-server-bundle-version>2.3.1_1</cometd-java-server-bundle-version>
       <commons-beanutils-bundle-version>1.7.0_3</commons-beanutils-bundle-version>
       <commons-csv-version>1.0-r706899_3</commons-csv-version>
-      <commons-codec-version>${commons-code}</commons-codec-version>
+      <commons-codec-version>${commons-codec}</commons-codec-version>
       <commons-codec-bundle-version>1.3_3</commons-codec-bundle-version>
       <commons-configuration-version>1.6</commons-configuration-version>
       <commons-daemon-version>1.0.5</commons-daemon-version>
@@ -66,7 +66,6 @@
       <flatpack-bundle-version>3.2.0_2</flatpack-bundle-version>
       <freemarker-bundle-version>2.3.18_1</freemarker-bundle-version>
       <geronimo-el-version>1.0.1</geronimo-el-version>
-      <geronimo-jsp-version>1.0.1</geronimo-jsp-version>
       <geronimo-ws-metadata-spec-version>1.1.3</geronimo-ws-metadata-spec-version>
       <gernimo-annotation-spec-version>1.1.1</gernimo-annotation-spec-version>
       <gernimo-jaxws22-spec-version>1.1</gernimo-jaxws22-spec-version>
@@ -110,7 +109,6 @@
       <oscache-bundle-version>2.4_5</oscache-bundle-version>
       <qpid-bundle-version>0.12_1</qpid-bundle-version>
       <quickfix-bundle-version>1.5.1_1</quickfix-bundle-version>
-      <pax.web.version>0.7.2</pax.web.version>
       <quartz-bundle-version>1.8.3_2</quartz-bundle-version>
       <protobuf-java-bundle-version>2.3.0_1</protobuf-java-bundle-version>
       <regexp-bundle-version>1.3_2</regexp-bundle-version>

Modified: camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/bundles.properties
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/bundles.properties?rev=1214732&r1=1214731&r2=1214732&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/bundles.properties
(original)
+++ camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/bundles.properties
Thu Dec 15 12:42:09 2011
@@ -28,10 +28,6 @@ org.apache.servicemix.specs/org.apache.s
 org.apache.servicemix.specs/org.apache.servicemix.specs.javamail-api-1.4/${servicemix-specs-version}/jar
 org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}/jar
 
-#Apache Geronimo specs
-org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version}/jar
-org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${geronimo-jsp-version}/jar
-
 #Apache ServiceMix bundles
 org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera-bundle-version}/jar
 org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}/jar

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=1214732&r1=1214731&r2=1214732&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 Thu
Dec 15 12:42:09 2011
@@ -85,14 +85,18 @@
     <feature version='${pom.version}'>camel-core</feature>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle>
     <bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec}</bundle>
-    <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
+    <!-- the jetty feature provides the geronimo-servlet_2.5_spec -->
+    <!-- TODO replace the jetty feature by a Karaf spec feature -->
+    <feature>jetty</feature>
     <bundle>mvn:org.apache.camel/camel-http/${pom.version}</bundle>
   </feature>
   <feature name='camel-http4' version='${pom.version}' resolver='(obr)' start-level='50'>
     <feature version='${pom.version}'>camel-core</feature>
     <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
     <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
-    <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
+    <!-- the jetty feature provides the geronimo-servlet_2.5_spec -->
+    <!-- TODO replace the jetty feature by a Karaf spec feature -->
+    <feature>jetty</feature>
     <bundle>mvn:org.apache.camel/camel-http4/${pom.version}</bundle>
   </feature>
   <feature name='camel-mina' version='${pom.version}' resolver='(obr)' start-level='50'>
@@ -210,8 +214,8 @@
   </feature-->
   <feature name='camel-dozer' version='${pom.version}' resolver='(obr)' start-level='50'>
     <feature version='${pom.version}'>camel-core</feature>
-    <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
-    <bundle dependency="true">mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
+    <!-- the war feature provides the geronimo-servlet_2.5_spec and pax-web-jsp bundles
-->
+    <feature>war</feature>
     <bundle dependency="true">mvn:net.sf.dozer/dozer-osgi/${dozer-version}</bundle>
     <bundle dependency="true">mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
     <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
@@ -314,7 +318,9 @@
   <feature name='camel-ibatis' version='${pom.version}' resolver='(obr)' start-level='50'>
     <feature version='${pom.version}'>camel-spring</feature>
     <bundle dependency="true">mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
-    <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
+    <!-- the jetty feature provides the geronimo-servlet_2.5_spec -->
+    <!-- TODO replace the jetty feature by a Karaf spec feature -->
+    <feature>jetty</feature>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
@@ -393,9 +399,8 @@
   </feature>
   <feature name='camel-jxpath' version='${pom.version}' resolver='(obr)' start-level='50'>
     <!-- All those bundles should be optional I think, but the commons-jxpath osgi metadata
is not really good -->
-    <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
-    <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${el-api-1.0-version}</bundle>
-    <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${jsp-api-2.1-version}</bundle>
+    <!-- the war feature provides geronimo-servlet_2.5_spec, pax-web-jsp (exporting el
and jsp packages) bundles -->
+    <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>
@@ -404,8 +409,8 @@
   </feature>
   <feature name='camel-juel' version='${pom.version}' resolver='(obr)' start-level='50'>
     <feature version='${pom.version}'>camel-core</feature>
-    <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
-    <bundle dependency="true">mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
+    <!-- the war feature provides the geronimo-servlet_2.5_spec and pax-web-jsp bundles
-->
+    <feature>war</feature>
     <bundle dependency="true">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>
@@ -445,7 +450,9 @@
   <feature name='camel-mybatis' version='${pom.version}' resolver='(obr)' start-level='50'>
     <feature version='${pom.version}'>camel-spring</feature>
     <bundle dependency="true">mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
-    <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
+    <!-- the jetty feature provides the geronimo-servlet_2.5_spec -->
+    <!-- TODO replace the jetty feature by a Karaf spec feature -->
+    <feature>jetty</feature>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
     <bundle dependency="true">mvn:org.mybatis/mybatis/${mybatis-version}</bundle>
@@ -636,7 +643,9 @@
     <bundle>mvn:org.apache.camel/camel-tagsoup/${pom.version}</bundle>
   </feature>
   <feature name='camel-velocity' version='${pom.version}' resolver='(obr)' start-level='50'>
-    <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
+    <!-- the jetty feature provides the geronimo-servlet_2.5_spec -->
+    <!-- TODO replace the jetty feature by a Karaf spec feature -->
+    <feature>jetty</feature>
     <bundle dependency="true">mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
     <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>



Mime
View raw message