You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cxf.apache.org by ay...@apache.org on 2013/12/11 18:02:58 UTC

svn commit: r1550188 - in /cxf/branches/2.7.x-fixes/systests/ws-rm: pom.xml src/test/java/org/apache/cxf/systest/ws/rm/sec/UTPasswordCallback.java

Author: ay
Date: Wed Dec 11 17:02:57 2013
New Revision: 1550188

URL: http://svn.apache.org/r1550188
Log:
fix build in 2.7.x for incompatible test for CXF-5405

Modified:
    cxf/branches/2.7.x-fixes/systests/ws-rm/pom.xml
    cxf/branches/2.7.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/UTPasswordCallback.java

Modified: cxf/branches/2.7.x-fixes/systests/ws-rm/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-rm/pom.xml?rev=1550188&r1=1550187&r2=1550188&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/ws-rm/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/systests/ws-rm/pom.xml Wed Dec 11 17:02:57 2013
@@ -87,6 +87,12 @@
             <artifactId>cxf-rt-ws-rm</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <!--  rt-ws-security dependency is required prior to 3.0.0 -->
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-ws-security</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-policy</artifactId>

Modified: cxf/branches/2.7.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/UTPasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/UTPasswordCallback.java?rev=1550188&r1=1550187&r2=1550188&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/UTPasswordCallback.java (original)
+++ cxf/branches/2.7.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/UTPasswordCallback.java Wed Dec 11 17:02:57 2013
@@ -26,7 +26,7 @@ import javax.security.auth.callback.Call
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.UnsupportedCallbackException;
 
-import org.apache.wss4j.common.ext.WSPasswordCallback;
+import org.apache.ws.security.WSPasswordCallback;
 
 /**
  * A CallbackHandler implementation for UsernameTokens.