You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2012/02/20 16:51:12 UTC
svn commit: r1291327 - in /webservices/wss4j/branches/swssf/cxf-integration: pom.xml src/test/resources/integration/test-application-context.xml

Author: coheigea
Date: Mon Feb 20 15:51:12 2012
New Revision: 1291327

URL: http://svn.apache.org/viewvc?rev=1291327&view=rev
Log:
Upgrade to CXF 2.5.2

Modified:
    webservices/wss4j/branches/swssf/cxf-integration/pom.xml
    webservices/wss4j/branches/swssf/cxf-integration/src/test/resources/integration/test-application-context.xml

Modified: webservices/wss4j/branches/swssf/cxf-integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/cxf-integration/pom.xml?rev=1291327&r1=1291326&r2=1291327&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/cxf-integration/pom.xml (original)
+++ webservices/wss4j/branches/swssf/cxf-integration/pom.xml Mon Feb 20 15:51:12 2012
@@ -33,7 +33,7 @@
     <name>Streaming WS Security CXF Integration</name>
 
     <properties>
-        <cxf.version>2.4.3</cxf.version>
+        <cxf.version>2.5.2</cxf.version>
     </properties>
 
     <dependencies>

Modified: webservices/wss4j/branches/swssf/cxf-integration/src/test/resources/integration/test-application-context.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/cxf-integration/src/test/resources/integration/test-application-context.xml?rev=1291327&r1=1291326&r2=1291327&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/cxf-integration/src/test/resources/integration/test-application-context.xml (original)
+++ webservices/wss4j/branches/swssf/cxf-integration/src/test/resources/integration/test-application-context.xml Mon Feb 20 15:51:12 2012
@@ -6,17 +6,28 @@
        xmlns:http="http://cxf.apache.org/transports/http/configuration"
        xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
        xmlns:jaxws="http://cxf.apache.org/jaxws"
+       xmlns:cxf="http://cxf.apache.org/core"
+       xmlns:p="http://cxf.apache.org/policy"
        xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
        http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
        http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
        http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd
-       http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
+       http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
+       http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
 
     <import resource="classpath:META-INF/cxf/cxf.xml"/>
     <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
 
+   <!-- Uncomment for logging
+    <cxf:bus>
+        <cxf:features>
+            <cxf:logging/>
+        </cxf:features>
+    </cxf:bus>
+    -->
+    
     <bean name="inSecurityProperties" class="org.swssf.wss.ext.WSSSecurityProperties">
         <property name="callbackHandler" ref="callbackHandler"/>
         <property name="outAction">