servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r918862 - in /servicemix/smx4/features/trunk: assembly/src/main/descriptors/unix-bin.xml assembly/src/main/descriptors/windows-bin.xml assembly/src/main/filtered-resources/camel-features.xml examples/itests/tests/pom.xml
Date Thu, 04 Mar 2010 05:59:56 GMT
Author: ffang
Date: Thu Mar  4 05:59:56 2010
New Revision: 918862

URL: http://svn.apache.org/viewvc?rev=918862&view=rev
Log:
[SMX4-462]Installing camel-cxf hang

Added:
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
Modified:
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
    servicemix/smx4/features/trunk/examples/itests/tests/pom.xml

Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=918862&r1=918861&r2=918862&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml Thu Mar  4 05:59:56
2010
@@ -170,6 +170,14 @@
             <lineEnding>unix</lineEnding>
         </file>
         <file>
+            <source>${basedir}/target/classes/camel-features.xml</source>
+            <outputDirectory>system/org/apache/camel/karaf/apache-camel/${camel.version}</outputDirectory>
+            <destName>apache-camel-${camel.version}-features.xml</destName>
+            <fileMode>0644</fileMode>
+            <lineEnding>unix</lineEnding>
+        </file>
+
+        <file>
             <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
             <outputDirectory>/</outputDirectory>
             <destName>LICENSE</destName>
@@ -288,7 +296,7 @@
                 <include>org.apache.servicemix.nmr:apache-servicemix-nmr:xml:features</include>
             </includes>
         </dependencySet>
-        <dependencySet>
+        <!--dependencySet>
             <outputDirectory>/system</outputDirectory>
             <outputFileNameMapping>org/apache/camel/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <unpack>false</unpack>
@@ -296,7 +304,7 @@
             <includes>
                 <include>org.apache.camel.karaf:apache-camel:xml:features</include>
             </includes>
-        </dependencySet>
+        </dependencySet-->
         <dependencySet>
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>

Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=918862&r1=918861&r2=918862&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml Thu Mar 
4 05:59:56 2010
@@ -158,6 +158,14 @@
             <lineEnding>dos</lineEnding>
         </file>
         <file>
+            <source>${basedir}/target/classes/camel-features.xml</source>
+            <outputDirectory>system/org/apache/camel/karaf/apache-camel/${camel.version}</outputDirectory>
+            <destName>apache-camel-${camel.version}-features.xml</destName>
+            <fileMode>0644</fileMode>
+            <lineEnding>dos</lineEnding>
+        </file>
+
+        <file>
             <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
             <outputDirectory>/</outputDirectory>
             <destName>LICENSE</destName>

Added: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml?rev=918862&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
(added)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
Thu Mar  4 05:59:56 2010
@@ -0,0 +1,502 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+      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.
+-->
+
+<features>
+  <repository>mvn:org.apache.felix.karaf/apache-felix-karaf/${felix.karaf.version}/xml/features</repository>
+  <feature name='camel' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-core</feature>
+    <feature version='${camel.version}'>camel-spring-osgi</feature>
+  </feature>
+  <feature name='camel-core' version='${camel.version}'>
+    <feature version="2.5.6.SEC01">spring</feature>
+    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/1.4.0</bundle>
+    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.1/1.4.0</bundle>
+    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/1.4.0</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/2.1.12_1</bundle>
+    <bundle>mvn:org.fusesource.commonman/commons-management/1.0</bundle>
+    <bundle>mvn:org.apache.camel/camel-core/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-spring-osgi' version='${camel.version}'>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+    <feature version='2.5.6.SEC01'>spring</feature>
+    <feature version='1.2.0'>spring-dm</feature>
+    <bundle>mvn:org.springframework/spring-tx/2.5.6.SEC01</bundle>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-spring-osgi/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-spring' version='${camel.version}'>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+    <feature version='2.5.6.SEC01'>spring</feature>
+    <bundle>mvn:org.springframework/spring-tx/2.5.6.SEC01</bundle>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-spring/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-osgi' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-spring</feature>
+    <feature version='1.2.0'>spring-dm</feature>
+    <bundle>mvn:org.apache.camel/camel-osgi/${camel.version}</bundle>
+  </feature>
+   <feature name='camel-test' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-spring-osgi</feature>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/4.7_1</bundle>
   
