You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2010/03/29 12:36:22 UTC
svn commit: r928693 - in
/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources:
camel-features.xml features.xml
Author: ffang
Date: Mon Mar 29 10:36:22 2010
New Revision: 928693
URL: http://svn.apache.org/viewvc?rev=928693&view=rev
Log:
[SMX4-508] features should be self contained
Modified:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
Modified: 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=928693&r1=928692&r2=928693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/camel-features.xml Mon Mar 29 10:36:22 2010
@@ -21,7 +21,8 @@
<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-spring-osgi</feature>
+ <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>
@@ -313,11 +314,6 @@
<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>
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=928693&r1=928692&r2=928693&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml Mon Mar 29 10:36:22 2010
@@ -25,8 +25,11 @@
<bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo.j2ee.connector.version}</bundle>
<bundle>mvn:org.apache.geronimo.components/geronimo-connector/${geronimo.connector.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms.version}</bundle>
- <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle> <!-- looks like Jencks 2.2 needs this -->
- <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle> <!-- looks like Jencks 2.2 needs this -->
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
+ <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
+ <bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>
+ <bundle>mvn:org.springframework/spring-context/${spring.version}</bundle>
+ <bundle>mvn:org.springframework/spring-aop/${spring.version}</bundle>
<bundle>mvn:org.jencks/jencks/${jencks.version}</bundle>
</feature>
<feature name="web-core" version="${version}">
@@ -62,6 +65,7 @@
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}/${servicemix.specs.version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws.api.version}/${servicemix.specs.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
<bundle>mvn:javax.mail/mail/${javax.mail.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${fastinfoset.version}</bundle>
@@ -82,12 +86,17 @@
<bundle>mvn:org.apache.ws.security/wss4j/${wss4j.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans.version}</bundle>
<bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
+ <bundle>mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec.version}</bundle>
<bundle>mvn:org.codehaus.jettison/jettison/${jettison.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.version}</bundle>
<bundle>mvn:org.apache.ws.commons.axiom/axiom-impl/${axiom.version}</bundle>
<bundle>mvn:org.apache.ws.commons.axiom/axiom-api/${axiom.version}</bundle>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.transaction/org.apache.servicemix.transaction/${servicemix.nmr.version}</bundle>
<bundle>mvn:org.apache.cxf/cxf-bundle/${cxf.version}</bundle>
</feature>
<feature name="cxf-osgi" version="${version}">
@@ -108,14 +117,13 @@
<bundle>mvn:org.apache.servicemix.cxf/org.apache.servicemix.cxf.binding.nmr/${version}</bundle>
</feature>
- <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-nmr" version="${version}">
<feature version="${camel.version}">camel</feature>
<feature version="${servicemix.nmr.version}">nmr</feature>
+ <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws.api.version}/${servicemix.specs.version}</bundle>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo.wsmetadata.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
<bundle>mvn:org.apache.servicemix.camel/org.apache.servicemix.camel.component/${version}</bundle>
</feature>
@@ -133,14 +141,20 @@
<feature name="examples-cxf-osgi" version="${version}">
<feature version="${version}">cxf-osgi</feature>
+ <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
+ <bundle>mvn:org.apache.servicemix/servicemix-utils/${servicemix-utils.version}</bundle>
+ <bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-osgi/${version}</bundle>
</feature>
<feature name="examples-cxf-jaxrs" version="${version}">
<feature version="${version}">cxf-jaxrs</feature>
+ <bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-jaxrs/${version}</bundle>
</feature>
<feature name="examples-cxf-nmr" version="${version}">
<feature version="${version}">cxf-nmr</feature>
+ <bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-nmr/${version}</bundle>
</feature>
<feature name="examples-camel-osgi" version="${version}">
@@ -154,20 +168,28 @@
<feature name="examples-cxf-camel-nmr" version="${version}">
<feature version="${version}">camel-nmr</feature>
<feature version="${version}">cxf-nmr</feature>
+ <bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-camel-nmr/${version}</bundle>
</feature>
<feature name="examples-cxf-ws-addressing" version="${version}">
<feature>cxf-osgi</feature>
+ <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
+ <bundle>mvn:org.apache.servicemix/servicemix-utils/${servicemix-utils.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-ws-addressing/${version}</bundle>
+ <bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>
</feature>
<feature name="examples-cxf-wsdl-first-osgi-package" version="${version}">
<feature version="${servicemix-cxf-bc-version}">servicemix-cxf-bc</feature>
<feature version="${servicemix-cxf-se-version}">servicemix-cxf-se</feature>
+ <bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples.cxf-wsdl-first-osgi-package/wsdl-first-cxfbc-bundle/${version}</bundle>
<bundle>mvn:org.apache.servicemix.examples.cxf-wsdl-first-osgi-package/wsdl-first-cxfse-bundle/${version}</bundle>
</feature>
<feature name="examples-cxf-ws-security-osgi" version="${version}">
<feature>cxf-osgi</feature>
+ <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
+ <bundle>mvn:org.apache.servicemix/servicemix-utils/${servicemix-utils.version}</bundle>
+ <bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-osgi/${version}</bundle>
</feature>
<!--