Fixing test

Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0bdc8eec
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0bdc8eec
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0bdc8eec

Branch: refs/heads/3.0.x-fixes
Commit: 0bdc8eec5b1172212ce6ad987d1169a3d978681d
Parents: 063f6d4
Author: Colm O hEigeartaigh <[email protected]>
Authored: Mon Jan 4 14:00:21 2016 +0000
Committer: Colm O hEigeartaigh <[email protected]>
Committed: Mon Jan 4 14:00:21 2016 +0000

----------------------------------------------------------------------
 .../src/test/resources/org/apache/cxf/systest/ws/ut/client.xml   | 4 ++--
 .../src/test/resources/org/apache/cxf/systest/ws/ut/server.xml   | 2 +-
 .../test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/0bdc8eec/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml
index 3ddcaf6..7a204f6 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml
@@ -51,8 +51,8 @@
     </jaxws:client>
     <jaxws:client 
name="{http://www.example.org/contract/DoubleIt}DoubleItPlaintextSupportingSP11Port";
 createdFromAPI="true">
         <jaxws:properties>
-            <entry key="security.username" value="Alice"/>
-            <entry key="security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
+            <entry key="ws-security.username" value="Alice"/>
+            <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client 
name="{http://www.example.org/contract/DoubleIt}DoubleItHashedPort"; 
createdFromAPI="true">

http://git-wip-us.apache.org/repos/asf/cxf/blob/0bdc8eec/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml
index 124fa5b..a87506c 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml
@@ -59,7 +59,7 @@
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="PlaintextSupportingSP11" 
address="https://localhost:${testutil.ports.ut.Server}/DoubleItUTPlaintextSupportingSP11";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItPlaintextSupportingSP11Port" 
implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" 
wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" 
depends-on="tls-settings">
         <jaxws:properties>
-            <entry key="security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
+            <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
         </jaxws:properties>
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="Hashed" 
address="https://localhost:${testutil.ports.ut.Server}/DoubleItUTHashed"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItHashedPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" 
wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" 
depends-on="tls-settings">

http://git-wip-us.apache.org/repos/asf/cxf/blob/0bdc8eec/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml
index f8bd92e..c4261c7 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml
@@ -62,7 +62,7 @@
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="PlaintextSupportingSP11" 
address="https://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTPlaintextSupportingSP11";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItPlaintextSupportingSP11Port" 
implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" 
wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" 
depends-on="tls-settings">
         <jaxws:properties>
-            <entry key="security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
+            <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>
     </jaxws:endpoint>

Reply via email to