+    <bundle>mvn:org.apache.camel/camel-test/${camel.version}</bundle>
+  </feature> 
+  <feature name='camel-cxf' version='${camel.version}'>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/1.5.4_1</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
+    <bundle>mvn:org.springframework/spring-jms/2.5.6.SEC01</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/2.2.3_3</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.1.2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/6.1.22_1</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/1.3_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_2</bundle>
+    <bundle>mvn:org.codehaus.jettison/jettison/1.2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.7.0_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/5.2_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/2.7.1_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/2.9.1_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/2.4.0_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/1.4.3_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/1.2_2</bundle>
+    <bundle>mvn:org.codehaus.woodstox/woodstox-core-asl/4.0.7</bundle>
+    <bundle>mvn:org.codehaus.woodstox/stax2-api/3.0.1</bundle>
+    <bundle>mvn:org.apache.ws.commons.schema/XmlSchema/1.4.5</bundle>
+    <bundle>mvn:commons-lang/commons-lang/2.4</bundle>
+    <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/2.7.7_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/2.0.8_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.6.2_3</bundle>
+    <bundle>mvn:org.apache.ws.commons.axiom/axiom-impl/1.2.8</bundle>
+    <bundle>mvn:org.apache.ws.commons.axiom/axiom-api/1.2.8</bundle>
+    <bundle>mvn:javax.mail/mail/1.4.3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.neethi/2.0.4_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/0.4.0-incubating_3</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jaxws_2.1_spec/1.0</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
+    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/1.4.0</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/1.6.2_2</bundle>
+    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.0/1.4.0</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/1.1.2</bundle>
+    <bundle>mvn:org.apache.cxf/cxf-bundle/2.2.6</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/1.3.2_3</bundle>
+    <feature version='${camel.version}'>camel-spring-osgi</feature>
+    <feature version='1.3.0-SNAPSHOT'>http</feature>
+    <bundle>mvn:org.apache.camel/camel-cxf/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-cache' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:http://repository.springsource.com/maven/bundles/external!net.sourceforge.ehcache/com.springsource.net.sf.ehcache/1.6.2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_2</bundle>

