You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2008/09/29 15:39:35 UTC

svn commit: r700129 - in /servicemix/smx4/features/trunk/camel/camel-features: pom.xml src/main/resources/bundles.properties

Author: gertv
Date: Mon Sep 29 06:39:35 2008
New Revision: 700129

URL: http://svn.apache.org/viewvc?rev=700129&view=rev
Log:
SMX4-49: Using the new features.xml generator and adding camel-cxf

Added:
    servicemix/smx4/features/trunk/camel/camel-features/src/main/resources/bundles.properties
Modified:
    servicemix/smx4/features/trunk/camel/camel-features/pom.xml

Modified: servicemix/smx4/features/trunk/camel/camel-features/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/camel-features/pom.xml?rev=700129&r1=700128&r2=700129&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/camel-features/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/camel-features/pom.xml Mon Sep 29 06:39:35 2008
@@ -61,11 +61,11 @@
             <execution>
               <phase>compile</phase>
               <goals>
-                <goal>generate-features-file</goal>
+                <goal>generate-features-xml</goal>
               </goals>
               <configuration>
                 <kernelVersion>${servicemix.kernel.version}</kernelVersion>
-                <translation>target/classes/replacements.properties</translation>
+                <bundles>target/classes/bundles.properties</bundles>
               </configuration>
             </execution>
           </executions>
@@ -92,25 +92,18 @@
      </dependency>
      <dependency>
        <groupId>org.apache.camel</groupId>
+       <artifactId>camel-cxf</artifactId>
+       <version>${camel.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
        <artifactId>camel-http</artifactId>
        <version>${camel.version}</version>
-       <exclusions>
-         <exclusion>
-           <groupId>org.apache.geronimo.specs</groupId>
-           <artifactId>geronimo-servlet_2.4_spec</artifactId>
-         </exclusion>
-       </exclusions>
      </dependency>
      <dependency>
        <groupId>org.apache.camel</groupId>
        <artifactId>camel-ftp</artifactId>
        <version>${camel.version}</version>
-       <exclusions>
-         <exclusion>
-           <groupId>com.jcraft</groupId>
-           <artifactId>jsch</artifactId>
-         </exclusion>
-       </exclusions>
      </dependency>
      <dependency>
        <groupId>org.apache.camel</groupId>
@@ -144,15 +137,19 @@
      </dependency>
      <dependency>
        <groupId>org.apache.camel</groupId>
+       <artifactId>camel-amqp</artifactId>
+       <version>${camel.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
        <artifactId>camel-saxon</artifactId>
        <version>${camel.version}</version>
      </dependency>
-<!-- Unable to generate this in Camel 1.4.0 (problem with Spring 2.5.4.A metadata)
      <dependency>
        <groupId>org.apache.camel</groupId>
        <artifactId>camel-spring-integration</artifactId>
        <version>${camel.version}</version>
-     </dependency> -->
+     </dependency>
      <dependency>
        <groupId>org.apache.camel</groupId>
        <artifactId>camel-sql</artifactId>

Added: servicemix/smx4/features/trunk/camel/camel-features/src/main/resources/bundles.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/camel-features/src/main/resources/bundles.properties?rev=700129&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/camel/camel-features/src/main/resources/bundles.properties (added)
+++ servicemix/smx4/features/trunk/camel/camel-features/src/main/resources/bundles.properties Mon Sep 29 06:39:35 2008
@@ -0,0 +1,58 @@
+################################################################################
+#
+#    Licensed to the Apache Software Foundation (ASF) under one or more
+#    contributor license agreements.  See the NOTICE file distributed with
+#    this work for additional information regarding copyright ownership.
+#    The ASF licenses this file to You under the Apache License, Version 2.0
+#    (the "License"); you may not use this file except in compliance with
+#    the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+################################################################################
+
+#Apache ServiceMix specs
+org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.0/${servicemix.specs.version}/jar
+org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.1/${servicemix.specs.version}/jar
+org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.0/${servicemix.specs.version}/jar
+org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.1/${servicemix.specs.version}/jar
+org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}/jar
+org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}/jar
+
+#Apache Geronimo specs
+org.apache.geronimo.specs/geronimo-activation_1.1_spec/${geronimo.activation.version}/jar
+org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo.annotation.version}/jar
+org.apache.geronimo.specs/geronimo-javamail_1.4_spec/${geronimo.javamail.version}/jar
+org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms.version}/jar
+org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta.version}/jar
+org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo.wsmetadata.version}/jar
+
+#Apache ServiceMix bundles
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons.httpclient.version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-net/${commons.net.version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.neethi/${neethi.version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon.version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver.version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlschema/${xmlschema.version}/jar
+
+#Apache CXF bundle
+org.apache.cxf/cxf-bundle/${cxf.version}/jar
+
+#Spring bundles
+org.springframework/spring-jdbc/${spring.version}/jar
+org.springframework/spring-jms/${spring.version}/jar
+org.springframework/spring-tx/${spring.version}/jar
+
+#Codehaus bundles
+org.codehaus.groovy/groovy-all/1.5.6/jar
+