http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml index 95bb15e..24ceff5 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml @@ -25,7 +25,7 @@ <cxf:logging/> </cxf:features> </cxf:bus> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedSupportingTokens" address="http://localhost:${testutil.ports.Server}/DoubleItSignedSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedSupportingTokens" address="http://localhost:${testutil.ports.tokens.Server}/DoubleItSignedSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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"/> @@ -38,7 +38,7 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedSupportingTokens2" address="http://localhost:${testutil.ports.Server}/DoubleItSignedSupporting2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedSupportingTokens2" address="http://localhost:${testutil.ports.tokens.Server}/DoubleItSignedSupporting2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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"/> @@ -51,7 +51,7 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedSupportingTokens3" address="http://localhost:${testutil.ports.Server}/DoubleItSignedSupporting3"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedSupportingTokens3" address="http://localhost:${testutil.ports.tokens.Server}/DoubleItSignedSupporting3"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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"/> @@ -64,7 +64,7 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedSupportingTokens" address="http://localhost:${testutil.ports.Server}/DoubleItEncryptedSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedSupportingTokens" address="http://localhost:${testutil.ports.tokens.Server}/DoubleItEncryptedSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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"/> @@ -77,7 +77,7 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedSupportingTokens2" address="http://localhost:${testutil.ports.Server}/DoubleItEncryptedSupporting2"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedSupportingTokens2" address="http://localhost:${testutil.ports.tokens.Server}/DoubleItEncryptedSupporting2"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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"/> @@ -90,7 +90,7 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedSupportingTokens3" address="http://localhost:${testutil.ports.Server}/DoubleItEncryptedSupporting3"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedSupportingTokens3" address="http://localhost:${testutil.ports.tokens.Server}/DoubleItEncryptedSupporting3"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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"/> @@ -103,7 +103,7 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEncryptedSupportingTokens" address="http://localhost:${testutil.ports.Server}/DoubleItSignedEncryptedSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEncryptedSupportingTokens" address="http://localhost:${testutil.ports.tokens.Server}/DoubleItSignedEncryptedSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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"/> @@ -116,7 +116,7 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEncryptedSupportingTokens2" address="http://localhost:${testutil.ports.Server}/DoubleItSignedEncryptedSupporting2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEncryptedSupportingTokens2" address="http://localhost:${testutil.ports.tokens.Server}/DoubleItSignedEncryptedSupporting2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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"/> @@ -129,7 +129,7 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEncryptedSupportingTokens3" address="http://localhost:${testutil.ports.Server}/DoubleItSignedEncryptedSupporting3"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEncryptedSupportingTokens3" address="http://localhost:${testutil.ports.tokens.Server}/DoubleItSignedEncryptedSupporting3"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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"/>
http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml index a731bcb..19c2fd2 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml @@ -25,7 +25,7 @@ <cxf:logging/> </cxf:features> </cxf:bus> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedSupportingTokens" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedSupportingTokens" address="http://localhost:${testutil.ports.tokens.StaxServer}/DoubleItSignedSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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"/> @@ -39,7 +39,7 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedSupportingTokens2" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedSupporting2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedSupportingTokens2" address="http://localhost:${testutil.ports.tokens.StaxServer}/DoubleItSignedSupporting2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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"/> @@ -53,7 +53,7 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedSupportingTokens3" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedSupporting3"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedSupportingTokens3" address="http://localhost:${testutil.ports.tokens.StaxServer}/DoubleItSignedSupporting3"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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"/> @@ -67,7 +67,7 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedSupportingTokens" address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncryptedSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedSupportingTokens" address="http://localhost:${testutil.ports.tokens.StaxServer}/DoubleItEncryptedSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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"/> @@ -81,7 +81,7 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedSupportingTokens2" address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncryptedSupporting2"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedSupportingTokens2" address="http://localhost:${testutil.ports.tokens.StaxServer}/DoubleItEncryptedSupporting2"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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"/> @@ -95,7 +95,7 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedSupportingTokens3" address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncryptedSupporting3"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedSupportingTokens3" address="http://localhost:${testutil.ports.tokens.StaxServer}/DoubleItEncryptedSupporting3"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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"/> @@ -109,7 +109,7 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEncryptedSupportingTokens" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedEncryptedSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEncryptedSupportingTokens" address="http://localhost:${testutil.ports.tokens.StaxServer}/DoubleItSignedEncryptedSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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"/> @@ -123,7 +123,7 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEncryptedSupportingTokens2" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedEncryptedSupporting2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEncryptedSupportingTokens2" address="http://localhost:${testutil.ports.tokens.StaxServer}/DoubleItSignedEncryptedSupporting2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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"/> @@ -137,7 +137,7 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEncryptedSupportingTokens3" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedEncryptedSupporting3"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEncryptedSupportingTokens3" address="http://localhost:${testutil.ports.tokens.StaxServer}/DoubleItSignedEncryptedSupporting3"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server-derived.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server-derived.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server-derived.xml index b9d73a5..f487f59 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server-derived.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server-derived.xml @@ -25,41 +25,41 @@ <cxf:logging/> </cxf:features> </cxf:bus> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricSignature" address="http://localhost:${testutil.ports.ServerDerived}/DoubleItUTDerivedSymmetricProtectionSig"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricProtectionSigPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUtDerived.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricSignature" address="http://localhost:${testutil.ports.ut.ServerDerived}/DoubleItUTDerivedSymmetricProtectionSig"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricProtectionSigPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUtDerived.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricSignatureDK" address="http://localhost:${testutil.ports.ServerDerived}/DoubleItUTDerivedSymmetricProtectionSigDK"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricProtectionSigDKPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUtDerived.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricSignatureDK" address="http://localhost:${testutil.ports.ut.ServerDerived}/DoubleItUTDerivedSymmetricProtectionSigDK"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricProtectionSigDKPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUtDerived.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricEncryption" address="http://localhost:${testutil.ports.ServerDerived}/DoubleItUTDerivedSymmetricProtectionEnc"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricProtectionEncPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUtDerived.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricEncryption" address="http://localhost:${testutil.ports.ut.ServerDerived}/DoubleItUTDerivedSymmetricProtectionEnc"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricProtectionEncPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUtDerived.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TransportEndorsing" address="https://localhost:${testutil.ports.ServerDerived.2}/DoubleItUTDerivedTransportEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItTransportEndorsingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" depends-on="tls-settings" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUtDerived.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TransportEndorsing" address="https://localhost:${testutil.ports.ut.ServerDerived.2}/DoubleItUTDerivedTransportEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItTransportEndorsingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" depends-on="tls-settings" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUtDerived.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricSignedEndorsing" address="http://localhost:${testutil.ports.ServerDerived}/DoubleItUTDerivedSymmetricSignedEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSignedEndorsingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUtDerived.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricSignedEndorsing" address="http://localhost:${testutil.ports.ut.ServerDerived}/DoubleItUTDerivedSymmetricSignedEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSignedEndorsingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUtDerived.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"/> <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="SymmetricEndorsingEncrypted" address="http://localhost:${testutil.ports.ServerDerived}/DoubleItUTDerivedSymmetricEndorsingEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricEndorsingEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUtDerived.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricEndorsingEncrypted" address="http://localhost:${testutil.ports.ut.ServerDerived}/DoubleItUTDerivedSymmetricEndorsingEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricEndorsingEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUtDerived.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"/> <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="SymmetricSignedEndorsingEncrypted" address="http://localhost:${testutil.ports.ServerDerived}/DoubleItUTDerivedSymmetricSignedEndorsingEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSignedEndorsingEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUtDerived.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricSignedEndorsingEncrypted" address="http://localhost:${testutil.ports.ut.ServerDerived}/DoubleItUTDerivedSymmetricSignedEndorsingEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSignedEndorsingEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUtDerived.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"/> @@ -71,7 +71,7 @@ <!-- Transport Layer Security (TLS) settings --> <!-- --> <httpj:engine-factory id="tls-settings"> - <httpj:engine port="${testutil.ports.ServerDerived.2}"> + <httpj:engine port="${testutil.ports.ut.ServerDerived.2}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Bethal.jks"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml index c46c33f..385b342 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml @@ -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.ut.Server}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Bethal.jks"/> @@ -42,51 +42,51 @@ </httpj:tlsServerParameters> </httpj:engine> </httpj:engine-factory> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Plaintext" address="https://localhost:${testutil.ports.Server}/DoubleItUTPlaintext"; serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Plaintext" address="https://localhost:${testutil.ports.ut.Server}/DoubleItUTPlaintext"; serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="PlaintextCreated" address="https://localhost:${testutil.ports.Server}/DoubleItUTPlaintextCreated"; serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextCreatedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="PlaintextCreated" address="https://localhost:${testutil.ports.ut.Server}/DoubleItUTPlaintextCreated"; serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextCreatedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="PlaintextSupporting" address="https://localhost:${testutil.ports.Server}/DoubleItUTPlaintextSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="PlaintextSupporting" address="https://localhost:${testutil.ports.ut.Server}/DoubleItUTPlaintextSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Hashed" address="https://localhost:${testutil.ports.Server}/DoubleItUTHashed"; serviceName="s:DoubleItService" endpointName="s:DoubleItHashedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Hashed" address="https://localhost:${testutil.ports.ut.Server}/DoubleItUTHashed"; serviceName="s:DoubleItService" endpointName="s:DoubleItHashedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="NoPassword" address="https://localhost:${testutil.ports.Server}/DoubleItUTNoPassword"; serviceName="s:DoubleItService" endpointName="s:DoubleItNoPasswordPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="NoPassword" address="https://localhost:${testutil.ports.ut.Server}/DoubleItUTNoPassword"; serviceName="s:DoubleItService" endpointName="s:DoubleItNoPasswordPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEndorsing" address="https://localhost:${testutil.ports.Server}/DoubleItUTSignedEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEndorsingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEndorsing" address="https://localhost:${testutil.ports.ut.Server}/DoubleItUTSignedEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEndorsingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="SignedEncrypted" address="https://localhost:${testutil.ports.Server}/DoubleItUTSignedEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEncrypted" address="https://localhost:${testutil.ports.ut.Server}/DoubleItUTSignedEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="Encrypted" address="https://localhost:${testutil.ports.Server}/DoubleItUTEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Encrypted" address="https://localhost:${testutil.ports.ut.Server}/DoubleItUTEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="InlinePolicy" address="https://localhost:${testutil.ports.Server}/DoubleItUTInlinePolicy"; serviceName="s:DoubleItService" endpointName="s:DoubleItInlinePolicyPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="InlinePolicy" address="https://localhost:${testutil.ports.ut.Server}/DoubleItUTInlinePolicy"; serviceName="s:DoubleItService" endpointName="s:DoubleItInlinePolicyPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> @@ -136,7 +136,7 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="HashedNoBinding" address="https://localhost:${testutil.ports.Server}/DoubleItUTDigestNoBinding"; serviceName="s:DoubleItService" endpointName="s:DoubleItDigestNoBindingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="HashedNoBinding" address="https://localhost:${testutil.ports.ut.Server}/DoubleItUTDigestNoBinding"; serviceName="s:DoubleItService" endpointName="s:DoubleItDigestNoBindingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> @@ -170,7 +170,7 @@ </map> </property> </bean> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="PlaintextPrincipal" address="https://localhost:${testutil.ports.Server}/DoubleItUTPlaintextPrincipal"; serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextPrincipalPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="PlaintextPrincipal" address="https://localhost:${testutil.ports.ut.Server}/DoubleItUTPlaintextPrincipal"; serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextPrincipalPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.ut.validator" value-ref="subjectValidator"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml index 3234bfa..ab1344a 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml @@ -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.ut.StaxServer}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Bethal.jks"/> @@ -42,37 +42,37 @@ </httpj:tlsServerParameters> </httpj:engine> </httpj:engine-factory> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Plaintext" address="https://localhost:${testutil.ports.StaxServer}/DoubleItUTPlaintext"; serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Plaintext" address="https://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTPlaintext"; serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="PlaintextCreated" address="https://localhost:${testutil.ports.StaxServer}/DoubleItUTPlaintextCreated"; serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextCreatedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="PlaintextCreated" address="https://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTPlaintextCreated"; serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextCreatedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="PlaintextSupporting" address="https://localhost:${testutil.ports.StaxServer}/DoubleItUTPlaintextSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="PlaintextSupporting" address="https://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTPlaintextSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Hashed" address="https://localhost:${testutil.ports.StaxServer}/DoubleItUTHashed"; serviceName="s:DoubleItService" endpointName="s:DoubleItHashedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Hashed" address="https://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTHashed"; serviceName="s:DoubleItService" endpointName="s:DoubleItHashedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="NoPassword" address="https://localhost:${testutil.ports.StaxServer}/DoubleItUTNoPassword"; serviceName="s:DoubleItService" endpointName="s:DoubleItNoPasswordPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="NoPassword" address="https://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTNoPassword"; serviceName="s:DoubleItService" endpointName="s:DoubleItNoPasswordPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEndorsing" address="https://localhost:${testutil.ports.StaxServer}/DoubleItUTSignedEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEndorsingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEndorsing" address="https://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTSignedEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEndorsingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -80,7 +80,7 @@ <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEncrypted" address="https://localhost:${testutil.ports.StaxServer}/DoubleItUTSignedEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEncrypted" address="https://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTSignedEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -88,13 +88,13 @@ <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Encrypted" address="https://localhost:${testutil.ports.StaxServer}/DoubleItUTEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Encrypted" address="https://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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}/DoubleItUTInlinePolicy"; serviceName="s:DoubleItService" endpointName="s:DoubleItInlinePolicyPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="InlinePolicy" address="https://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTInlinePolicy"; serviceName="s:DoubleItService" endpointName="s:DoubleItInlinePolicyPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -145,7 +145,7 @@ </p:policies> </jaxws:features> </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="HashedNoBinding" address="https://localhost:${testutil.ports.StaxServer}/DoubleItUTDigestNoBinding"; serviceName="s:DoubleItService" endpointName="s:DoubleItDigestNoBindingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="HashedNoBinding" address="https://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTDigestNoBinding"; serviceName="s:DoubleItService" endpointName="s:DoubleItDigestNoBindingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -180,7 +180,7 @@ </map> </property> </bean> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="PlaintextPrincipal" address="https://localhost:${testutil.ports.StaxServer}/DoubleItUTPlaintextPrincipal"; serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextPrincipalPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="PlaintextPrincipal" address="https://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTPlaintextPrincipal"; serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextPrincipalPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.ut.validator" value-ref="subjectValidator"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server.xml index 66185eb..0e5b5f4 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server.xml @@ -32,7 +32,7 @@ <!-- Transport Layer Security (TLS) settings --> <!-- --> <httpj:engine-factory id="tls-settings"> - <httpj:engine port="${testutil.ports.Server.2}"> + <httpj:engine port="${testutil.ports.wssc.Server.2}"> <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-factory> <httpj:engine-factory id="tls-settings-stax"> - <httpj:engine port="${testutil.ports.StaxServer.2}"> + <httpj:engine port="${testutil.ports.wssc.StaxServer.2}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Bethal.jks"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml index 90ca29f..962ac33 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml @@ -30,7 +30,7 @@ <!-- Transport Layer Security (TLS) settings --> <!-- --> <httpj:engine-factory id="tls-settings"> - <httpj:engine port="${testutil.ports.Server.1}"> + <httpj:engine port="${testutil.ports.wssec10.server.Server.1}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> <sec:keyStore type="jks" password="password" resource="certs/bob.jks"/> @@ -47,13 +47,13 @@ <!-- --> <!-- Scenario 3.1 --> <!-- --> - <jaxws:endpoint id="UserNameOverTransport" address="https://localhost:${testutil.ports.Server.1}/UserNameOverTransport"; serviceName="interop:PingService" endpointName="interop:UserNameOverTransport_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransport" depends-on="tls-settings"> + <jaxws:endpoint id="UserNameOverTransport" address="https://localhost:${testutil.ports.wssec10.server.Server.1}/UserNameOverTransport"; serviceName="interop:PingService" endpointName="interop:UserNameOverTransport_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransport" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint id="UserName" address="http://localhost:${testutil.ports.Server}/UserName"; serviceName="interop:PingService" endpointName="interop:UserName_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransport"> + <jaxws:endpoint id="UserName" address="http://localhost:${testutil.ports.wssec10.server.Server}/UserName"; serviceName="interop:PingService" endpointName="interop:UserName_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransport"> <jaxws:properties> <entry key="ws-security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> @@ -62,7 +62,7 @@ <!-- --> <!-- Scenario 3.3 --> <!-- --> - <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncrypt_IPingService"; id="MutualCertificate10SignEncrypt" address="http://localhost:${testutil.ports.Server}/MutualCertificate10SignEncrypt"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncrypt_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncrypt"> + <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncrypt_IPingService"; id="MutualCertificate10SignEncrypt" address="http://localhost:${testutil.ports.wssec10.server.Server}/MutualCertificate10SignEncrypt"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncrypt_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncrypt"> <jaxws:properties> <entry key="ws-security.username" value="Alice"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -74,7 +74,7 @@ <!-- --> <!-- Scenario 3.4 --> <!-- --> - <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncryptRsa15TripleDes_IPingService"; id="MutualCertificate10SignEncryptRsa15TripleDes" address="http://localhost:${testutil.ports.Server}/MutualCertificate10SignEncryptRsa15TripleDes"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncryptRsa15TripleDes_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncryptRsa15TripleDes"> + <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncryptRsa15TripleDes_IPingService"; id="MutualCertificate10SignEncryptRsa15TripleDes" address="http://localhost:${testutil.ports.wssec10.server.Server}/MutualCertificate10SignEncryptRsa15TripleDes"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncryptRsa15TripleDes_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncryptRsa15TripleDes"> <jaxws:properties> <entry key="ws-security.username" value="Alice"/> <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/wssec10/server_restricted.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml index 71b52a5..0cd2dc1 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml @@ -30,7 +30,7 @@ <!-- Transport Layer Security (TLS) settings --> <!-- --> <httpj:engine-factory id="tls-settings"> - <httpj:engine port="${testutil.ports.Server.1}"> + <httpj:engine port="${testutil.ports.wssec10.server.Server.1}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> <sec:keyStore type="jks" password="password" resource="certs/restricted/bob.jks"/> @@ -47,13 +47,13 @@ <!-- --> <!-- Scenario 3.1 --> <!-- --> - <jaxws:endpoint id="UserNameOverTransport" address="https://localhost:${testutil.ports.Server.1}/UserNameOverTransport"; serviceName="interop:PingService" endpointName="interop:UserNameOverTransport_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted" depends-on="tls-settings"> + <jaxws:endpoint id="UserNameOverTransport" address="https://localhost:${testutil.ports.wssec10.server.Server.1}/UserNameOverTransport"; serviceName="interop:PingService" endpointName="interop:UserNameOverTransport_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint id="UserName" address="http://localhost:${testutil.ports.Server}/UserName"; serviceName="interop:PingService" endpointName="interop:UserName_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted"> + <jaxws:endpoint id="UserName" address="http://localhost:${testutil.ports.wssec10.server.Server}/UserName"; serviceName="interop:PingService" endpointName="interop:UserName_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted"> <jaxws:properties> <entry key="ws-security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> @@ -62,7 +62,7 @@ <!-- --> <!-- Scenario 3.3 --> <!-- --> - <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncrypt_IPingService"; id="MutualCertificate10SignEncrypt" address="http://localhost:${testutil.ports.Server}/MutualCertificate10SignEncrypt"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncrypt_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncryptRestricted"> + <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncrypt_IPingService"; id="MutualCertificate10SignEncrypt" address="http://localhost:${testutil.ports.wssec10.server.Server}/MutualCertificate10SignEncrypt"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncrypt_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncryptRestricted"> <jaxws:properties> <entry key="ws-security.username" value="Alice"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -74,7 +74,7 @@ <!-- --> <!-- Scenario 3.4 --> <!-- --> - <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncryptRsa15TripleDes_IPingService"; id="MutualCertificate10SignEncryptRsa15TripleDes" address="http://localhost:${testutil.ports.Server}/MutualCertificate10SignEncryptRsa15TripleDes"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncryptRsa15TripleDes_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncryptRsa15TripleDesRestricted"> + <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncryptRsa15TripleDes_IPingService"; id="MutualCertificate10SignEncryptRsa15TripleDes" address="http://localhost:${testutil.ports.wssec10.server.Server}/MutualCertificate10SignEncryptRsa15TripleDes"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncryptRsa15TripleDes_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncryptRsa15TripleDesRestricted"> <jaxws:properties> <entry key="ws-security.username" value="Alice"/> <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/wssec10/server_restricted_authorized.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted_authorized.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted_authorized.xml index a5116e3..ec182e3 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted_authorized.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted_authorized.xml @@ -24,7 +24,7 @@ <!-- Transport Layer Security (TLS) settings --> <!-- --> <httpj:engine-factory id="tls-settings"> - <httpj:engine port="${testutil.ports.AuthorizedServer.1}"> + <httpj:engine port="${testutil.ports.wssec10.server.AuthorizedServer.1}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> <sec:keyStore type="jks" password="password" resource="certs/restricted/bob.jks"/> @@ -56,12 +56,12 @@ </map> </property> </bean> - <jaxws:endpoint id="UserName" address="http://localhost:${testutil.ports.AuthorizedServer}/UserName"; serviceName="interop:PingService" endpointName="interop:UserName_IPingService" wsdlLocation="target/test-classes/wsdl_systest_wssec/wssec10/WsSecurity10_12_restricted_hashed.wsdl" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted"> + <jaxws:endpoint id="UserName" address="http://localhost:${testutil.ports.wssec10.server.AuthorizedServer}/UserName"; serviceName="interop:PingService" endpointName="interop:UserName_IPingService" wsdlLocation="target/test-classes/wsdl_systest_wssec/wssec10/WsSecurity10_12_restricted_hashed.wsdl" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted"> <jaxws:inInterceptors> <ref bean="authorizationInterceptor"/> </jaxws:inInterceptors> </jaxws:endpoint> - <jaxws:endpoint id="UserName2" address="http://localhost:${testutil.ports.AuthorizedServer}/HashedUserName"; serviceName="interop:PingService" endpointName="interop:UserName_IPingService_hashed" wsdlLocation="target/test-classes/wsdl_systest_wssec/wssec10/WsSecurity10_12_restricted_hashed.wsdl" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted"> + <jaxws:endpoint id="UserName2" address="http://localhost:${testutil.ports.wssec10.server.AuthorizedServer}/HashedUserName"; serviceName="interop:PingService" endpointName="interop:UserName_IPingService_hashed" wsdlLocation="target/test-classes/wsdl_systest_wssec/wssec10/WsSecurity10_12_restricted_hashed.wsdl" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted"> <jaxws:inInterceptors> <ref bean="authorizationInterceptor"/> </jaxws:inInterceptors> @@ -69,7 +69,7 @@ <!-- --> <!-- Scenario 3.1 --> <!-- --> - <jaxws:endpoint id="UserNameOverTransport" address="https://localhost:${testutil.ports.AuthorizedServer.1}/UserNameOverTransport"; serviceName="interop:PingService" endpointName="interop:UserNameOverTransport_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted" depends-on="tls-settings"> + <jaxws:endpoint id="UserNameOverTransport" address="https://localhost:${testutil.ports.wssec10.server.AuthorizedServer.1}/UserNameOverTransport"; serviceName="interop:PingService" endpointName="interop:UserNameOverTransport_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml index d19ae84..25e09af 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml @@ -30,7 +30,7 @@ <!-- Transport Layer Security (TLS) settings --> <!-- --> <httpj:engine-factory id="tls-settings"> - <httpj:engine port="${testutil.ports.StaxServer.1}"> + <httpj:engine port="${testutil.ports.wssec10.server.StaxServer.1}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> <sec:keyStore type="jks" password="password" resource="certs/bob.jks"/> @@ -47,14 +47,14 @@ <!-- --> <!-- Scenario 3.1 --> <!-- --> - <jaxws:endpoint id="UserNameOverTransport" address="https://localhost:${testutil.ports.StaxServer.1}/UserNameOverTransport"; serviceName="interop:PingService" endpointName="interop:UserNameOverTransport_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransport" depends-on="tls-settings"> + <jaxws:endpoint id="UserNameOverTransport" address="https://localhost:${testutil.ports.wssec10.server.StaxServer.1}/UserNameOverTransport"; serviceName="interop:PingService" endpointName="interop:UserNameOverTransport_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransport" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint id="UserName" address="http://localhost:${testutil.ports.StaxServer}/UserName"; serviceName="interop:PingService" endpointName="interop:UserName_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransport"> + <jaxws:endpoint id="UserName" address="http://localhost:${testutil.ports.wssec10.server.StaxServer}/UserName"; serviceName="interop:PingService" endpointName="interop:UserName_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransport"> <jaxws:properties> <entry key="ws-security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> @@ -64,7 +64,7 @@ <!-- --> <!-- Scenario 3.3 --> <!-- --> - <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncrypt_IPingService"; id="MutualCertificate10SignEncrypt" address="http://localhost:${testutil.ports.StaxServer}/MutualCertificate10SignEncrypt"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncrypt_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncrypt"> + <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncrypt_IPingService"; id="MutualCertificate10SignEncrypt" address="http://localhost:${testutil.ports.wssec10.server.StaxServer}/MutualCertificate10SignEncrypt"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncrypt_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncrypt"> <jaxws:properties> <entry key="ws-security.username" value="Alice"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -77,7 +77,7 @@ <!-- --> <!-- Scenario 3.4 --> <!-- --> - <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncryptRsa15TripleDes_IPingService"; id="MutualCertificate10SignEncryptRsa15TripleDes" address="http://localhost:${testutil.ports.StaxServer}/MutualCertificate10SignEncryptRsa15TripleDes"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncryptRsa15TripleDes_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncryptRsa15TripleDes"> + <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncryptRsa15TripleDes_IPingService"; id="MutualCertificate10SignEncryptRsa15TripleDes" address="http://localhost:${testutil.ports.wssec10.server.StaxServer}/MutualCertificate10SignEncryptRsa15TripleDes"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncryptRsa15TripleDes_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncryptRsa15TripleDes"> <jaxws:properties> <entry key="ws-security.username" value="Alice"/> <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/wssec10/stax-server_restricted.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml index ed13e88..8108d7c 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml @@ -30,7 +30,7 @@ <!-- Transport Layer Security (TLS) settings --> <!-- --> <httpj:engine-factory id="tls-settings"> - <httpj:engine port="${testutil.ports.StaxServer.1}"> + <httpj:engine port="${testutil.ports.wssec10.server.StaxServer.1}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> <sec:keyStore type="jks" password="password" resource="certs/restricted/bob.jks"/> @@ -47,14 +47,14 @@ <!-- --> <!-- Scenario 3.1 --> <!-- --> - <jaxws:endpoint id="UserNameOverTransport" address="https://localhost:${testutil.ports.StaxServer.1}/UserNameOverTransport"; serviceName="interop:PingService" endpointName="interop:UserNameOverTransport_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted" depends-on="tls-settings"> + <jaxws:endpoint id="UserNameOverTransport" address="https://localhost:${testutil.ports.wssec10.server.StaxServer.1}/UserNameOverTransport"; serviceName="interop:PingService" endpointName="interop:UserNameOverTransport_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> - <jaxws:endpoint id="UserName" address="http://localhost:${testutil.ports.StaxServer}/UserName"; serviceName="interop:PingService" endpointName="interop:UserName_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted"> + <jaxws:endpoint id="UserName" address="http://localhost:${testutil.ports.wssec10.server.StaxServer}/UserName"; serviceName="interop:PingService" endpointName="interop:UserName_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted"> <jaxws:properties> <entry key="ws-security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> @@ -64,7 +64,7 @@ <!-- --> <!-- Scenario 3.3 --> <!-- --> - <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncrypt_IPingService"; id="MutualCertificate10SignEncrypt" address="http://localhost:${testutil.ports.StaxServer}/MutualCertificate10SignEncrypt"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncrypt_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncryptRestricted"> + <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncrypt_IPingService"; id="MutualCertificate10SignEncrypt" address="http://localhost:${testutil.ports.wssec10.server.StaxServer}/MutualCertificate10SignEncrypt"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncrypt_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncryptRestricted"> <jaxws:properties> <entry key="ws-security.username" value="Alice"/> <entry key="ws-security.signature.properties" value="bob.properties"/> @@ -77,7 +77,7 @@ <!-- --> <!-- Scenario 3.4 --> <!-- --> - <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncryptRsa15TripleDes_IPingService"; id="MutualCertificate10SignEncryptRsa15TripleDes" address="http://localhost:${testutil.ports.StaxServer}/MutualCertificate10SignEncryptRsa15TripleDes"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncryptRsa15TripleDes_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncryptRsa15TripleDesRestricted"> + <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncryptRsa15TripleDes_IPingService"; id="MutualCertificate10SignEncryptRsa15TripleDes" address="http://localhost:${testutil.ports.wssec10.server.StaxServer}/MutualCertificate10SignEncryptRsa15TripleDes"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncryptRsa15TripleDes_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncryptRsa15TripleDesRestricted"> <jaxws:properties> <entry key="ws-security.username" value="Alice"/> <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/x509/intermediary.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/intermediary.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/intermediary.xml index 0baf03c..f1ca6ee 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/intermediary.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/intermediary.xml @@ -39,7 +39,7 @@ </sec:trustManagers> </http:tlsClientParameters> </http:conduit> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="NoSecurity" address="http://localhost:${testutil.ports.Intermediary}/DoubleItX509"; serviceName="s:DoubleItService" endpointName="s:DoubleItPort" implementor="org.apache.cxf.systest.ws.x509.DoubleItIntermediaryImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItIntermediary.wsdl"> + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="NoSecurity" address="http://localhost:${testutil.ports.x509.Intermediary}/DoubleItX509"; serviceName="s:DoubleItService" endpointName="s:DoubleItPort" implementor="org.apache.cxf.systest.ws.x509.DoubleItIntermediaryImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItIntermediary.wsdl"> <jaxws:properties> </jaxws:properties> </jaxws:endpoint>