+    <bundle>mvn:org.apache.camel/camel-cache/${camel.version}</bundle> 
+  </feature>
+  <feature name='camel-castor' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:http://repository.springsource.com/maven/bundles/external!org.codehaus.castor/com.springsource.org.castor/1.2.0</bundle>
+    <bundle>mvn:org.apache.camel/camel-castor/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-dozer' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:commons-lang/commons-lang/2.4</bundle>
+    <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/1.7.0_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dozer/5.2.0_1</bundle>
+    <bundle>mvn:org.apache.camel/camel-dozer/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-http' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.httpcomponents/httpcore-osgi/4.0.1</bundle>
+    <bundle>mvn:org.apache.httpcomponents/httpclient-osgi/4.0.1</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.1.2</bundle>
+    <bundle>mvn:org.apache.camel/camel-http/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-mina' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/1.1.7_3</bundle>
+    <bundle>mvn:org.apache.camel/camel-mina/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-jetty' version='${camel.version}'>
+     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/6.1.22_1</bundle>
+    <feature version='${camel.version}'>camel-http</feature>
+    <bundle>mvn:org.apache.camel/camel-jetty/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-servlet' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-http</feature>
+    <bundle>mvn:org.apache.camel/camel-servlet/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-jms' version='${camel.version}'>
+    <bundle>mvn:org.springframework/spring-core/2.5.6.SEC01</bundle>
+    <bundle>mvn:org.springframework/spring-beans/2.5.6.SEC01</bundle>
+    <bundle>mvn:org.springframework/spring-context/2.5.6.SEC01</bundle>
+    <bundle>mvn:org.springframework/spring-tx/2.5.6.SEC01</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/1.5.4_1</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
+    <bundle>mvn:org.springframework/spring-jms/2.5.6.SEC01</bundle>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-jms/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-amqp' version='${camel.version}'>
+    <bundle>mvn:commons-lang/commons-lang/2.4</bundle>
+    <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/1.1.7_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.qpid/0.5.0_2</bundle>
+    <feature version='${camel.version}'>camel-jms</feature>
+    <bundle>mvn:org.apache.camel/camel-amqp/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-atom' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/1.3_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/0.4.0-incubating_3</bundle>
+    <bundle>mvn:org.apache.camel/camel-atom/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-bam' version='${camel.version}'>
+    <feature>http</feature>
+    <bundle>mvn:org.springframework/spring-tx/2.5.6.SEC01</bundle>
+    <bundle>mvn:org.springframework/spring-web/2.5.6.SEC01</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+    <bundle>mvn:org.springframework/spring-jdbc/2.5.6.SEC01</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/1.5.4_1</bundle>
+    <bundle>mvn:commons-dbcp/commons-dbcp/1.3</bundle>
+    <bundle>mvn:commons-lang/commons-lang/2.4</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/2.1_3_4</bundle>
+    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/1.4.0</bundle>
+    <bundle>mvn:org.springframework/spring-orm/2.5.6.SEC01</bundle>        
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/2.4_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/2.3.4.726_2</bundle>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-bam/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-bindy' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-bindy/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-cometd' version='${camel.version}'>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.1.2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/6.1.22_1</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-cometd/6.1.11_3</bundle>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-cometd/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-csv' version='${camel.version}'>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-csv/1.0-r706899_3</bundle>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-csv/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-flatpack' version='${camel.version}'>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_2</bundle>
+    <feature version='${camel.version}'>camel-spring-osgi</feature>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jexcelapi/2.4.2_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.flatpack/3.1.1_3</bundle>
+    <bundle>mvn:org.apache.camel/camel-flatpack/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-freemarker' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-spring-osgi</feature>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.freemarker/2.3.15_3</bundle>
+    <bundle>mvn:org.apache.camel/camel-freemarker/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-ftp' version='${camel.version}'>
+    <bundle>mvn:commons-net/commons-net/2.0</bundle>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/0.1.31_3</bundle>
+    <bundle>mvn:org.apache.camel/camel-ftp/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-guice' version='${camel.version}'>
+    <bundle>mvn:http://guiceyfruit.googlecode.com/svn/repo/releases!org.guiceyfruit/guiceyfruit-core/2.0</bundle>
+    <bundle>mvn:http://guiceyfruit.googlecode.com/svn/repo/releases!org.guiceyfruit/guice-all/2.0</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/1.0_3</bundle>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-guice/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-groovy' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.7.0_3</bundle>
+    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/1.4.0</bundle>
+    <bundle>mvn:org.codehaus.groovy/groovy-all/1.7.0</bundle>
+    <bundle>mvn:org.apache.camel/camel-groovy/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-hl7' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/1.2_2</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/5.2_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/2.9.1_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/2.7.1_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hapi/0.5.1_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/1.1.7_3</bundle>
+    <bundle>mvn:org.apache.camel/camel-hl7/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-ibatis' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-spring-osgi</feature>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/1.5.4_1</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.1.2</bundle>
+    <bundle>mvn:commons-dbcp/commons-dbcp/1.3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/2.4_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/2.1_3_4</bundle>
   
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/2.3.4.726_2</bundle>
+    <bundle>mvn:org.apache.camel/camel-ibatis/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-irc' version='${camel.version}'>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.irclib/1.10_2</bundle>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-irc/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-jaxb' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-jaxb/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-jcr' version='${camel.version}'>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jcr-api/1.0_2</bundle>
+    <bundle>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/1.5.3</bundle>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-jcr/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-jing' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-spring-osgi</feature>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.7.0_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/20050913_1</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jing/20030619_1</bundle>
+    <bundle>mvn:org.apache.camel/camel-jing/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-jdbc' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-jdbc/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-josql' version='${camel.version}'>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.josql/1.5_3</bundle>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-josql/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-jpa' version='${camel.version}'>
+    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/1.4.0</bundle>
+    <bundle>mvn:org.springframework/spring-tx/2.5.6.SEC01</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/1.0.1</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+    <bundle>mvn:org.springframework/spring-jdbc/2.5.6.SEC01</bundle>
+    <bundle>mvn:commons-lang/commons-lang/2.4</bundle>
+    <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/1.5.4_1</bundle>
+    <bundle>mvn:commons-dbcp/commons-dbcp/1.3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.7.0_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/1.13.1_2</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.openjpa/1.2.1_2</bundle>
+    <bundle>mvn:org.springframework/spring-orm/2.5.6.SEC01</bundle>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-jpa/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-jxpath' version='${camel.version}'>
+    <!-- All those bundles should be optional I think, but the commons-jxpath osgi metadata
is not really good -->
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.1.2</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/1.0.1</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jsp_2.1_spec/1.0.1</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/1.7.0_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_2</bundle>
+    <bundle>mvn:commons-jxpath/commons-jxpath/1.3</bundle>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-jxpath/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-juel' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/1.0.1</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.juel/2.1.2_1</bundle>
+    <bundle>mvn:org.apache.camel/camel-juel/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-ldap' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-ldap/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-lucene' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/3.0.1</bundle>
+    <bundle>mvn:org.apache.camel/camel-lucene/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-mail' version='${camel.version}'>
+    <bundle>mvn:org.springframework/spring-context/2.5.6.SEC01</bundle>
+    <bundle>mvn:org.springframework/spring-context-support/2.5.6.SEC01</bundle>
+    <bundle>mvn:javax.mail/mail/1.4.3</bundle>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-mail/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-msv' version='${camel.version}'>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/1.2_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/2.9.1_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.7.0_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/20050913_1</bundle>
+    <bundle>mvn:org.apache.camel/camel-msv/${camel.version}</bundle>
+    <feature version='${camel.version}'>camel-spring-osgi</feature>
+  </feature>
+  <feature name='camel-mvel' version='${camel.version}'>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mvel/2.0.8_3</bundle>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-mvel/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-ognl' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/2.7.3_3</bundle>
+    <bundle>mvn:http://repository.springsource.com/maven/bundles/external!org.jboss.javassist/com.springsource.javassist/3.9.0.GA</bundle>
+    <bundle>mvn:org.apache.camel/camel-ognl/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-printer' version='${camel.version}'>
+    <bundle>mvn:commons-net/commons-net/2.0</bundle>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/0.1.31_3</bundle>
+    <bundle>mvn:org.apache.camel/camel-printer/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-protobuf' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.protobuf-java/${camel.version}_1</bundle>
+    <bundle>mvn:org.apache.camel/camel-protobuf/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-quartz' version='${camel.version}'>
+    <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/1.5.4_1</bundle>
+    <bundle>mvn:commons-dbcp/commons-dbcp/1.3</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/1.7.0_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/1.6.6_1</bundle>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-quartz/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-restlet' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-restlet/${camel.version}</bundle>
+    <bundle>mvn:http://maven.restlet.org!org.restlet/org.restlet/1.1.8</bundle>
+    <bundle>mvn:http://maven.restlet.org!com.noelios.restlet/com.noelios.restlet/1.1.8</bundle>
+  </feature>
+  <feature name='camel-rmi' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-rmi/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-rss' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-atom</feature>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_2</bundle>
+    <bundle>mvn:http://download.java.net/maven/2!rome/rome/1.0</bundle>
+    <bundle>mvn:org.apache.camel/camel-rss/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-saxon' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-spring-osgi</feature>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/9.1.0.1_3</bundle>
+    <bundle>mvn:org.apache.camel/camel-saxon/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-scala' version='${camel.version}'>
+    <bundle>mvn:http://scala-tools.org/repo-releases!org.scala-lang-osgi/scala-library/2.7.7</bundle>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-scala/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-script' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/1.4.0</bundle>
+    <bundle>mvn:org.apache.camel/camel-script/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-smpp' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsmpp/2.0_2</bundle>
+    <bundle>mvn:org.apache.camel/camel-smpp/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-snmp' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.snmp4j/1.8.1_3</bundle>
+    <bundle>mvn:org.apache.camel/camel-snmp/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-spring-integration' version='${camel.version}'>
+    <bundle>mvn:http://repository.springsource.com/maven/bundles/release!org.springframework.integration/org.springframework.integration/1.0.3.RELEASE</bundle>
+    <feature version='${camel.version}'>camel-spring-osgi</feature>
+    <bundle>mvn:org.apache.camel/camel-spring-integration/${camel.version}</bundle>
+  </feature>
+  <!-- current camel-spring-javaconfig need to use spring 3.0.0.RELEASE, so we comment
it out
+    feature name='camel-spring-javaconfig' version='${camel.version}'>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/2.1_3_4</bundle>
+    <bundle>mvn:http://repository.springsource.com/maven/bundles/release!org.springframework/org.springframework.test/2.5.6.SEC01</bundle>
+    <bundle>mvn:http://svn.apache.org/repos/asf/camel/m2-repo!org.springframework.javaconfig/org.springframework.config.java/1.0.0-20090215</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/2.1_3_4</bundle>
+    <feature version='${camel.version}'>camel-spring-osgi</feature>
+    <bundle>mvn:org.apache.camel/camel-spring-javaconfig/${camel.version}</bundle>
+  </feature-->
+  <feature name='camel-sql' version='${camel.version}'>
+    <bundle>mvn:org.springframework/spring-tx/2.5.6.SEC01</bundle>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+    <bundle>mvn:org.springframework/spring-jdbc/2.5.6.SEC01</bundle>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-sql/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-stream' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-stream/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-string-template' version='${camel.version}'>
+    <feature version='${camel.version}'>camel-spring-osgi</feature>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/2.7.7_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.stringtemplate/3.2_3</bundle>
+    <bundle>mvn:org.apache.camel/camel-stringtemplate/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-tagsoup' version='${camel.version}'>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.tagsoup/1.2_3</bundle>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-tagsoup/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-velocity' version='${camel.version}'>
+    <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.1.2</bundle>
+    <bundle>mvn:commons-lang/commons-lang/2.4</bundle>
+    <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.7.0_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/2.7.7_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.werken-xpath/0.9.4_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/2.0.8_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.6.2_3</bundle>
+    <feature version='${camel.version}'>camel-spring-osgi</feature>
+    <bundle>mvn:org.apache.camel/camel-velocity/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-xmlbeans' version='${camel.version}'>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.7.0_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/2.4.0_3</bundle>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-xmlbeans/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-xmlsecurity' version='${camel.version}'>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/2.7.1_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/1.4.3_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/2.9.1_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/1.2_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/5.2_2</bundle>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-xmlsecurity/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-xmpp' version='${camel.version}'>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/1.1.4c_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.smack/3.0.4_2</bundle>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.camel/camel-xmpp/${camel.version}</bundle>
+  </feature>
+  <feature name='camel-xstream' version='${camel.version}'>
+    <bundle>mvn:org.codehaus.jettison/jettison/1.2</bundle>
+    <feature version='${camel.version}'>camel-core</feature>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/1.1.4c_3</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/1.5.2_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/1.6.1_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/1.3_3</bundle>
+    <bundle>mvn:org.apache.camel/camel-xstream/${camel.version}</bundle>
+  </feature>
+</features>

Modified: servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/pom.xml?rev=918862&r1=918861&r2=918862&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/pom.xml Thu Mar  4 05:59:56 2010
@@ -301,7 +301,7 @@
         <dependency>
           <groupId>org.apache.servicemix.bundles</groupId>
           <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
-          <version>${activemq.commons-pool.version}</version>
+          <version>${commons-pool.activemq.version}</version>
         </dependency>
         <dependency>
           <groupId>org.apache.xbean</groupId>



Mime
View raw message