Author: coheigea
Date: Mon Jul 25 15:05:35 2011
New Revision: 1150737
URL: http://svn.apache.org/viewvc?rev=1150737&view=rev
Log:
Changing around some of the Kerberos types.
Modified:
cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java
cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/client/KerberosCallbackHandler.java
cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml
cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/wsdl_systest_wssec/kerberos/DoubleItKerberos.wsdl
Modified:
cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java?rev=1150737&r1=1150736&r2=1150737&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java
(original)
+++
cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java
Mon Jul 25 15:05:35 2011
@@ -82,7 +82,7 @@ public class KerberosTokenTest extends A
try {
KerberosCallbackHandler handler = new KerberosCallbackHandler();
- handler.setValueType(WSConstants.WSS_GSS_KRB_V5_AP_REQ);
+ handler.setValueType(WSConstants.WSS_KRB_V5_AP_REQ);
((BindingProvider)kerberosPort).getRequestContext().put(
"ws-security.bst-callback-handler", handler
);
@@ -229,7 +229,7 @@ public class KerberosTokenTest extends A
}
KerberosCallbackHandler handler = new KerberosCallbackHandler();
- handler.setValueType(WSConstants.WSS_GSS_KRB_V5_AP_REQ);
+ handler.setValueType(WSConstants.WSS_KRB_V5_AP_REQ);
((BindingProvider)kerberosPort).getRequestContext().put(
"ws-security.bst-callback-handler", handler
);
Modified:
cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/client/KerberosCallbackHandler.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/client/KerberosCallbackHandler.java?rev=1150737&r1=1150736&r2=1150737&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/client/KerberosCallbackHandler.java
(original)
+++
cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/client/KerberosCallbackHandler.java
Mon Jul 25 15:05:35 2011
@@ -38,7 +38,7 @@ import org.apache.ws.security.message.to
*/
public class KerberosCallbackHandler implements CallbackHandler {
- private String valueType = WSConstants.WSS_KRB_V5_AP_REQ;
+ private String valueType = WSConstants.WSS_GSS_KRB_V5_AP_REQ;
private String token = "8721958125981";
public KerberosCallbackHandler() {
Modified:
cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml?rev=1150737&r1=1150736&r2=1150737&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml
(original)
+++
cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml
Mon Jul 25 15:05:35 2011
@@ -82,6 +82,7 @@
depends-on="tls-settings">
<jaxws:properties>
+ <entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:endpoint>
@@ -146,6 +147,7 @@
<entry key="ws-security.encryption.username" value="alice"/>
<entry key="ws-security.bst.validator"
value="org.apache.cxf.systest.ws.kerberos.server.KerberosTokenValidator"/>
+ <entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:endpoint>
Modified:
cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/wsdl_systest_wssec/kerberos/DoubleItKerberos.wsdl
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/wsdl_systest_wssec/kerberos/DoubleItKerberos.wsdl?rev=1150737&r1=1150736&r2=1150737&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/wsdl_systest_wssec/kerberos/DoubleItKerberos.wsdl
(original)
+++
cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/wsdl_systest_wssec/kerberos/DoubleItKerberos.wsdl
Mon Jul 25 15:05:35 2011
@@ -200,7 +200,7 @@
<sp:KerberosToken
sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once";>
<wsp:Policy>
- <sp:WssKerberosV5ApReqToken11/>
+ <sp:WssGssKerberosV5ApReqToken11/>
</wsp:Policy>
</sp:KerberosToken>
</wsp:Policy>
@@ -251,7 +251,7 @@
<sp:KerberosToken
sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once";>
<wsp:Policy>
- <sp:WssKerberosV5ApReqToken11/>
+ <sp:WssGssKerberosV5ApReqToken11/>
</wsp:Policy>
</sp:KerberosToken>
</wsp:Policy>
@@ -302,7 +302,7 @@
<sp:KerberosToken
sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once";>
<wsp:Policy>
- <sp:WssKerberosV5ApReqToken11/>
+ <sp:WssGssKerberosV5ApReqToken11/>
</wsp:Policy>
</sp:KerberosToken>
</wsp:Policy>
@@ -364,7 +364,7 @@
<sp:KerberosToken
sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once";>
<wsp:Policy>
- <sp:WssGssKerberosV5ApReqToken11/>
+ <sp:WssKerberosV5ApReqToken11/>
</wsp:Policy>
</sp:KerberosToken>
</wsp:Policy>
