http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml index 473485b..32d8f3a 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml @@ -30,7 +30,7 @@ <!-- Transport Layer Security (TLS) settings --> <!-- --> <httpj:engine-factory id="tls-settings"> - <httpj:engine port="${testutil.ports.Server.2}"> + <httpj:engine port="${testutil.ports.policy.Server.2}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Bethal.jks"/> @@ -39,7 +39,7 @@ </httpj:tlsServerParameters> </httpj:engine> </httpj:engine-factory> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricEndpoint" address="http://localhost:${testutil.ports.Server}/DoubleItAsymmetric"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricEndpoint" address="http://localhost:${testutil.ports.policy.Server}/DoubleItAsymmetric"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -52,7 +52,7 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="NoSecurityEndpoint" address="http://localhost:${testutil.ports.Server}/DoubleItNoSecurity"; serviceName="s:DoubleItService" endpointName="s:DoubleItNoSecurityPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="NoSecurityEndpoint" address="http://localhost:${testutil.ports.policy.Server}/DoubleItNoSecurity"; serviceName="s:DoubleItService" endpointName="s:DoubleItNoSecurityPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -65,7 +65,7 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="UsernameTokenEndpoint" address="http://localhost:${testutil.ports.Server}/DoubleItUsernameToken"; serviceName="s:DoubleItService" endpointName="s:DoubleItUsernameTokenPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="UsernameTokenEndpoint" address="http://localhost:${testutil.ports.policy.Server}/DoubleItUsernameToken"; serviceName="s:DoubleItService" endpointName="s:DoubleItUsernameTokenPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -78,7 +78,7 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="ClientCertTokenEndpoint" address="https://localhost:${testutil.ports.Server.2}/DoubleItClientCert"; serviceName="s:DoubleItService" endpointName="s:DoubleItClientCertPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="ClientCertTokenEndpoint" address="https://localhost:${testutil.ports.policy.Server.2}/DoubleItClientCert"; serviceName="s:DoubleItService" endpointName="s:DoubleItClientCertPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> @@ -88,7 +88,7 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TransportSupportingSigned" address="https://localhost:${testutil.ports.Server.2}/DoubleItTransportSupportingSigned"; serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSupportingSignedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TransportSupportingSigned" address="https://localhost:${testutil.ports.policy.Server.2}/DoubleItTransportSupportingSigned"; serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSupportingSignedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -99,7 +99,7 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TransportUTSupportingSigned" address="https://localhost:${testutil.ports.Server.2}/DoubleItTransportUTSupportingSigned"; serviceName="s:DoubleItService" endpointName="s:DoubleItTransportUTSupportingSignedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TransportUTSupportingSigned" address="https://localhost:${testutil.ports.policy.Server.2}/DoubleItTransportUTSupportingSigned"; serviceName="s:DoubleItService" endpointName="s:DoubleItTransportUTSupportingSignedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml index 14a803a..0cffc9f 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml @@ -30,7 +30,7 @@ <!-- Transport Layer Security (TLS) settings --> <!-- --> <httpj:engine-factory id="tls-settings"> - <httpj:engine port="${testutil.ports.Server.2}"> + <httpj:engine port="${testutil.ports.saml.Server.2}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Bethal.jks"/> @@ -42,11 +42,11 @@ </httpj:tlsServerParameters> </httpj:engine> </httpj:engine-factory> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml1TokenOverTransport" address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml1Transport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1TransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml1TokenOverTransport" address="https://localhost:${testutil.ports.saml.Server.2}/DoubleItSaml1Transport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1TransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml1TokenOverTransport2" address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml1Transport2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1TransportPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml1TokenOverTransport2" address="https://localhost:${testutil.ports.saml.Server.2}/DoubleItSaml1Transport2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1TransportPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> </jaxws:properties> <jaxws:features> @@ -55,21 +55,21 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml1SupportingToken" address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml1Supporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1SupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml1SupportingToken" address="https://localhost:${testutil.ports.saml.Server.2}/DoubleItSaml1Supporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1SupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverSymmetric" address="http://localhost:${testutil.ports.Server}/DoubleItSaml2Symmetric"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2SymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverSymmetric" address="http://localhost:${testutil.ports.saml.Server}/DoubleItSaml2Symmetric"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2SymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.saml2.validator" value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverAsymmetric" address="http://localhost:${testutil.ports.Server}/DoubleItSaml2Asymmetric"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2AsymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverAsymmetric" address="http://localhost:${testutil.ports.saml.Server}/DoubleItSaml2Asymmetric"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2AsymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.username" value="bob"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> @@ -79,7 +79,7 @@ <entry key="ws-security.saml2.validator" value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverAsymmetric2" address="http://localhost:${testutil.ports.Server}/DoubleItSaml2Asymmetric2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2AsymmetricPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverAsymmetric2" address="http://localhost:${testutil.ports.saml.Server}/DoubleItSaml2Asymmetric2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2AsymmetricPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.username" value="bob"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> @@ -94,35 +94,35 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml1SelfSignedTokenOverTransport" address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml1SelfSignedTransport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1SelfSignedTransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml1SelfSignedTokenOverTransport" address="https://localhost:${testutil.ports.saml.Server.2}/DoubleItSaml1SelfSignedTransport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1SelfSignedTransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml1SelfSignedTokenOverTransportSP11" address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml1SelfSignedTransportSP11"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1SelfSignedTransportSP11Port" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml1SelfSignedTokenOverTransportSP11" address="https://localhost:${testutil.ports.saml.Server.2}/DoubleItSaml1SelfSignedTransportSP11"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1SelfSignedTransportSP11Port" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2EndorsingOverTransport" address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml2EndorsingTransport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2EndorsingTransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2EndorsingOverTransport" address="https://localhost:${testutil.ports.saml.Server.2}/DoubleItSaml2EndorsingTransport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2EndorsingTransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2EndorsingOverTransportSP11" address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml2EndorsingTransportSP11"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2EndorsingTransportSP11Port" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2EndorsingOverTransportSP11" address="https://localhost:${testutil.ports.saml.Server.2}/DoubleItSaml2EndorsingTransportSP11"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2EndorsingTransportSP11Port" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSamlInitiatorPort" address="http://localhost:${testutil.ports.Server}/DoubleItAsymmetricSamlInitiator"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSamlInitiatorPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSamlInitiatorPort" address="http://localhost:${testutil.ports.saml.Server}/DoubleItAsymmetricSamlInitiator"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSamlInitiatorPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.username" value="bob"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> @@ -132,14 +132,14 @@ <entry key="ws-security.saml2.validator" value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverSymmetricSignedElements" address="http://localhost:${testutil.ports.Server}/DoubleItSaml2SymmetricSignedElements"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2SymmetricSignedElementsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverSymmetricSignedElements" address="http://localhost:${testutil.ports.saml.Server}/DoubleItSaml2SymmetricSignedElements"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2SymmetricSignedElementsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverAsymmetricSignedEncrypted" address="http://localhost:${testutil.ports.Server}/DoubleItSaml2AsymmetricSignedEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2AsymmetricSignedEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverAsymmetricSignedEncrypted" address="http://localhost:${testutil.ports.saml.Server}/DoubleItSaml2AsymmetricSignedEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2AsymmetricSignedEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.username" value="bob"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> @@ -149,7 +149,7 @@ <entry key="ws-security.saml2.validator" value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverAsymmetricSignedEncryptedEncryptBeforeSigning" address="http://localhost:${testutil.ports.Server}/DoubleItSaml2AsymmetricSignedEncryptedEncryptBeforeSigning"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2AsymmetricSignedEncryptedEncryptBeforeSigningPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverAsymmetricSignedEncryptedEncryptBeforeSigning" address="http://localhost:${testutil.ports.saml.Server}/DoubleItSaml2AsymmetricSignedEncryptedEncryptBeforeSigning"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2AsymmetricSignedEncryptedEncryptBeforeSigningPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.username" value="bob"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> @@ -159,7 +159,7 @@ <entry key="ws-security.saml2.validator" value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverAsymmetricEncrypted" address="http://localhost:${testutil.ports.Server}/DoubleItSaml2AsymmetricEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2AsymmetricEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverAsymmetricEncrypted" address="http://localhost:${testutil.ports.saml.Server}/DoubleItSaml2AsymmetricEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2AsymmetricEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.username" value="bob"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> @@ -168,14 +168,14 @@ <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2EndorsingEncryptedOverTransport" address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml2EndorsingEncryptedTransport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2EndorsingEncryptedTransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2EndorsingEncryptedOverTransport" address="https://localhost:${testutil.ports.saml.Server.2}/DoubleItSaml2EndorsingEncryptedTransport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2EndorsingEncryptedTransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="InlinePolicy" address="https://localhost:${testutil.ports.Server.2}/DoubleItSamlInlinePolicy"; serviceName="s:DoubleItService" endpointName="s:DoubleItInlinePolicyPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="InlinePolicy" address="https://localhost:${testutil.ports.saml.Server.2}/DoubleItSamlInlinePolicy"; serviceName="s:DoubleItService" endpointName="s:DoubleItInlinePolicyPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -233,7 +233,7 @@ <bean class="org.apache.cxf.rt.security.xacml.XACMLAuthorizingInterceptor" id="XACMLInterceptor"> <constructor-arg ref="MockPDP"/> </bean> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverSymmetricPEP" address="http://localhost:${testutil.ports.Server}/DoubleItSaml2PEP"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2PEPPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverSymmetricPEP" address="http://localhost:${testutil.ports.saml.Server}/DoubleItSaml2PEP"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2PEPPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -243,7 +243,7 @@ <ref bean="XACMLInterceptor"/> </jaxws:inInterceptors> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TransportToken" address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml2Transport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2TransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TransportToken" address="https://localhost:${testutil.ports.saml.Server.2}/DoubleItSaml2Transport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2TransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -251,7 +251,7 @@ </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TransportToken2" address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml2Transport2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2TransportPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TransportToken2" address="https://localhost:${testutil.ports.saml.Server.2}/DoubleItSaml2Transport2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2TransportPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -259,7 +259,7 @@ </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TransportToken3" address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml2Transport3"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2TransportPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TransportToken3" address="https://localhost:${testutil.ports.saml.Server.2}/DoubleItSaml2Transport3"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2TransportPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml index ce0eb3f..5d4b50b 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml @@ -30,7 +30,7 @@ <!-- Transport Layer Security (TLS) settings --> <!-- --> <httpj:engine-factory id="tls-settings"> - <httpj:engine port="${testutil.ports.StaxServer.2}"> + <httpj:engine port="${testutil.ports.saml.StaxServer.2}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Bethal.jks"/> @@ -42,12 +42,12 @@ </httpj:tlsServerParameters> </httpj:engine> </httpj:engine-factory> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml1TokenOverTransport" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSaml1Transport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1TransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml1TokenOverTransport" address="https://localhost:${testutil.ports.saml.StaxServer.2}/DoubleItSaml1Transport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1TransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml1TokenOverTransport2" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSaml1Transport2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1TransportPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml1TokenOverTransport2" address="https://localhost:${testutil.ports.saml.StaxServer.2}/DoubleItSaml1Transport2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1TransportPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -57,7 +57,7 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml1SupportingToken" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSaml1Supporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1SupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml1SupportingToken" address="https://localhost:${testutil.ports.saml.StaxServer.2}/DoubleItSaml1Supporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1SupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -65,7 +65,7 @@ <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverSymmetric" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSaml2Symmetric"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2SymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverSymmetric" address="http://localhost:${testutil.ports.saml.StaxServer}/DoubleItSaml2Symmetric"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2SymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -74,7 +74,7 @@ <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverAsymmetric" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSaml2Asymmetric"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2AsymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverAsymmetric" address="http://localhost:${testutil.ports.saml.StaxServer}/DoubleItSaml2Asymmetric"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2AsymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.username" value="bob"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> @@ -86,7 +86,7 @@ <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverAsymmetric2" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSaml2Asymmetric2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2AsymmetricPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverAsymmetric2" address="http://localhost:${testutil.ports.saml.StaxServer}/DoubleItSaml2Asymmetric2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2AsymmetricPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.username" value="bob"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> @@ -103,7 +103,7 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml1SelfSignedTokenOverTransport" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSaml1SelfSignedTransport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1SelfSignedTransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml1SelfSignedTokenOverTransport" address="https://localhost:${testutil.ports.saml.StaxServer.2}/DoubleItSaml1SelfSignedTransport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1SelfSignedTransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -111,7 +111,7 @@ <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml1SelfSignedTokenOverTransportSP11" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSaml1SelfSignedTransportSP11"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1SelfSignedTransportSP11Port" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml1SelfSignedTokenOverTransportSP11" address="https://localhost:${testutil.ports.saml.StaxServer.2}/DoubleItSaml1SelfSignedTransportSP11"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1SelfSignedTransportSP11Port" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -119,7 +119,7 @@ <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2EndorsingOverTransport" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSaml2EndorsingTransport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2EndorsingTransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2EndorsingOverTransport" address="https://localhost:${testutil.ports.saml.StaxServer.2}/DoubleItSaml2EndorsingTransport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2EndorsingTransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -127,7 +127,7 @@ <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2EndorsingOverTransportSP11" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSaml2EndorsingTransportSP11"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2EndorsingTransportSP11Port" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2EndorsingOverTransportSP11" address="https://localhost:${testutil.ports.saml.StaxServer.2}/DoubleItSaml2EndorsingTransportSP11"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2EndorsingTransportSP11Port" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -135,7 +135,7 @@ <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSamlInitiatorPort" address="http://localhost:${testutil.ports.StaxServer}/DoubleItAsymmetricSamlInitiator"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSamlInitiatorPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSamlInitiatorPort" address="http://localhost:${testutil.ports.saml.StaxServer}/DoubleItAsymmetricSamlInitiator"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSamlInitiatorPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.username" value="bob"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> @@ -147,7 +147,7 @@ <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverSymmetricSignedElements" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSaml2SymmetricSignedElements"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2SymmetricSignedElementsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverSymmetricSignedElements" address="http://localhost:${testutil.ports.saml.StaxServer}/DoubleItSaml2SymmetricSignedElements"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2SymmetricSignedElementsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -155,7 +155,7 @@ <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverAsymmetricSignedEncrypted" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSaml2AsymmetricSignedEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2AsymmetricSignedEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverAsymmetricSignedEncrypted" address="http://localhost:${testutil.ports.saml.StaxServer}/DoubleItSaml2AsymmetricSignedEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2AsymmetricSignedEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.username" value="bob"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> @@ -167,7 +167,7 @@ <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverAsymmetricSignedEncryptedEncryptBeforeSigning" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSaml2AsymmetricSignedEncryptedEncryptBeforeSigning"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2AsymmetricSignedEncryptedEncryptBeforeSigningPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverAsymmetricSignedEncryptedEncryptBeforeSigning" address="http://localhost:${testutil.ports.saml.StaxServer}/DoubleItSaml2AsymmetricSignedEncryptedEncryptBeforeSigning"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2AsymmetricSignedEncryptedEncryptBeforeSigningPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.username" value="bob"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> @@ -179,7 +179,7 @@ <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverAsymmetricEncrypted" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSaml2AsymmetricEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2AsymmetricEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverAsymmetricEncrypted" address="http://localhost:${testutil.ports.saml.StaxServer}/DoubleItSaml2AsymmetricEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2AsymmetricEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.username" value="bob"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> @@ -189,7 +189,7 @@ <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2EndorsingEncryptedOverTransport" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSaml2EndorsingEncryptedTransport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2EndorsingEncryptedTransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2EndorsingEncryptedOverTransport" address="https://localhost:${testutil.ports.saml.StaxServer.2}/DoubleItSaml2EndorsingEncryptedTransport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2EndorsingEncryptedTransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -197,7 +197,7 @@ <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="InlinePolicy" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSamlInlinePolicy"; serviceName="s:DoubleItService" endpointName="s:DoubleItInlinePolicyPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="InlinePolicy" address="https://localhost:${testutil.ports.saml.StaxServer.2}/DoubleItSamlInlinePolicy"; serviceName="s:DoubleItService" endpointName="s:DoubleItInlinePolicyPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -256,7 +256,7 @@ <bean class="org.apache.cxf.rt.security.xacml.XACMLAuthorizingInterceptor" id="XACMLInterceptor"> <constructor-arg ref="MockPDP"/> </bean> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverSymmetricPEP" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSaml2PEP"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2PEPPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverSymmetricPEP" address="http://localhost:${testutil.ports.saml.StaxServer}/DoubleItSaml2PEP"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2PEPPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -268,7 +268,7 @@ <ref bean="XACMLInterceptor"/> </jaxws:inInterceptors> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TransportToken" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSaml2Transport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2TransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TransportToken" address="https://localhost:${testutil.ports.saml.StaxServer.2}/DoubleItSaml2Transport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2TransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -277,7 +277,7 @@ </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TransportToken2" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSaml2Transport2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2TransportPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TransportToken2" address="https://localhost:${testutil.ports.saml.StaxServer.2}/DoubleItSaml2Transport2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2TransportPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -286,7 +286,7 @@ </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TransportToken3" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSaml2Transport3"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2TransportPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TransportToken3" address="https://localhost:${testutil.ports.saml.StaxServer.2}/DoubleItSaml2Transport3"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2TransportPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/server.xml index 0473f53..47fe074 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/server.xml @@ -30,7 +30,7 @@ <!-- Transport Layer Security (TLS) settings --> <!-- --> <httpj:engine-factory id="tls-settings"> - <httpj:engine port="${testutil.ports.Server}"> + <httpj:engine port="${testutil.ports.saml.subjectconf.Server}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Bethal.jks"/> @@ -43,7 +43,7 @@ </httpj:engine> </httpj:engine-factory> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverTransport" address="https://localhost:${testutil.ports.Server}/DoubleItSaml2Transport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2TransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/subjectconf//DoubleItSamlSubjectConf.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverTransport" address="https://localhost:${testutil.ports.saml.subjectconf.Server}/DoubleItSaml2Transport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2TransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/subjectconf//DoubleItSamlSubjectConf.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.signature.properties" value="morpit.properties"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/stax-server.xml index 8e75f77..e517c75 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/stax-server.xml @@ -30,7 +30,7 @@ <!-- Transport Layer Security (TLS) settings --> <!-- --> <httpj:engine-factory id="tls-settings"> - <httpj:engine port="${testutil.ports.StaxServer}"> + <httpj:engine port="${testutil.ports.saml.subjectconf.StaxServer}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Bethal.jks"/> @@ -43,7 +43,7 @@ </httpj:engine> </httpj:engine-factory> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverTransport" address="https://localhost:${testutil.ports.StaxServer}/DoubleItSaml2Transport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2TransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/subjectconf//DoubleItSamlSubjectConf.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverTransport" address="https://localhost:${testutil.ports.saml.subjectconf.StaxServer}/DoubleItSaml2Transport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2TransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/subjectconf//DoubleItSamlSubjectConf.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.signature.properties" value="morpit.properties"/> <entry key="ws-security.enable.streaming" value="true"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server.xml index 0309544..61e161e 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server.xml @@ -42,7 +42,7 @@ </map> </constructor-arg> </bean> - <jaxws:endpoint id="HelloWorldWS" address="http://localhost:${testutil.ports.Server}/wsse/HelloWorldWS"; wsdlLocation="" implementor="org.apache.cxf.systest.ws.security.handler.HelloWorldImpl"> + <jaxws:endpoint id="HelloWorldWS" address="http://localhost:${testutil.ports.handler.Server}/wsse/HelloWorldWS"; wsdlLocation="" implementor="org.apache.cxf.systest.ws.security.handler.HelloWorldImpl"> <jaxws:inInterceptors> <ref bean="UsernameTokenSign_Request"/> </jaxws:inInterceptors> http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/server.xml index 01ec383..504b33f 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/server.xml @@ -32,7 +32,7 @@ This endpoint is configured to read the username and password tokens and validate them using a password callback handler. --> - <jaxws:endpoint id="UsernameTokenEndpoint" implementor="org.apache.cxf.systest.ws.security.GreeterImpl" address="http://localhost:${testutil.ports.Server}/GreeterService/UsernameTokenPort"; serviceName="test:GreeterService" endpointName="test:UsernameTokenPort"> + <jaxws:endpoint id="UsernameTokenEndpoint" implementor="org.apache.cxf.systest.ws.security.GreeterImpl" address="http://localhost:${testutil.ports.security.Server}/GreeterService/UsernameTokenPort"; serviceName="test:GreeterService" endpointName="test:UsernameTokenPort"> <jaxws:features> <wsa:addressing/> </jaxws:features> @@ -57,7 +57,7 @@ This endpoint is configured to work with public key certificates on both client (Alice) and service (Bob) side. --> - <jaxws:endpoint id="TimestampSignEncryptEndpoint" implementor="org.apache.cxf.systest.ws.security.GreeterImpl" address="http://localhost:${testutil.ports.Server}/GreeterService/TimestampSignEncryptPort"; serviceName="test:GreeterService" endpointName="test:TimestampSignEncryptPort"> + <jaxws:endpoint id="TimestampSignEncryptEndpoint" implementor="org.apache.cxf.systest.ws.security.GreeterImpl" address="http://localhost:${testutil.ports.security.Server}/GreeterService/TimestampSignEncryptPort"; serviceName="test:GreeterService" endpointName="test:TimestampSignEncryptPort"> <jaxws:outInterceptors> <ref bean="TimestampSignEncrypt_Response"/> </jaxws:outInterceptors> http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/stax-server.xml index 4396452..1bd2b1f 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/stax-server.xml @@ -32,7 +32,7 @@ This endpoint is configured to read the username and password tokens and validate them using a password callback handler. --> - <jaxws:endpoint id="UsernameTokenEndpoint" implementor="org.apache.cxf.systest.ws.security.GreeterImpl" address="http://localhost:${testutil.ports.StaxServer}/GreeterService/UsernameTokenPort"; serviceName="test:GreeterService" endpointName="test:UsernameTokenPort"> + <jaxws:endpoint id="UsernameTokenEndpoint" implementor="org.apache.cxf.systest.ws.security.GreeterImpl" address="http://localhost:${testutil.ports.security.StaxServer}/GreeterService/UsernameTokenPort"; serviceName="test:GreeterService" endpointName="test:UsernameTokenPort"> <jaxws:features> <wsa:addressing/> </jaxws:features> @@ -57,7 +57,7 @@ This endpoint is configured to work with public key certificates on both client (Alice) and service (Bob) side. --> - <jaxws:endpoint id="TimestampSignEncryptEndpoint" implementor="org.apache.cxf.systest.ws.security.GreeterImpl" address="http://localhost:${testutil.ports.StaxServer}/GreeterService/TimestampSignEncryptPort"; serviceName="test:GreeterService" endpointName="test:TimestampSignEncryptPort"> + <jaxws:endpoint id="TimestampSignEncryptEndpoint" implementor="org.apache.cxf.systest.ws.security.GreeterImpl" address="http://localhost:${testutil.ports.security.StaxServer}/GreeterService/TimestampSignEncryptPort"; serviceName="test:GreeterService" endpointName="test:TimestampSignEncryptPort"> <jaxws:outInterceptors> <ref bean="TimestampSignEncrypt_Response"/> </jaxws:outInterceptors> http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml index 6918d55..ff80cc8 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml @@ -27,7 +27,7 @@ </cxf:bus> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignatureContentPolicy" - address="http://localhost:${testutil.ports.PolicyServer}/DoubleItSWASignatureContentPolicy"; + address="http://localhost:${testutil.ports.swa.PolicyServer}/DoubleItSWASignatureContentPolicy"; serviceName="s:DoubleItService" endpointName="s:DoubleItSWASignatureContentPolicyPort" implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl" wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> @@ -38,7 +38,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignatureCompletePolicy" - address="http://localhost:${testutil.ports.PolicyServer}/DoubleItSWASignatureCompletePolicy"; + address="http://localhost:${testutil.ports.swa.PolicyServer}/DoubleItSWASignatureCompletePolicy"; serviceName="s:DoubleItService" endpointName="s:DoubleItSWASignatureCompletePolicyPort" implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl" wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> @@ -49,7 +49,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptionPolicy" - address="http://localhost:${testutil.ports.PolicyServer}/DoubleItSWAEncryptionPolicy"; + address="http://localhost:${testutil.ports.swa.PolicyServer}/DoubleItSWAEncryptionPolicy"; serviceName="s:DoubleItService" endpointName="s:DoubleItSWAEncryptionPolicyPort" implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl" wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> @@ -60,7 +60,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="CombinedPolicy" - address="http://localhost:${testutil.ports.PolicyServer}/DoubleItSWACombinedPolicy"; + address="http://localhost:${testutil.ports.swa.PolicyServer}/DoubleItSWACombinedPolicy"; serviceName="s:DoubleItService" endpointName="s:DoubleItSWACombinedPolicyPort" implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl" wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> @@ -71,7 +71,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="CombinedAsymmetricPolicy" - address="http://localhost:${testutil.ports.PolicyServer}/DoubleItSWACombinedAsymmetricPolicy"; + address="http://localhost:${testutil.ports.swa.PolicyServer}/DoubleItSWACombinedAsymmetricPolicy"; serviceName="s:DoubleItService" endpointName="s:DoubleItSWACombinedAsymmetricPolicyPort" implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl" wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/server.xml index a5ed6a2..11a636d 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/server.xml @@ -27,7 +27,7 @@ </cxf:bus> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignatureContentAction" - address="http://localhost:${testutil.ports.Server}/DoubleItSWASignatureContentAction"; + address="http://localhost:${testutil.ports.swa.Server}/DoubleItSWASignatureContentAction"; serviceName="s:DoubleItService" endpointName="s:DoubleItSWASignatureContentActionPort" implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl" wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> @@ -57,7 +57,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignatureCompleteAction" - address="http://localhost:${testutil.ports.Server}/DoubleItSWASignatureCompleteAction"; + address="http://localhost:${testutil.ports.swa.Server}/DoubleItSWASignatureCompleteAction"; serviceName="s:DoubleItService" endpointName="s:DoubleItSWASignatureCompleteActionPort" implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl" wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> @@ -87,7 +87,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptionContentAction" - address="http://localhost:${testutil.ports.Server}/DoubleItSWAEncryptionContentAction"; + address="http://localhost:${testutil.ports.swa.Server}/DoubleItSWAEncryptionContentAction"; serviceName="s:DoubleItService" endpointName="s:DoubleItSWAEncryptionContentActionPort" implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl" wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> @@ -117,7 +117,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptionCompleteAction" - address="http://localhost:${testutil.ports.Server}/DoubleItSWAEncryptionCompleteAction"; + address="http://localhost:${testutil.ports.swa.Server}/DoubleItSWAEncryptionCompleteAction"; serviceName="s:DoubleItService" endpointName="s:DoubleItSWAEncryptionCompleteActionPort" implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl" wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml index 9201cd8..b8d6a67 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml @@ -27,7 +27,7 @@ </cxf:bus> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignatureContentPolicy" - address="http://localhost:${testutil.ports.StaxPolicyServer}/DoubleItSWASignatureContentPolicy"; + address="http://localhost:${testutil.ports.swa.StaxPolicyServer}/DoubleItSWASignatureContentPolicy"; serviceName="s:DoubleItService" endpointName="s:DoubleItSWASignatureContentPolicyPort" implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl" wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> @@ -39,7 +39,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignatureCompletePolicy" - address="http://localhost:${testutil.ports.StaxPolicyServer}/DoubleItSWASignatureCompletePolicy"; + address="http://localhost:${testutil.ports.swa.StaxPolicyServer}/DoubleItSWASignatureCompletePolicy"; serviceName="s:DoubleItService" endpointName="s:DoubleItSWASignatureCompletePolicyPort" implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl" wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> @@ -51,7 +51,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptionPolicy" - address="http://localhost:${testutil.ports.StaxPolicyServer}/DoubleItSWAEncryptionPolicy"; + address="http://localhost:${testutil.ports.swa.StaxPolicyServer}/DoubleItSWAEncryptionPolicy"; serviceName="s:DoubleItService" endpointName="s:DoubleItSWAEncryptionPolicyPort" implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl" wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> @@ -63,7 +63,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="CombinedPolicy" - address="http://localhost:${testutil.ports.StaxPolicyServer}/DoubleItSWACombinedPolicy"; + address="http://localhost:${testutil.ports.swa.StaxPolicyServer}/DoubleItSWACombinedPolicy"; serviceName="s:DoubleItService" endpointName="s:DoubleItSWACombinedPolicyPort" implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl" wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> @@ -75,7 +75,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="CombinedAsymmetricPolicy" - address="http://localhost:${testutil.ports.StaxPolicyServer}/DoubleItSWACombinedAsymmetricPolicy"; + address="http://localhost:${testutil.ports.swa.StaxPolicyServer}/DoubleItSWACombinedAsymmetricPolicy"; serviceName="s:DoubleItService" endpointName="s:DoubleItSWACombinedAsymmetricPolicyPort" implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl" wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl">
