Author: dkulp
Date: Wed Mar 17 03:13:42 2010
New Revision: 924125
URL: http://svn.apache.org/viewvc?rev=924125&view=rev
Log:
Merged revisions 924117 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r924117 | dkulp | 2010-03-16 22:55:57 -0400 (Tue, 16 Mar 2010) | 2 lines
Optimize the UsernameToken only case where there isn't any type of
policy defining a Binding.
........
Added:
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/UsernameTokenInterceptorProvider.java
- copied unchanged from r924117,
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/UsernameTokenInterceptorProvider.java
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
- copied unchanged from r924117,
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/client/client.xml
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/client/client_restricted.xml
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/server/server.xml
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10.wsdl
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10_policy.wsdl
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10_policy_restricted.wsdl
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10_restricted.wsdl
Propchange: cxf/branches/2.2.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java?rev=924125&r1=924124&r2=924125&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
Wed Mar 17 03:13:42 2010
@@ -22,10 +22,16 @@ package org.apache.cxf.ws.security.polic
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
import org.apache.cxf.Bus;
import org.apache.cxf.ws.policy.AssertionBuilderRegistry;
import org.apache.cxf.ws.policy.PolicyBuilder;
import org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistry;
+import org.apache.cxf.ws.policy.builder.xml.XMLPrimitiveAssertionBuilder;
import org.apache.cxf.ws.security.policy.builders.AlgorithmSuiteBuilder;
import org.apache.cxf.ws.security.policy.builders.AsymmetricBindingBuilder;
import
org.apache.cxf.ws.security.policy.builders.ContentEncryptedElementsBuilder;
@@ -58,6 +64,7 @@ import org.apache.cxf.ws.security.policy
import
org.apache.cxf.ws.security.policy.interceptors.HttpsTokenInterceptorProvider;
import
org.apache.cxf.ws.security.policy.interceptors.IssuedTokenInterceptorProvider;
import
org.apache.cxf.ws.security.policy.interceptors.SecureConversationTokenInterceptorProvider;
+import
org.apache.cxf.ws.security.policy.interceptors.UsernameTokenInterceptorProvider;
import
org.apache.cxf.ws.security.policy.interceptors.WSSecurityInterceptorProvider;
import
org.apache.cxf.ws.security.policy.interceptors.WSSecurityPolicyInterceptorProvider;
@@ -117,6 +124,33 @@ public class WSSecurityPolicyLoader {
reg.register(new WSS10Builder());
reg.register(new WSS11Builder());
reg.register(new X509TokenBuilder(pbuild));
+
+ //add generic assertions for these known things to prevent warnings
+ List<QName> others = Arrays.asList(new QName[] {
+ SP12Constants.INCLUDE_TIMESTAMP, SP11Constants.INCLUDE_TIMESTAMP,
+ SP12Constants.ENCRYPT_SIGNATURE, SP11Constants.ENCRYPT_SIGNATURE,
+ SP12Constants.ONLY_SIGN_ENTIRE_HEADERS_AND_BODY,
+ new QName(SP11Constants.SP_NS,
SP11Constants.ONLY_SIGN_ENTIRE_HEADERS_AND_BODY),
+ SP12Constants.WSS_X509_V1_TOKEN_10,
+ SP12Constants.WSS_X509_V1_TOKEN_11,
+ SP12Constants.WSS_X509_V3_TOKEN_10,
+ SP12Constants.WSS_X509_V3_TOKEN_11,
+ SP11Constants.WSS_X509_V1_TOKEN_10,
+ SP11Constants.WSS_X509_V1_TOKEN_11,
+ SP11Constants.WSS_X509_V3_TOKEN_10,
+ SP11Constants.WSS_X509_V3_TOKEN_11,
+ SP12Constants.WSS_X509_PKCS7_TOKEN_11,
+ SP12Constants.WSS_X509_PKI_PATH_V1_TOKEN_11,
+ SP11Constants.WSS_X509_PKCS7_TOKEN_11,
+ SP11Constants.WSS_X509_PKI_PATH_V1_TOKEN_11,
+ SP12Constants.REQUIRE_THUMBPRINT_REFERENCE,
+ SP11Constants.REQUIRE_THUMBPRINT_REFERENCE,
+ SP12Constants.REQUIRE_DERIVED_KEYS,
+ SP11Constants.REQUIRE_DERIVED_KEYS,
+ new QName(SP12Constants.SP_NS,
SP12Constants.ENCRYPT_BEFORE_SIGNING),
+ new QName(SP11Constants.SP_NS,
SP11Constants.ENCRYPT_BEFORE_SIGNING),
+ });
+ reg.register(new XMLPrimitiveAssertionBuilder(others));
}
public void registerProviders() {
@@ -129,6 +163,7 @@ public class WSSecurityPolicyLoader {
reg.register(new WSSecurityInterceptorProvider());
reg.register(new HttpsTokenInterceptorProvider());
reg.register(new IssuedTokenInterceptorProvider());
+ reg.register(new UsernameTokenInterceptorProvider());
reg.register(new SecureConversationTokenInterceptorProvider());
}
Modified:
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java?rev=924125&r1=924124&r2=924125&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java
Wed Mar 17 03:13:42 2010
@@ -40,8 +40,6 @@ public class WSSecurityInterceptorProvid
ASSERTION_TYPES.add(SP12Constants.TRANSPORT_BINDING);
ASSERTION_TYPES.add(SP12Constants.ASYMMETRIC_BINDING);
ASSERTION_TYPES.add(SP12Constants.SYMMETRIC_BINDING);
-
- ASSERTION_TYPES.add(SP12Constants.USERNAME_TOKEN);
}
public WSSecurityInterceptorProvider() {
Modified:
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java?rev=924125&r1=924124&r2=924125&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
Wed Mar 17 03:13:42 2010
@@ -46,6 +46,8 @@ import org.apache.cxf.ws.security.wss4j.
import org.apache.ws.security.message.WSSecHeader;
public class PolicyBasedWSS4JOutInterceptor extends
AbstractPhaseInterceptor<SoapMessage> {
+ public static final String SECURITY_PROCESSED =
PolicyBasedWSS4JOutInterceptor.class.getName() + ".DONE";
+
private PolicyBasedWSS4JOutInterceptorInternal ending;
private SAAJOutInterceptor saajOut = new SAAJOutInterceptor();
@@ -60,6 +62,7 @@ public class PolicyBasedWSS4JOutIntercep
if (mc.getContent(SOAPMessage.class) == null) {
saajOut.handleMessage(mc);
}
+ mc.put(SECURITY_PROCESSED, Boolean.TRUE);
mc.getInterceptorChain().add(ending);
}
public void handleFault(SoapMessage message) {
Modified:
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?rev=924125&r1=924124&r2=924125&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
Wed Mar 17 03:13:42 2010
@@ -82,7 +82,7 @@ public class WSS4JInInterceptor extends
public static final String PRINCIPAL_RESULT = "wss4j.principal.result";
public static final String PROCESSOR_MAP = "wss4j.processor.map";
- private static final String SECURITY_PROCESSED =
WSS4JInInterceptor.class.getName() + ".DONE";
+ public static final String SECURITY_PROCESSED =
WSS4JInInterceptor.class.getName() + ".DONE";
private static final Logger LOG =
LogUtils.getL7dLogger(WSS4JInInterceptor.class);
private static final Logger TIME_LOG =
LogUtils.getL7dLogger(WSS4JInInterceptor.class,
Modified:
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java?rev=924125&r1=924124&r2=924125&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java
(original)
+++
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java
Wed Mar 17 03:13:42 2010
@@ -65,6 +65,7 @@ public class WSSecurity10Test extends Ab
public void testClientServer() {
String[] argv = new String[] {
+ "UserName",
"UserNameOverTransport",
"MutualCertificate10SignEncrypt",
"MutualCertificate10SignEncryptRsa15TripleDes"
@@ -102,6 +103,8 @@ public class WSSecurity10Test extends Ab
try {
if ("UserNameOverTransport".equals(portPrefix)) {
return new URL("https://localhost:9001/"; + portPrefix +
"?wsdl");
+ } else if ("UserName".equals(portPrefix)) {
+ return new URL("http://localhost:9003/"; + portPrefix +
"?wsdl");
} else if ("MutualCertificate10SignEncrypt".equals(portPrefix)) {
return new URL("http://localhost:9002/"; + portPrefix +
"?wsdl");
} else if
("MutualCertificate10SignEncryptRsa15TripleDes".equals(portPrefix)) {
Modified:
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/client/client.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/client/client.xml?rev=924125&r1=924124&r2=924125&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/client/client.xml
(original)
+++
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/client/client.xml
Wed Mar 17 03:13:42 2010
@@ -49,6 +49,12 @@
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
</jaxws:properties>
</jaxws:client>
+ <jaxws:client name="{http://WSSec/wssec10}UserName_IPingService";
createdFromAPI="true">
+ <jaxws:properties>
+ <entry key="ws-security.username" value="Alice"/>
+ <entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
+ </jaxws:properties>
+ </jaxws:client>
<http:conduit name="https://.*/UserNameOverTransport.*";>
<http:tlsClientParameters disableCNCheck="true">
<sec:keyManagers keyPassword="password">
Modified:
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/client/client_restricted.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/client/client_restricted.xml?rev=924125&r1=924124&r2=924125&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/client/client_restricted.xml
(original)
+++
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/client/client_restricted.xml
Wed Mar 17 03:13:42 2010
@@ -49,6 +49,12 @@
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
</jaxws:properties>
</jaxws:client>
+ <jaxws:client name="{http://WSSec/wssec10}UserName_IPingService";
createdFromAPI="true">
+ <jaxws:properties>
+ <entry key="ws-security.username" value="Alice"/>
+ <entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback"/>
+ </jaxws:properties>
+ </jaxws:client>
<http:conduit name="https://.*/UserNameOverTransport.*";>
<http:tlsClientParameters disableCNCheck="true">
<sec:keyManagers keyPassword="password">
Modified:
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/server/server.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/server/server.xml?rev=924125&r1=924124&r2=924125&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/server/server.xml
(original)
+++
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/server/server.xml
Wed Mar 17 03:13:42 2010
@@ -90,7 +90,19 @@
</jaxws:properties>
</jaxws:endpoint>
-
+ <jaxws:endpoint
+ id="UserName"
+ address="http://localhost:9003/UserName";
+ serviceName="interop:PingService"
+ endpointName="interop:UserName_IPingService"
+
implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransport">
+
+ <jaxws:properties>
+ <entry key="ws-security.username" value="Alice"/>
+ <entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.wssec10.server.UTPasswordCallback"/>
+ </jaxws:properties>
+
+ </jaxws:endpoint>
<!-- -->
<!-- Scenario 3.3 -->
Modified:
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml?rev=924125&r1=924124&r2=924125&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml
(original)
+++
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml
Wed Mar 17 03:13:42 2010
@@ -90,6 +90,20 @@
</jaxws:properties>
</jaxws:endpoint>
+ <jaxws:endpoint
+ id="UserName"
+ address="https://localhost:9003/UserName";
+ serviceName="interop:PingService"
+ endpointName="interop:UserName_IPingService"
+
implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted"
+ depends-on="tls-settings">
+
+ <jaxws:properties>
+ <entry key="ws-security.username" value="Alice"/>
+ <entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.ws.wssec10.server.UTPasswordCallback"/>
+ </jaxws:properties>
+
+ </jaxws:endpoint>
<!-- -->
Modified:
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10.wsdl
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10.wsdl?rev=924125&r1=924124&r2=924125&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10.wsdl
(original)
+++
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10.wsdl
Wed Mar 17 03:13:42 2010
@@ -74,6 +74,9 @@
<wsdl:port name="UserNameOverTransport_IPingService"
binding="wssec10test:UserNameOverTransport_IPingService">
<soap:address
location="https://localhost:9001/Security_WsSecurity_Service_Indigo/WsSecurity10.svc/UserNameOverTransport"/>
</wsdl:port>
+ <wsdl:port name="UserName_IPingService"
binding="wssec10test:UserName_IPingService">
+ <soap:address
location="https://localhost:9003/Security_WsSecurity_Service_Indigo/WsSecurity10.svc/UserName"/>
+ </wsdl:port>
<wsdl:port name="MutualCertificate10SignEncrypt_IPingService"
binding="wssec10test:MutualCertificate10SignEncrypt_IPingService">
<soap:address
location="http://localhost:9002/Security_WsSecurity_Service_Indigo/WsSecurity10.svc/MutualCertificate10SignEncrypt"/>
</wsdl:port>
Modified:
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10_policy.wsdl
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10_policy.wsdl?rev=924125&r1=924124&r2=924125&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10_policy.wsdl
(original)
+++
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10_policy.wsdl
Wed Mar 17 03:13:42 2010
@@ -34,6 +34,21 @@
xmlns:wsa10="http://www.w3.org/2005/08/addressing";
xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex";
targetNamespace="http://apache.cxf.org/";>
+ <wsp:Policy wsu:Id="UserName_IPingService_policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SupportingTokens
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+ <wsp:Policy>
+ <sp:UsernameToken
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
+ <wsp:Policy>
+ <sp:WssUsernameToken10/>
+ </wsp:Policy>
+ </sp:UsernameToken>
+ </wsp:Policy>
+ </sp:SupportingTokens>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
<wsp:Policy wsu:Id="UserNameOverTransport_IPingService_policy">
<wsp:ExactlyOne>
<wsp:All>
@@ -271,6 +286,21 @@
<wsdl:import location="WsSecurity10.wsdl"
namespace="http://WSSec/wssec10"/>
<wsdl:types/>
+ <wsdl:binding name="UserName_IPingService" type="wssec10test:IPingService">
+ <wsp:PolicyReference URI="#UserName_IPingService_policy"/>
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
+
+ <wsdl:operation name="echo">
+ <soap:operation soapAction="http://WSSec/wssec10/echo";
style="document"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+
+ </wsdl:binding>
<wsdl:binding name="UserNameOverTransport_IPingService"
type="wssec10test:IPingService">
<wsp:PolicyReference
URI="#UserNameOverTransport_IPingService_policy"/>
<soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
Modified:
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10_policy_restricted.wsdl
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10_policy_restricted.wsdl?rev=924125&r1=924124&r2=924125&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10_policy_restricted.wsdl
(original)
+++
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10_policy_restricted.wsdl
Wed Mar 17 03:13:42 2010
@@ -34,6 +34,21 @@
xmlns:wsa10="http://www.w3.org/2005/08/addressing";
xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex";
targetNamespace="http://apache.cxf.org/";>
+ <wsp:Policy wsu:Id="UserName_IPingService_policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SupportingTokens
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+ <wsp:Policy>
+ <sp:UsernameToken
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
+ <wsp:Policy>
+ <sp:WssUsernameToken10/>
+ </wsp:Policy>
+ </sp:UsernameToken>
+ </wsp:Policy>
+ </sp:SupportingTokens>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
<wsp:Policy wsu:Id="UserNameOverTransport_IPingService_policy">
<wsp:ExactlyOne>
<wsp:All>
@@ -285,6 +300,21 @@
</wsdl:operation>
</wsdl:binding>
+ <wsdl:binding name="UserName_IPingService" type="wssec10test:IPingService">
+ <wsp:PolicyReference URI="#UserName_IPingService_policy"/>
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
+
+ <wsdl:operation name="echo">
+ <soap:operation soapAction="http://WSSec/wssec10/echo";
style="document"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+
+ </wsdl:binding>
<wsdl:binding name="MutualCertificate10SignEncrypt_IPingService"
type="wssec10test:IPingService">
<wsp:PolicyReference
URI="#MutualCertificate10SignEncrypt_IPingService_policy"/>
<soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
Modified:
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10_restricted.wsdl
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10_restricted.wsdl?rev=924125&r1=924124&r2=924125&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10_restricted.wsdl
(original)
+++
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec10/WsSecurity10_restricted.wsdl
Wed Mar 17 03:13:42 2010
@@ -74,6 +74,9 @@
<wsdl:port name="UserNameOverTransport_IPingService"
binding="wssec10test:UserNameOverTransport_IPingService">
<soap:address
location="https://localhost:9001/Security_WsSecurity_Service_Indigo/WsSecurity10.svc/UserNameOverTransport"/>
</wsdl:port>
+ <wsdl:port name="UserName_IPingService"
binding="wssec10test:UserName_IPingService">
+ <soap:address
location="http://localhost:9003/Security_WsSecurity_Service_Indigo/WsSecurity10.svc/UserName"/>
+ </wsdl:port>
<wsdl:port name="MutualCertificate10SignEncrypt_IPingService"
binding="wssec10test:MutualCertificate10SignEncrypt_IPingService">
<soap:address
location="http://localhost:9002/Security_WsSecurity_Service_Indigo/WsSecurity10.svc/MutualCertificate10SignEncrypt"/>
</wsdl:port>
