Author: coheigea
Date: Wed Mar 6 10:27:19 2013
New Revision: 1453269
URL: http://svn.apache.org/r1453269
Log:
Merged revisions 1453268 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1453268 | coheigea | 2013-03-06 10:25:15 +0000 (Wed, 06 Mar 2013) | 2 lines
Sharing some STSClient beans between tests
........
Modified:
cxf/branches/2.7.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml
cxf/branches/2.7.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml
cxf/branches/2.7.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml
cxf/branches/2.7.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml
cxf/branches/2.7.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-client.xml
cxf/branches/2.7.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml
cxf/branches/2.7.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml
cxf/branches/2.7.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml
Modified:
cxf/branches/2.7.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml?rev=1453269&r1=1453268&r2=1453269&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml
(original)
+++
cxf/branches/2.7.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml
Wed Mar 6 10:27:19 2013
@@ -37,82 +37,42 @@ http://cxf.apache.org/configuration/secu
</cxf:features>
</cxf:bus>
+ <bean id="stsClient" class="org.apache.cxf.ws.security.trust.STSClient">
+ <constructor-arg ref="cxf"/>
+ <property name="wsdlLocation"
+
value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/>
+ <property name="serviceName"
+
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
+ <property name="endpointName"
+
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
+ <property name="properties">
+ <map>
+ <entry key="ws-security.username" value="alice"/>
+ <entry key="ws-security.callback-handler"
+
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+ <entry key="ws-security.sts.token.username"
value="myclientkey"/>
+ <entry key="ws-security.sts.token.properties"
value="clientKeystore.properties"/>
+ <entry key="ws-security.sts.token.usecert" value="true"/>
+ </map>
+ </property>
+ </bean>
+
<jaxws:client
name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1Port";
createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
- <bean class="org.apache.cxf.ws.security.trust.STSClient">
- <constructor-arg ref="cxf"/>
- <property name="wsdlLocation"
-
value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/>
- <property name="serviceName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
- <property name="endpointName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
- <property name="properties">
- <map>
- <entry key="ws-security.username" value="alice"/>
- <entry key="ws-security.callback-handler"
-
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username"
value="myclientkey"/>
- <entry key="ws-security.sts.token.properties"
value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert"
value="true"/>
- </map>
- </property>
- </bean>
- </entry>
+ <entry key="ws-security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client
name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1Port2";
createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
- <bean class="org.apache.cxf.ws.security.trust.STSClient">
- <constructor-arg ref="cxf"/>
- <property name="wsdlLocation"
-
value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/>
- <property name="serviceName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
- <property name="endpointName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
- <property name="properties">
- <map>
- <entry key="ws-security.username" value="alice"/>
- <entry key="ws-security.callback-handler"
-
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username"
value="myclientkey"/>
- <entry key="ws-security.sts.token.properties"
value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert"
value="true"/>
- </map>
- </property>
- </bean>
- </entry>
+ <entry key="ws-security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client
name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1AlternativePort";
createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
- <bean class="org.apache.cxf.ws.security.trust.STSClient">
- <constructor-arg ref="cxf"/>
- <property name="wsdlLocation"
-
value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/>
- <property name="serviceName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
- <property name="endpointName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
- <property name="properties">
- <map>
- <entry key="ws-security.username" value="alice"/>
- <entry key="ws-security.callback-handler"
-
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username"
value="myclientkey"/>
- <entry key="ws-security.sts.token.properties"
value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert"
value="true"/>
- </map>
- </property>
- </bean>
- </entry>
+ <entry key="ws-security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
Modified:
cxf/branches/2.7.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml?rev=1453269&r1=1453268&r2=1453269&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml
(original)
+++
cxf/branches/2.7.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml
Wed Mar 6 10:27:19 2013
@@ -36,56 +36,36 @@ http://cxf.apache.org/configuration/secu
<cxf:logging/>
</cxf:features>
</cxf:bus>
+
+ <bean id="stsClient" class="org.apache.cxf.ws.security.trust.STSClient">
+ <constructor-arg ref="cxf"/>
+ <property name="wsdlLocation"
+
value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/>
+ <property name="serviceName"
+
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
+ <property name="endpointName"
+
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
+ <property name="properties">
+ <map>
+ <entry key="ws-security.username" value="alice"/>
+ <entry key="ws-security.callback-handler"
+
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+ <entry key="ws-security.sts.token.username"
value="myclientkey"/>
+ <entry key="ws-security.sts.token.properties"
value="clientKeystore.properties"/>
+ <entry key="ws-security.sts.token.usecert" value="true"/>
+ </map>
+ </property>
+ </bean>
<jaxws:client
name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1ClaimsPort";
createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
- <bean class="org.apache.cxf.ws.security.trust.STSClient">
- <constructor-arg ref="cxf"/>
- <property name="wsdlLocation"
-
value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/>
- <property name="serviceName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
- <property name="endpointName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
- <property name="properties">
- <map>
- <entry key="ws-security.username" value="alice"/>
- <entry key="ws-security.callback-handler"
-
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username"
value="myclientkey"/>
- <entry key="ws-security.sts.token.properties"
value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert"
value="true"/>
- </map>
- </property>
- </bean>
- </entry>
+ <entry key="ws-security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client
name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1CustomClaimsPort";
createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
- <bean class="org.apache.cxf.ws.security.trust.STSClient">
- <constructor-arg ref="cxf"/>
- <property name="wsdlLocation"
-
value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/>
- <property name="serviceName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
- <property name="endpointName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
- <property name="properties">
- <map>
- <entry key="ws-security.username" value="alice"/>
- <entry key="ws-security.callback-handler"
-
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username"
value="myclientkey"/>
- <entry key="ws-security.sts.token.properties"
value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert"
value="true"/>
- </map>
- </property>
- </bean>
- </entry>
+ <entry key="ws-security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
@@ -93,27 +73,7 @@ http://cxf.apache.org/configuration/secu
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.client">
- <bean class="org.apache.cxf.ws.security.trust.STSClient">
- <constructor-arg ref="cxf"/>
- <property name="wsdlLocation"
-
value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/>
- <property name="serviceName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
- <property name="endpointName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
- <property name="properties">
- <map>
- <entry key="ws-security.username" value="alice"/>
- <entry key="ws-security.callback-handler"
-
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username"
value="myclientkey"/>
- <entry key="ws-security.sts.token.properties"
value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert"
value="true"/>
- </map>
- </property>
- </bean>
- </entry>
+ <entry key="ws-security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
@@ -121,27 +81,7 @@ http://cxf.apache.org/configuration/secu
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.client">
- <bean class="org.apache.cxf.ws.security.trust.STSClient">
- <constructor-arg ref="cxf"/>
- <property name="wsdlLocation"
-
value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/>
- <property name="serviceName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
- <property name="endpointName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
- <property name="properties">
- <map>
- <entry key="ws-security.username" value="alice"/>
- <entry key="ws-security.callback-handler"
-
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username"
value="myclientkey"/>
- <entry key="ws-security.sts.token.properties"
value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert"
value="true"/>
- </map>
- </property>
- </bean>
- </entry>
+ <entry key="ws-security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
Modified:
cxf/branches/2.7.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml?rev=1453269&r1=1453268&r2=1453269&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml
(original)
+++
cxf/branches/2.7.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml
Wed Mar 6 10:27:19 2013
@@ -37,84 +37,44 @@ http://cxf.apache.org/configuration/secu
</cxf:features>
</cxf:bus>
+ <bean id="stsClient" class="org.apache.cxf.ws.security.trust.STSClient">
+ <constructor-arg ref="cxf"/>
+ <property name="wsdlLocation"
+
value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/>
+ <property name="serviceName"
+
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
+ <property name="endpointName"
+
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
+ <property name="properties">
+ <map>
+ <entry key="ws-security.username" value="alice"/>
+ <entry key="ws-security.callback-handler"
+
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+ <entry key="ws-security.sts.token.username"
value="myclientkey"/>
+ <entry key="ws-security.sts.token.properties"
value="clientKeystore.properties"/>
+ <entry key="ws-security.sts.token.usecert" value="true"/>
+ </map>
+ </property>
+ </bean>
+
<jaxws:client
name="{http://www.example.org/contract/DoubleIt}DoubleItSCTPort";
createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
- <bean class="org.apache.cxf.ws.security.trust.STSClient">
- <constructor-arg ref="cxf"/>
- <property name="wsdlLocation"
-
value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/>
- <property name="serviceName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
- <property name="endpointName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
- <property name="properties">
- <map>
- <entry key="ws-security.username" value="alice"/>
- <entry key="ws-security.callback-handler"
-
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username"
value="myclientkey"/>
- <entry key="ws-security.sts.token.properties"
value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert"
value="true"/>
- </map>
- </property>
- </bean>
- </entry>
+ <entry key="ws-security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client
name="{http://www.example.org/contract/DoubleIt}DoubleItSAMLPort";
createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
- <bean class="org.apache.cxf.ws.security.trust.STSClient">
- <constructor-arg ref="cxf"/>
- <property name="wsdlLocation"
-
value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/>
- <property name="serviceName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
- <property name="endpointName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
- <property name="properties">
- <map>
- <entry key="ws-security.username" value="alice"/>
- <entry key="ws-security.callback-handler"
-
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username"
value="myclientkey"/>
- <entry key="ws-security.sts.token.properties"
value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert"
value="true"/>
- </map>
- </property>
- </bean>
- </entry>
+ <entry key="ws-security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client
name="{http://www.example.org/contract/DoubleIt}DoubleItUsernameTokenPort";
createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
- <bean class="org.apache.cxf.ws.security.trust.STSClient">
- <constructor-arg ref="cxf"/>
- <property name="wsdlLocation"
-
value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/>
- <property name="serviceName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
- <property name="endpointName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
- <property name="properties">
- <map>
- <entry key="ws-security.username" value="alice"/>
- <entry key="ws-security.callback-handler"
-
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username"
value="myclientkey"/>
- <entry key="ws-security.sts.token.properties"
value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert"
value="true"/>
- </map>
- </property>
- </bean>
- </entry>
+ <entry key="ws-security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
Modified:
cxf/branches/2.7.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml?rev=1453269&r1=1453268&r2=1453269&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml
(original)
+++
cxf/branches/2.7.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml
Wed Mar 6 10:27:19 2013
@@ -37,57 +37,37 @@ http://cxf.apache.org/configuration/secu
</cxf:features>
</cxf:bus>
+ <bean id="stsClient" class="org.apache.cxf.ws.security.trust.STSClient">
+ <constructor-arg ref="cxf"/>
+ <property name="wsdlLocation"
+
value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/TransportSCT?wsdl"/>
+ <property name="serviceName"
+
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
+ <property name="endpointName"
+
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
+ <property name="keySize" value="128"/>
+ <property name="properties">
+ <map>
+ <entry key="ws-security.username" value="alice"/>
+ <entry key="ws-security.callback-handler"
+
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+ <entry key="ws-security.sts.token.username"
value="myclientkey"/>
+ <entry key="ws-security.sts.token.properties"
value="clientKeystore.properties"/>
+ </map>
+ </property>
+ </bean>
+
<jaxws:client
name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSecureConvPort";
createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
- <bean class="org.apache.cxf.ws.security.trust.STSClient">
- <constructor-arg ref="cxf"/>
- <property name="wsdlLocation"
-
value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/TransportSCT?wsdl"/>
- <property name="serviceName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
- <property name="endpointName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
- <property name="keySize" value="128"/>
- <property name="properties">
- <map>
- <entry key="ws-security.username" value="alice"/>
- <entry key="ws-security.callback-handler"
-
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username"
value="myclientkey"/>
- <entry key="ws-security.sts.token.properties"
value="clientKeystore.properties"/>
- </map>
- </property>
- </bean>
- </entry>
+ <entry key="ws-security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client
name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSecureConvPort";
createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
- <bean class="org.apache.cxf.ws.security.trust.STSClient">
- <constructor-arg ref="cxf"/>
- <property name="wsdlLocation"
-
value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/TransportSCT?wsdl"/>
- <property name="serviceName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
- <property name="endpointName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
- <property name="keySize" value="128"/>
- <property name="properties">
- <map>
- <entry key="ws-security.username" value="alice"/>
- <entry key="ws-security.callback-handler"
-
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username"
value="myclientkey"/>
- <entry key="ws-security.sts.token.properties"
value="clientKeystore.properties"/>
- </map>
- </property>
- </bean>
- </entry>
+ <entry key="ws-security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
Modified:
cxf/branches/2.7.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-client.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-client.xml?rev=1453269&r1=1453268&r2=1453269&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-client.xml
(original)
+++
cxf/branches/2.7.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-client.xml
Wed Mar 6 10:27:19 2013
@@ -35,6 +35,29 @@ http://cxf.apache.org/configuration/secu
</cxf:features>
</cxf:bus>
+ <bean id="stsClient" class="org.apache.cxf.ws.security.trust.STSClient">
+ <constructor-arg ref="cxf"/>
+ <property name="wsdlLocation"
+ value="http://localhost:8080/SecurityTokenService/UT?wsdl"/>
+ <property name="serviceName"
+
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
+ <property name="endpointName"
+
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}UT_Port"/>
+ <property name="properties">
+ <map>
+ <entry key="ws-security.username" value="alice"/>
+ <entry key="ws-security.callback-handler"
+
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+ <entry key="ws-security.encryption.username" value="mystskey"/>
+ <entry key="ws-security.encryption.properties"
value="clientKeystore.properties"/>
+ <entry key="ws-security.sts.token.username"
value="myclientkey"/>
+ <entry key="ws-security.sts.token.properties"
value="clientKeystore.properties"/>
+ <entry key="ws-security.sts.token.usecert" value="true"/>
+ <entry key="ws-security.is-bsp-compliant" value="false"/>
+ </map>
+ </property>
+ </bean>
+
<jaxws:client
name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSAML1Port";
createdFromAPI="true">
<jaxws:properties>
@@ -44,30 +67,7 @@ http://cxf.apache.org/configuration/secu
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="ws-security.encryption.properties"
value="clientKeystore.properties"/>
<entry key="ws-security.encryption.username" value="myservicekey"/>
- <entry key="ws-security.sts.client">
- <bean class="org.apache.cxf.ws.security.trust.STSClient">
- <constructor-arg ref="cxf"/>
- <property name="wsdlLocation"
-
value="http://localhost:8080/SecurityTokenService/UT?wsdl"/>
- <property name="serviceName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
- <property name="endpointName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}UT_Port"/>
- <property name="properties">
- <map>
- <entry key="ws-security.username" value="alice"/>
- <entry key="ws-security.callback-handler"
-
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.encryption.properties"
value="clientKeystore.properties"/>
- <entry key="ws-security.encryption.username"
value="mystskey"/>
- <entry key="ws-security.sts.token.username"
value="myclientkey"/>
- <entry key="ws-security.sts.token.properties"
value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert"
value="true"/>
- <entry key="ws-security.is-bsp-compliant"
value="false"/>
- </map>
- </property>
- </bean>
- </entry>
+ <entry key="ws-security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
@@ -80,30 +80,7 @@ http://cxf.apache.org/configuration/secu
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="ws-security.encryption.properties"
value="clientKeystore.properties"/>
<entry key="ws-security.encryption.username" value="myservicekey"/>
- <entry key="ws-security.sts.client">
- <bean class="org.apache.cxf.ws.security.trust.STSClient">
- <constructor-arg ref="cxf"/>
- <property name="wsdlLocation"
-
value="http://localhost:8080/SecurityTokenService/UT?wsdl"/>
- <property name="serviceName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
- <property name="endpointName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}UT_Port"/>
- <property name="properties">
- <map>
- <entry key="ws-security.username" value="alice"/>
- <entry key="ws-security.callback-handler"
-
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.encryption.properties"
value="clientKeystore.properties"/>
- <entry key="ws-security.encryption.username"
value="mystskey"/>
- <entry key="ws-security.sts.token.username"
value="myclientkey"/>
- <entry key="ws-security.sts.token.properties"
value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert"
value="true"/>
- <entry key="ws-security.is-bsp-compliant"
value="false"/>
- </map>
- </property>
- </bean>
- </entry>
+ <entry key="ws-security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
Modified:
cxf/branches/2.7.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml?rev=1453269&r1=1453268&r2=1453269&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml
(original)
+++
cxf/branches/2.7.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml
Wed Mar 6 10:27:19 2013
@@ -35,57 +35,37 @@ http://cxf.apache.org/configuration/secu
</cxf:features>
</cxf:bus>
+ <bean id="stsClient" class="org.apache.cxf.ws.security.trust.STSClient">
+ <constructor-arg ref="cxf"/>
+ <property name="wsdlLocation"
+ value="http://localhost:8080/SecurityTokenService/UT?wsdl"/>
+ <property name="serviceName"
+
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
+ <property name="endpointName"
+
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}UT_Port"/>
+ <property name="properties">
+ <map>
+ <entry key="ws-security.username" value="alice"/>
+ <entry key="ws-security.callback-handler"
+
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+ <entry key="ws-security.encryption.username" value="mystskey"/>
+ <entry key="ws-security.encryption.properties"
value="clientKeystore.properties"/>
+ <entry key="ws-security.is-bsp-compliant" value="false"/>
+ </map>
+ </property>
+ </bean>
+
<jaxws:client
name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSAML1Port";
createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
- <bean class="org.apache.cxf.ws.security.trust.STSClient">
- <constructor-arg ref="cxf"/>
- <property name="wsdlLocation"
-
value="http://localhost:8080/SecurityTokenService/UT?wsdl"/>
- <property name="serviceName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
- <property name="endpointName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}UT_Port"/>
- <property name="properties">
- <map>
- <entry key="ws-security.username" value="alice"/>
- <entry key="ws-security.callback-handler"
-
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.encryption.properties"
value="clientKeystore.properties"/>
- <entry key="ws-security.encryption.username"
value="mystskey"/>
- <entry key="ws-security.is-bsp-compliant"
value="false"/>
- </map>
- </property>
- </bean>
- </entry>
+ <entry key="ws-security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client
name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSAML2Port";
createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
- <bean class="org.apache.cxf.ws.security.trust.STSClient">
- <constructor-arg ref="cxf"/>
- <property name="wsdlLocation"
-
value="http://localhost:8080/SecurityTokenService/UT?wsdl"/>
- <property name="serviceName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
- <property name="endpointName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}UT_Port"/>
- <property name="properties">
- <map>
- <entry key="ws-security.username" value="alice"/>
- <entry key="ws-security.callback-handler"
-
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.encryption.properties"
value="clientKeystore.properties"/>
- <entry key="ws-security.encryption.username"
value="mystskey"/>
- <entry key="ws-security.is-bsp-compliant"
value="false"/>
- </map>
- </property>
- </bean>
- </entry>
+ <entry key="ws-security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
Modified:
cxf/branches/2.7.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml?rev=1453269&r1=1453268&r2=1453269&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml
(original)
+++
cxf/branches/2.7.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml
Wed Mar 6 10:27:19 2013
@@ -34,30 +34,30 @@ http://cxf.apache.org/configuration/secu
<cxf:logging/>
</cxf:features>
</cxf:bus>
+
+ <bean id="stsClient" class="org.apache.cxf.ws.security.trust.STSClient">
+ <constructor-arg ref="cxf"/>
+ <property name="wsdlLocation"
+
value="https://localhost:8443/SecurityTokenService/Transport?wsdl"/>
+ <property name="serviceName"
+
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
+ <property name="endpointName"
+
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
+ <property name="properties">
+ <map>
+ <entry key="ws-security.username" value="alice"/>
+ <entry key="ws-security.callback-handler"
+
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+ <entry key="ws-security.sts.token.username"
value="myclientkey"/>
+ <entry key="ws-security.sts.token.properties"
value="clientKeystore.properties"/>
+ <entry key="ws-security.sts.token.usecert" value="true"/>
+ </map>
+ </property>
+ </bean>
<jaxws:client
name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1Port";
createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
- <bean class="org.apache.cxf.ws.security.trust.STSClient">
- <constructor-arg ref="cxf"/>
- <property name="wsdlLocation"
-
value="https://localhost:8443/SecurityTokenService/Transport?wsdl"/>
- <property name="serviceName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
- <property name="endpointName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
- <property name="properties">
- <map>
- <entry key="ws-security.username" value="alice"/>
- <entry key="ws-security.callback-handler"
-
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username"
value="myclientkey"/>
- <entry key="ws-security.sts.token.properties"
value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert"
value="true"/>
- </map>
- </property>
- </bean>
- </entry>
+ <entry key="ws-security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
@@ -94,27 +94,7 @@ http://cxf.apache.org/configuration/secu
<entry key="ws-security.signature.properties"
value="clientKeystore.properties"/>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.client">
- <bean class="org.apache.cxf.ws.security.trust.STSClient">
- <constructor-arg ref="cxf"/>
- <property name="wsdlLocation"
-
value="https://localhost:8443/SecurityTokenService/Transport?wsdl"/>
- <property name="serviceName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
- <property name="endpointName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
- <property name="properties">
- <map>
- <entry key="ws-security.username" value="alice"/>
- <entry key="ws-security.callback-handler"
-
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.sts.token.username"
value="myclientkey"/>
- <entry key="ws-security.sts.token.properties"
value="clientKeystore.properties"/>
- <entry key="ws-security.sts.token.usecert"
value="true"/>
- </map>
- </property>
- </bean>
- </entry>
+ <entry key="ws-security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
Modified:
cxf/branches/2.7.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml?rev=1453269&r1=1453268&r2=1453269&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml
(original)
+++
cxf/branches/2.7.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml
Wed Mar 6 10:27:19 2013
@@ -34,58 +34,38 @@ http://cxf.apache.org/configuration/secu
<cxf:logging/>
</cxf:features>
</cxf:bus>
+
+ <bean id="stsClient" class="org.apache.cxf.ws.security.trust.STSClient">
+ <constructor-arg ref="cxf"/>
+ <property name="wsdlLocation"
+ value="http://localhost:8080/SecurityTokenService/X509?wsdl"/>
+ <property name="serviceName"
+
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
+ <property name="endpointName"
+
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}X509_Port"/>
+ <property name="properties">
+ <map>
+ <entry key="ws-security.signature.username"
value="myclientkey"/>
+ <entry key="ws-security.callback-handler"
+
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+ <entry key="ws-security.signature.properties"
value="clientKeystore.properties"/>
+ <entry key="ws-security.encryption.properties"
value="clientKeystore.properties"/>
+ <entry key="ws-security.encryption.username" value="mystskey"/>
+ </map>
+ </property>
+ </bean>
<jaxws:client
name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSAML1Port";
createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
- <bean class="org.apache.cxf.ws.security.trust.STSClient">
- <constructor-arg ref="cxf"/>
- <property name="wsdlLocation"
-
value="http://localhost:8080/SecurityTokenService/X509?wsdl"/>
- <property name="serviceName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
- <property name="endpointName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}X509_Port"/>
- <property name="properties">
- <map>
- <entry key="ws-security.signature.username"
value="myclientkey"/>
- <entry key="ws-security.callback-handler"
-
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.signature.properties"
value="clientKeystore.properties"/>
- <entry key="ws-security.encryption.properties"
value="clientKeystore.properties"/>
- <entry key="ws-security.encryption.username"
value="mystskey"/>
- </map>
- </property>
- </bean>
- </entry>
+ <entry key="ws-security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client
name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSAML2Port";
createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.sts.client">
- <bean class="org.apache.cxf.ws.security.trust.STSClient">
- <constructor-arg ref="cxf"/>
- <property name="wsdlLocation"
-
value="http://localhost:8080/SecurityTokenService/X509?wsdl"/>
- <property name="serviceName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
- <property name="endpointName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}X509_Port"/>
- <property name="properties">
- <map>
- <entry key="ws-security.signature.username"
value="myclientkey"/>
- <entry key="ws-security.callback-handler"
-
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.signature.properties"
value="clientKeystore.properties"/>
- <entry key="ws-security.encryption.properties"
value="clientKeystore.properties"/>
- <entry key="ws-security.encryption.username"
value="mystskey"/>
- </map>
- </property>
- </bean>
- </entry>
+ <entry key="ws-security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
@@ -94,27 +74,7 @@ http://cxf.apache.org/configuration/secu
<jaxws:properties>
<entry key="ws-security.encryption.properties"
value="clientKeystore.properties"/>
<entry key="ws-security.encryption.username" value="myservicekey"/>
- <entry key="ws-security.sts.client">
- <bean class="org.apache.cxf.ws.security.trust.STSClient">
- <constructor-arg ref="cxf"/>
- <property name="wsdlLocation"
-
value="http://localhost:8080/SecurityTokenService/X509?wsdl"/>
- <property name="serviceName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
- <property name="endpointName"
-
value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}X509_Port"/>
- <property name="properties">
- <map>
- <entry key="ws-security.signature.username"
value="myclientkey"/>
- <entry key="ws-security.callback-handler"
-
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.signature.properties"
value="clientKeystore.properties"/>
- <entry key="ws-security.encryption.properties"
value="clientKeystore.properties"/>
- <entry key="ws-security.encryption.username"
value="mystskey"/>
- </map>
- </property>
- </bean>
- </entry>
+ <entry key="ws-security.sts.client" value-ref="stsClient"/>
</jaxws:properties>
</jaxws:client>
