Update systests/ws-security-examples to work with surefure 2.18.1
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/067cb101 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/067cb101 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/067cb101 Branch: refs/heads/3.0.x-fixes Commit: 067cb1017d2035f686c8ce8703ff7b26b4533f61 Parents: 3d7bc62 Author: Daniel Kulp <[email protected]> Authored: Wed May 20 15:53:14 2015 -0400 Committer: Daniel Kulp <[email protected]> Committed: Fri May 22 14:36:40 2015 -0400 ---------------------------------------------------------------------- .../cxf/systest/wssec/examples/saml/server.xml | 24 ++++++++++---------- .../systest/wssec/examples/saml/stax-server.xml | 22 +++++++++--------- .../systest/wssec/examples/secconv/server.xml | 2 +- .../wssec/examples/secconv/stax-server.xml | 2 +- .../wssec/examples/sts/cxf-symmetric.xml | 2 +- .../cxf/systest/wssec/examples/ut/server.xml | 16 ++++++------- .../systest/wssec/examples/ut/stax-server.xml | 16 ++++++------- .../cxf/systest/wssec/examples/x509/server.xml | 8 +++---- .../systest/wssec/examples/x509/stax-server.xml | 8 +++---- 9 files changed, 50 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/067cb101/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml index 931b6f6..cc0c967 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml @@ -30,22 +30,22 @@ <property name="requireBearerSignature" value="false" /> </bean> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Bearer" address="http://localhost:${testutil.ports.Server}/DoubleItSamlBearer"; serviceName="s:DoubleItService" endpointName="s:DoubleItBearerPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Bearer" address="http://localhost:${testutil.ports.saml.Server}/DoubleItSamlBearer"; serviceName="s:DoubleItService" endpointName="s:DoubleItBearerPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.saml1.validator" value-ref="allowUnsignedBearerAssertions"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TLSSenderVouches" address="https://localhost:${testutil.ports.Server.2}/DoubleItSamlTLSSenderVouches"; serviceName="s:DoubleItService" endpointName="s:DoubleItTLSSenderVouchesPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TLSSenderVouches" address="https://localhost:${testutil.ports.saml.Server.2}/DoubleItSamlTLSSenderVouches"; serviceName="s:DoubleItService" endpointName="s:DoubleItTLSSenderVouchesPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TLSHOKSignedEndorsing" address="https://localhost:${testutil.ports.Server.2}/DoubleItSamlTLSHOKSignedEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItTLSHOKSignedEndorsingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TLSHOKSignedEndorsing" address="https://localhost:${testutil.ports.saml.Server.2}/DoubleItSamlTLSHOKSignedEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItTLSHOKSignedEndorsingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.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.*"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSigned" address="http://localhost:${testutil.ports.Server}/DoubleItSamlAsymmetricSigned"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignedPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSigned" address="http://localhost:${testutil.ports.saml.Server}/DoubleItSamlAsymmetricSigned"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignedPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -53,7 +53,7 @@ <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="AsymmetricInitiator" address="http://localhost:${testutil.ports.Server}/DoubleItSamlAsymmetricInitiator"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricInitiatorPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricInitiator" address="http://localhost:${testutil.ports.saml.Server}/DoubleItSamlAsymmetricInitiator"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricInitiatorPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -61,7 +61,7 @@ <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="AsymmetricSaml2Bearer" address="http://localhost:${testutil.ports.Server}/DoubleItSamlAsymmetricSaml2Bearer"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSaml2BearerPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSaml2Bearer" address="http://localhost:${testutil.ports.saml.Server}/DoubleItSamlAsymmetricSaml2Bearer"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSaml2BearerPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -70,17 +70,17 @@ <entry key="ws-security.saml2.validator" value-ref="allowUnsignedBearerAssertions"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TLSSenderVouchesSaml2" address="https://localhost:${testutil.ports.Server.2}/DoubleItSamlTLSSenderVouchesSaml2"; serviceName="s:DoubleItService" endpointName="s:DoubleItTLSSenderVouchesSaml2Port" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TLSSenderVouchesSaml2" address="https://localhost:${testutil.ports.saml.Server.2}/DoubleItSamlTLSSenderVouchesSaml2"; serviceName="s:DoubleItService" endpointName="s:DoubleItTLSSenderVouchesSaml2Port" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TLSHOKSignedEndorsingSaml2" address="https://localhost:${testutil.ports.Server.2}/DoubleItSamlTLSHOKSignedEndorsingSaml2"; serviceName="s:DoubleItService" endpointName="s:DoubleItTLSHOKSignedEndorsingSaml2Port" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TLSHOKSignedEndorsingSaml2" address="https://localhost:${testutil.ports.saml.Server.2}/DoubleItSamlTLSHOKSignedEndorsingSaml2"; serviceName="s:DoubleItService" endpointName="s:DoubleItTLSHOKSignedEndorsingSaml2Port" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.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.*"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricSV" address="http://localhost:${testutil.ports.Server}/DoubleItSamlSymmetricSV"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSVPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricSV" address="http://localhost:${testutil.ports.saml.Server}/DoubleItSamlSymmetricSV"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSVPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <!-- TODO Fix the way these properties are inverted --> @@ -91,7 +91,7 @@ <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="SymmetricIssuedToken" address="http://localhost:${testutil.ports.Server}/DoubleItSamlSymmetricIssuedToken"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricIssuedTokenPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricIssuedToken" address="http://localhost:${testutil.ports.saml.Server}/DoubleItSamlSymmetricIssuedToken"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricIssuedTokenPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.username" value="bob"/> @@ -100,11 +100,11 @@ </jaxws:properties> </jaxws:endpoint> <!-- --> - <!-- Any services listening on port ${testutil.ports.Server} must use the following --> + <!-- Any services listening on port ${testutil.ports.saml.Server} must use the following --> <!-- 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="bob.jks"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/067cb101/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml index 7834864..f6c8c20 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml @@ -30,25 +30,25 @@ <property name="requireBearerSignature" value="false" /> </bean> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Bearer" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSamlBearer"; serviceName="s:DoubleItService" endpointName="s:DoubleItBearerPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Bearer" address="http://localhost:${testutil.ports.saml.StaxServer}/DoubleItSamlBearer"; serviceName="s:DoubleItService" endpointName="s:DoubleItBearerPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.enable.streaming" value="true"/> <entry key="ws-security.saml1.validator" value-ref="allowUnsignedBearerAssertions"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TLSSenderVouches" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSamlTLSSenderVouches"; serviceName="s:DoubleItService" endpointName="s:DoubleItTLSSenderVouchesPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TLSSenderVouches" address="https://localhost:${testutil.ports.saml.StaxServer.2}/DoubleItSamlTLSSenderVouches"; serviceName="s:DoubleItService" endpointName="s:DoubleItTLSSenderVouchesPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/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="TLSHOKSignedEndorsing" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSamlTLSHOKSignedEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItTLSHOKSignedEndorsingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TLSHOKSignedEndorsing" address="https://localhost:${testutil.ports.saml.StaxServer.2}/DoubleItSamlTLSHOKSignedEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItTLSHOKSignedEndorsingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSigned" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSamlAsymmetricSigned"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignedPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSigned" address="http://localhost:${testutil.ports.saml.StaxServer}/DoubleItSamlAsymmetricSigned"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignedPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -57,7 +57,7 @@ <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricInitiator" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSamlAsymmetricInitiator"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricInitiatorPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricInitiator" address="http://localhost:${testutil.ports.saml.StaxServer}/DoubleItSamlAsymmetricInitiator"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricInitiatorPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -66,7 +66,7 @@ <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSaml2Bearer" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSamlAsymmetricSaml2Bearer"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSaml2BearerPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSaml2Bearer" address="http://localhost:${testutil.ports.saml.StaxServer}/DoubleItSamlAsymmetricSaml2Bearer"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSaml2BearerPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -76,19 +76,19 @@ <entry key="ws-security.saml2.validator" value-ref="allowUnsignedBearerAssertions"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TLSSenderVouchesSaml2" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSamlTLSSenderVouchesSaml2"; serviceName="s:DoubleItService" endpointName="s:DoubleItTLSSenderVouchesSaml2Port" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TLSSenderVouchesSaml2" address="https://localhost:${testutil.ports.saml.StaxServer.2}/DoubleItSamlTLSSenderVouchesSaml2"; serviceName="s:DoubleItService" endpointName="s:DoubleItTLSSenderVouchesSaml2Port" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/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="TLSHOKSignedEndorsingSaml2" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSamlTLSHOKSignedEndorsingSaml2"; serviceName="s:DoubleItService" endpointName="s:DoubleItTLSHOKSignedEndorsingSaml2Port" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TLSHOKSignedEndorsingSaml2" address="https://localhost:${testutil.ports.saml.StaxServer.2}/DoubleItSamlTLSHOKSignedEndorsingSaml2"; serviceName="s:DoubleItService" endpointName="s:DoubleItTLSHOKSignedEndorsingSaml2Port" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricSV" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSamlSymmetricSV"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSVPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricSV" address="http://localhost:${testutil.ports.saml.StaxServer}/DoubleItSamlSymmetricSV"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSVPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <!-- TODO Fix the way these properties are inverted --> @@ -100,7 +100,7 @@ <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricIssuedToken" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSamlSymmetricIssuedToken"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricIssuedTokenPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricIssuedToken" address="http://localhost:${testutil.ports.saml.StaxServer}/DoubleItSamlSymmetricIssuedToken"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricIssuedTokenPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.username" value="bob"/> @@ -114,7 +114,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="bob.jks"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/067cb101/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml index bd3debb..d296416 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml @@ -25,7 +25,7 @@ <cxf:logging/> </cxf:features> </cxf:bus> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SecureConversation" address="http://localhost:${testutil.ports.Server}/DoubleItSecureConversation"; serviceName="s:DoubleItService" endpointName="s:DoubleItSecureConversationPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/secconv/DoubleItSecConv.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SecureConversation" address="http://localhost:${testutil.ports.secconv.Server}/DoubleItSecureConversation"; serviceName="s:DoubleItService" endpointName="s:DoubleItSecureConversationPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/secconv/DoubleItSecConv.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties.sct" value="bob.properties"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/067cb101/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml index bbfd430..076c563 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml @@ -25,7 +25,7 @@ <cxf:logging/> </cxf:features> </cxf:bus> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SecureConversation" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSecureConversation"; serviceName="s:DoubleItService" endpointName="s:DoubleItSecureConversationPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/secconv/DoubleItSecConv.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SecureConversation" address="http://localhost:${testutil.ports.secconv.StaxServer}/DoubleItSecureConversation"; serviceName="s:DoubleItService" endpointName="s:DoubleItSecureConversationPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/secconv/DoubleItSecConv.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties.sct" value="bob.properties"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/067cb101/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml index 0098dd3..38a8510 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml @@ -48,7 +48,7 @@ <property name="issuer" value="DoubleItSTSIssuer"/> <property name="encryptionUsername" value="bob"/> </bean> - <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; id="SymmetricSTS" implementor="#symmetricSTSProviderBean" address="http://localhost:${testutil.ports.STSServer}/SecurityTokenService/Symmetric"; wsdlLocation="src/test/resources/org/apache/cxf/systest/wssec/examples/sts/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:Symmetric_Port"> + <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; id="SymmetricSTS" implementor="#symmetricSTSProviderBean" address="http://localhost:${testutil.ports.sts.STSServer}/SecurityTokenService/Symmetric"; wsdlLocation="src/test/resources/org/apache/cxf/systest/wssec/examples/sts/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:Symmetric_Port"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties" value="cxfca.properties"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/067cb101/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml index 06d2c2e..ae2d57b 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml @@ -25,27 +25,27 @@ <cxf:logging/> </cxf:features> </cxf:bus> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Plaintext" address="http://localhost:${testutil.ports.Server}/DoubleItUTPlaintext"; serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Plaintext" address="http://localhost:${testutil.ports.ut.Server}/DoubleItUTPlaintext"; serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="PlaintextNoPassword" address="http://localhost:${testutil.ports.Server}/DoubleItUTPlaintextNoPassword"; serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextNoPasswordPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="PlaintextNoPassword" address="http://localhost:${testutil.ports.ut.Server}/DoubleItUTPlaintextNoPassword"; serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextNoPasswordPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Digest" address="http://localhost:${testutil.ports.Server}/DoubleItUTDigest"; serviceName="s:DoubleItService" endpointName="s:DoubleItDigestPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Digest" address="http://localhost:${testutil.ports.ut.Server}/DoubleItUTDigest"; serviceName="s:DoubleItService" endpointName="s:DoubleItDigestPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TLSSupporting" address="https://localhost:${testutil.ports.Server.2}/DoubleItUTTLSSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItTLSSupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TLSSupporting" address="https://localhost:${testutil.ports.ut.Server.2}/DoubleItUTTLSSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItTLSSupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSESupporting" address="http://localhost:${testutil.ports.Server}/DoubleItUTAsymmetricSESupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSESupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSESupporting" address="http://localhost:${testutil.ports.ut.Server}/DoubleItUTAsymmetricSESupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSESupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -53,13 +53,13 @@ <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="AsymmetricEncrSupporting" address="http://localhost:${testutil.ports.Server}/DoubleItUTAsymmetricEncrSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncrSupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricEncrSupporting" address="http://localhost:${testutil.ports.ut.Server}/DoubleItUTAsymmetricEncrSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncrSupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricSESupporting" address="http://localhost:${testutil.ports.Server}/DoubleItUTSymmetricSESupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSESupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut//DoubleItUt.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricSESupporting" address="http://localhost:${testutil.ports.ut.Server}/DoubleItUTSymmetricSESupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSESupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut//DoubleItUt.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -71,7 +71,7 @@ <!-- Transport Layer Security (TLS) settings --> <!-- --> <httpj:engine-factory id="tls-settings"> - <httpj:engine port="${testutil.ports.Server.2}"> + <httpj:engine port="${testutil.ports.ut.Server.2}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> <sec:keyStore type="jks" password="password" resource="Bethal.jks"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/067cb101/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml index 9228107..3d873b2 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml @@ -25,31 +25,31 @@ <cxf:logging/> </cxf:features> </cxf:bus> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Plaintext" address="http://localhost:${testutil.ports.StaxServer}/DoubleItUTPlaintext"; serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Plaintext" address="http://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTPlaintext"; serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="PlaintextNoPassword" address="http://localhost:${testutil.ports.StaxServer}/DoubleItUTPlaintextNoPassword"; serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextNoPasswordPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="PlaintextNoPassword" address="http://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTPlaintextNoPassword"; serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextNoPasswordPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Digest" address="http://localhost:${testutil.ports.StaxServer}/DoubleItUTDigest"; serviceName="s:DoubleItService" endpointName="s:DoubleItDigestPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Digest" address="http://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTDigest"; serviceName="s:DoubleItService" endpointName="s:DoubleItDigestPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TLSSupporting" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItUTTLSSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItTLSSupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TLSSupporting" address="https://localhost:${testutil.ports.ut.StaxServer.2}/DoubleItUTTLSSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItTLSSupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSESupporting" address="http://localhost:${testutil.ports.StaxServer}/DoubleItUTAsymmetricSESupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSESupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSESupporting" address="http://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTAsymmetricSESupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSESupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -58,14 +58,14 @@ <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricEncrSupporting" address="http://localhost:${testutil.ports.StaxServer}/DoubleItUTAsymmetricEncrSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncrSupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricEncrSupporting" address="http://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTAsymmetricEncrSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncrSupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricSESupporting" address="http://localhost:${testutil.ports.StaxServer}/DoubleItUTSymmetricSESupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSESupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut//DoubleItUt.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricSESupporting" address="http://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTSymmetricSESupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSESupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut//DoubleItUt.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -78,7 +78,7 @@ <!-- Transport Layer Security (TLS) settings --> <!-- --> <httpj:engine-factory id="tls-settings"> - <httpj:engine port="${testutil.ports.StaxServer.2}"> + <httpj:engine port="${testutil.ports.ut.StaxServer.2}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> <sec:keyStore type="jks" password="password" resource="Bethal.jks"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/067cb101/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml index 8ca0266..e0f0039 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml @@ -25,7 +25,7 @@ <cxf:logging/> </cxf:features> </cxf:bus> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSignEncrypt" address="http://localhost:${testutil.ports.Server}/DoubleItX509AsymmetricSignEncrypt"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignEncryptPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSignEncrypt" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricSignEncrypt"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignEncryptPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -33,7 +33,7 @@ <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="AsymmetricProtectTokens" address="http://localhost:${testutil.ports.Server}/DoubleItX509AsymmetricProtectTokens"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricProtectTokensPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricProtectTokens" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricProtectTokens"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricProtectTokensPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -41,7 +41,7 @@ <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="SymmetricSignEncrypt" address="http://localhost:${testutil.ports.Server}/DoubleItX509SymmetricSignEncrypt"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSignEncryptPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricSignEncrypt" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509SymmetricSignEncrypt"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSignEncryptPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.username" value="bob"/> @@ -49,7 +49,7 @@ <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="SymmetricEndorsing" address="http://localhost:${testutil.ports.Server}/DoubleItX509SymmetricEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricEndorsingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricEndorsing" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509SymmetricEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricEndorsingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <!-- TODO Fix the way these properties are inverted --> http://git-wip-us.apache.org/repos/asf/cxf/blob/067cb101/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml index ec1cf39..7647e2d 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml @@ -25,7 +25,7 @@ <cxf:logging/> </cxf:features> </cxf:bus> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSignEncrypt" address="http://localhost:${testutil.ports.StaxServer}/DoubleItX509AsymmetricSignEncrypt"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignEncryptPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSignEncrypt" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricSignEncrypt"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignEncryptPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -34,7 +34,7 @@ <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricProtectTokens" address="http://localhost:${testutil.ports.StaxServer}/DoubleItX509AsymmetricProtectTokens"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricProtectTokensPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricProtectTokens" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricProtectTokens"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricProtectTokensPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -43,7 +43,7 @@ <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricSignEncrypt" address="http://localhost:${testutil.ports.StaxServer}/DoubleItX509SymmetricSignEncrypt"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSignEncryptPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricSignEncrypt" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509SymmetricSignEncrypt"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSignEncryptPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.username" value="bob"/> @@ -52,7 +52,7 @@ <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricEndorsing" address="http://localhost:${testutil.ports.StaxServer}/DoubleItX509SymmetricEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricEndorsingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricEndorsing" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509SymmetricEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricEndorsingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <!-- TODO Fix the way these properties are inverted -->
