[SMX4-1120]remove some uncessary features
git-svn-id: https://svn.apache.org/repos/asf/servicemix/smx4/features/trunk@1307720 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/assemblies/apache-servicemix/src/main/filtered-resources/features.xml b/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
index ce5e6b6..46c93c0 100644
--- a/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
+++ b/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
@@ -35,16 +35,6 @@
<bundle dependency="true">mvn:org.springframework/spring-aop/${spring.version}</bundle>
</feature>
- <feature name="cxf-osgi" version="${version}" resolver="(obr)" start-level='50'>
- <feature version="${cxf.version}">cxf</feature>
- <feature version="${karaf.version}">war</feature>
- </feature>
- <feature name="cxf-jaxrs" version="${version}" resolver="(obr)" start-level='50'>
- <feature version="${version}">cxf-osgi</feature>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera.bundle.version}</bundle>
- <bundle dependency="true">mvn:org.codehaus.jettison/jettison/${jettison.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans.bundle.version}</bundle>
- </feature>
<feature name="cxf-nmr" version="${version}" resolver="(obr)" start-level='50'>
<feature version="${cxf.version}">cxf</feature>
<feature version="${servicemix.nmr.version}">nmr</feature>
@@ -76,14 +66,14 @@
<bundle>mvn:org.apache.servicemix.examples/activemq-camel-blueprint/${version}</bundle>
</feature>
<feature name="examples-cxf-osgi" version="${version}" resolver="(obr)">
- <feature version="${version}">cxf-osgi</feature>
+ <feature version="${cxf.version}">cxf</feature>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix/servicemix-utils/${servicemix.utils.version}</bundle>
<bundle dependency="true">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}" resolver="(obr)">
- <feature version="${version}">cxf-jaxrs</feature>
+ <feature version="${cxf.version}">cxf</feature>
<bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-jaxrs/${version}</bundle>
@@ -117,7 +107,7 @@
<bundle>mvn:org.apache.servicemix.examples/cxf-camel-nmr/${version}</bundle>
</feature>
<feature name="examples-cxf-ws-addressing" version="${version}" resolver="(obr)">
- <feature>cxf-osgi</feature>
+ <feature version="${cxf.version}">cxf</feature>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix/servicemix-utils/${servicemix.utils.version}</bundle>
<bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
@@ -131,14 +121,14 @@
<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}" resolver="(obr)">
- <feature>cxf-osgi</feature>
+ <feature version="${cxf.version}">cxf</feature>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix/servicemix-utils/${servicemix.utils.version}</bundle>
<bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-osgi/${version}</bundle>
</feature>
<feature name="examples-cxf-ws-security-blueprint" version="${version}" resolver="(obr)">
- <feature>cxf-osgi</feature>
+ <feature version="${cxf.version}">cxf</feature>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix/servicemix-utils/${servicemix.utils.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-blueprint/${version}</bundle>
