cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1490729 - in /cxf/trunk: osgi/karaf/features/src/main/resources/features.xml parent/pom.xml
Date Fri, 07 Jun 2013 17:03:49 GMT
Author: dkulp
Date: Fri Jun  7 17:03:48 2013
New Revision: 1490729

URL: http://svn.apache.org/r1490729
Log:
Work on getting the wss4j stuff loading in osgi

Modified:
    cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
    cxf/trunk/parent/pom.xml

Modified: cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/karaf/features/src/main/resources/features.xml?rev=1490729&r1=1490728&r2=1490729&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Fri Jun  7 17:03:48 2013
@@ -61,6 +61,7 @@
     <feature name="wss4j" version="${cxf.wss4j.version}" resolver='(obr)'>
         <feature version="${project.version}">cxf-specs</feature>
         <bundle start-level='25' dependency="true">mvn:joda-time/joda-time/${cxf.joda.time.version}</bundle>
+        <bundle start-level='25' dependency="true">mvn:commons-codec/commons-codec/${cxf.commons-codec.version}</bundle>
         <bundle start-level='25' dependency="true">mvn:org.apache.santuario/xmlsec/${cxf.xmlsec.bundle.version}</bundle>
         <bundle start-level='25' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${cxf.opensaml.osgi.version}</bundle>
         <bundle start-level='25'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}</bundle>
@@ -69,15 +70,14 @@
         <bundle start-level='30' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${cxf.bcel.bundle.version}</bundle>
         <bundle start-level='30' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${cxf.xalan.bundle.version}</bundle>
 
-        <bundle start-level='30'>mvn:org.apache.ws.security/wss4j-ws-security-common/${cxf.wss4j.version}</bundle>
-        <bundle start-level='30'>mvn:org.apache.ws.security/wss4j-ws-security-dom/${cxf.wss4j.version}</bundle>
-        <!--  NOT YET BUNDLES
-        <bundle start-level='30'>mvn:org.apache.ws.security/wss4j-policy/${cxf.wss4j.version}</bundle>
-        <bundle start-level='30'>mvn:org.apache.ws.security/wss4j-ws-security-stax/${cxf.wss4j.version}</bundle>
-        <bundle start-level='30'>mvn:org.apache.ws.security/wss4j-bindings-wss10/${cxf.wss4j.version}</bundle>
-        <bundle start-level='30'>mvn:org.apache.ws.security/wss4j-bindings-wsu10/${cxf.wss4j.version}</bundle>
-        <bundle start-level='30'>mvn:org.apache.ws.security/wss4j-bindings-wssc/${cxf.wss4j.version}</bundle>
-        -->
+        <bundle start-level='30'>mvn:org.apache.wss4j/wss4j-bindings-wsu10/${cxf.wss4j.version}</bundle>
+        <bundle start-level='30'>mvn:org.apache.wss4j/wss4j-bindings-wss10/${cxf.wss4j.version}</bundle>
+        <bundle start-level='30'>mvn:org.apache.wss4j/wss4j-bindings-wss11/${cxf.wss4j.version}</bundle>
+        <bundle start-level='30'>mvn:org.apache.wss4j/wss4j-bindings-wssc/${cxf.wss4j.version}</bundle>
+        <bundle start-level='30'>mvn:org.apache.wss4j/wss4j-ws-security-common/${cxf.wss4j.version}</bundle>
+        <bundle start-level='30'>mvn:org.apache.wss4j/wss4j-ws-security-dom/${cxf.wss4j.version}</bundle>
+        <bundle start-level='30'>mvn:org.apache.wss4j/wss4j-policy/${cxf.wss4j.version}</bundle>
+        <bundle start-level='30'>mvn:org.apache.wss4j/wss4j-ws-security-stax/${cxf.wss4j.version}</bundle>
     </feature>
 
     <feature name="cxf-core" version="${project.version}" resolver='(obr)'>

Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1490729&r1=1490728&r2=1490729&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Fri Jun  7 17:03:48 2013
@@ -180,7 +180,7 @@
         <cxf.jaxb.bundle.version>2.2.1.1_2</cxf.jaxb.bundle.version>
         <cxf.saaj-impl.bundle.version>1.3.20_1</cxf.saaj-impl.bundle.version>
         <cxf.wsdl4j.bundle.version>1.6.2_6</cxf.wsdl4j.bundle.version>
-        <cxf.xmlsec.bundle.version>1.5.4</cxf.xmlsec.bundle.version>
+        <cxf.xmlsec.bundle.version>2.0.0-SNAPSHOT</cxf.xmlsec.bundle.version>
         <cxf.rhino.bundle.version>1.7R2_3</cxf.rhino.bundle.version>
         <cxf.xmlresolver.bundle.version>1.2_5</cxf.xmlresolver.bundle.version>
         <cxf.xerces.bundle.version>2.9.1_5</cxf.xerces.bundle.version>



Mime
View raw message