Author: ffang
Date: Tue Sep 6 05:20:55 2011
New Revision: 1165500
URL: http://svn.apache.org/viewvc?rev=1165500&view=rev
Log:
[SMX4-802]use features.xml from cxf
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=1165500&r1=1165499&r2=1165500&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Tue Sep 6 05:20:55 2011
@@ -86,6 +86,15 @@
<type>xml</type>
<classifier>features</classifier>
</dependency>
+
+ <!-- Cxf -->
+ <dependency>
+ <groupId>org.apache.cxf.karaf</groupId>
+ <artifactId>apache-cxf</artifactId>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+
<!--Xerces jar to be included in lib/endorsed -->
<dependency>
@@ -138,9 +147,12 @@
<descriptor>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</descriptor>
+
<descriptor>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features</descriptor>
<descriptor>file:${basedir}/target/classes/features.xml</descriptor>
</descriptors>
<features>
+ <feature>cxf</feature>
+ <feature>saaj</feature>
<feature>obr</feature>
<feature>config</feature>
<feature>activemq</feature>
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=1165500&r1=1165499&r2=1165500&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
Tue Sep 6 05:20:55 2011
@@ -16,7 +16,7 @@
limitations under the License.
-->
<features>
-
+
<repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features</repository>
<repository>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</repository>
<repository>mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features</repository>
<repository>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</repository>
@@ -33,46 +33,12 @@
<bundle
dependency="true">mvn:org.springframework/spring-context/${spring.version}</bundle>
â
<bundle
dependency="true">mvn:org.springframework/spring-aop/${spring.version}</bundle>
</feature>
- <feature name="cxf" version="${cxf.version}" resolver="(obr)"
start-level='50'>
- <feature>transaction</feature>
- <feature>woodstox</feature>
- <bundle
dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata.version}</bundle>
+ <feature name="saaj" version="${saaj-impl.bundle.version}"
resolver='(obr)'>
<bundle
dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}/${servicemix.specs.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws-api.version}/${servicemix.specs.version}</bundle>
- <bundle
dependency="true">mvn:javax.mail/mail/${javax.mail.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${fastinfoset.bundle.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-impl.bundle.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.neethi/neethi/${neethi.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${saaj-impl.bundle.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/${xmlschema.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver.bundle.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces.bundle.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel.bundle.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan.bundle.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1/${servicemix.specs.version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.bundle.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime.bundle.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${opensaml.bundle.version}</bundle>
- <bundle>mvn:org.apache.ws.security/wss4j/${wss4j.version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans.bundle.version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.bundle.version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity.bundle.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera.bundle.version}</bundle>
- <bundle
dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
- <bundle>mvn:org.codehaus.jettison/jettison/${jettison.version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.ws.commons.axiom/axiom-impl/${axiom.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.ws.commons.axiom/axiom-api/${axiom.version}</bundle>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
- <bundle>mvn:org.apache.cxf/cxf-bundle/${cxf.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${saaj-impl.bundle.version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.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>
@@ -166,6 +132,7 @@
</feature>
<feature name="examples-cxf-ws-security-osgi" version="${version}"
resolver="(obr)">
<feature>cxf-osgi</feature>
+ <feature version="${saaj-impl.bundle.version}">saaj</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>
Modified: servicemix/smx4/features/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1165500&r1=1165499&r2=1165500&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Tue Sep 6 05:20:55 2011
@@ -270,6 +270,15 @@
<type>xml</type>
<classifier>features</classifier>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf.karaf</groupId>
+ <artifactId>apache-cxf</artifactId>
+ <version>${cxf.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+
<!-- Geronimo -->
<dependency>
