You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2011/11/21 17:25:09 UTC
svn commit: r1204574 [1/2] - in /cxf/trunk/services/sts:
sts-core/src/test/resources/ sts-war/src/main/webapp/WEB-INF/
systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/
systests/advanced/src/test/resources/org/apache/cxf/...
Author: coheigea
Date: Mon Nov 21 16:25:08 2011
New Revision: 1204574
URL: http://svn.apache.org/viewvc?rev=1204574&view=rev
Log:
Tidying up some indentation issues after removing tabs in some of the config files
Modified:
cxf/trunk/services/sts/sts-core/src/test/resources/ldap.xml
cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-transport.xml
cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-ut.xml
cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-x509.xml
cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/web.xml
cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/cxf-sts.xml
cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml
cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml
cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml
cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-2.xml
cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml
cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml
cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml
cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml
cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml
cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml
Modified: cxf/trunk/services/sts/sts-core/src/test/resources/ldap.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/test/resources/ldap.xml?rev=1204574&r1=1204573&r2=1204574&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-core/src/test/resources/ldap.xml (original)
+++ cxf/trunk/services/sts/sts-core/src/test/resources/ldap.xml Mon Nov 21 16:25:08 2011
@@ -19,38 +19,38 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
- xsi:schemaLocation="
+ xsi:schemaLocation="
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util-2.0.xsd
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
- <bean id="contextSource" class="org.springframework.ldap.core.support.LdapContextSource">
- <property name="url" value="ldap://mycompany.com:389" />
- <property name="userDn" value="CN=test,OU=svcUID,OU=users,DC=emea,DC=mycompany,DC=com" />
- <property name="password" value="changeit" />
- </bean>
-
- <bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
- <constructor-arg ref="contextSource" />
- </bean>
+ <bean id="contextSource" class="org.springframework.ldap.core.support.LdapContextSource">
+ <property name="url" value="ldap://mycompany.com:389" />
+ <property name="userDn" value="CN=test,OU=svcUID,OU=users,DC=emea,DC=mycompany,DC=com" />
+ <property name="password" value="changeit" />
+ </bean>
+
+ <bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
+ <constructor-arg ref="contextSource" />
+ </bean>
- <util:map id="claimsToLdapAttributeMapping">
- <entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" value="givenName" />
- <entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" value="sn" />
- <entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" value="mail" />
- <entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/country" value="c" />
- </util:map>
-
-
- <bean id="testClaimsHandler" class="org.apache.cxf.sts.claims.LdapClaimsHandler">
- <property name="ldapTemplate" ref="ldapTemplate" />
- <property name="claimsLdapAttributeMapping" ref="claimsToLdapAttributeMapping" />
- <property name="userBaseDN" value="OU=users,DC=emea,DC=mycompany,DC=com" />
- </bean>
-
+ <util:map id="claimsToLdapAttributeMapping">
+ <entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" value="givenName" />
+ <entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" value="sn" />
+ <entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" value="mail" />
+ <entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/country" value="c" />
+ </util:map>
+
+
+ <bean id="testClaimsHandler" class="org.apache.cxf.sts.claims.LdapClaimsHandler">
+ <property name="ldapTemplate" ref="ldapTemplate" />
+ <property name="claimsLdapAttributeMapping" ref="claimsToLdapAttributeMapping" />
+ <property name="userBaseDN" value="OU=users,DC=emea,DC=mycompany,DC=com" />
+ </bean>
+
</beans>
-
\ No newline at end of file
+
\ No newline at end of file
Modified: cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml?rev=1204574&r1=1204573&r2=1204574&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml (original)
+++ cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml Mon Nov 21 16:25:08 2011
@@ -39,60 +39,54 @@
</cxf:features>
</cxf:bus>
- <bean id="encryptedUtSTSProviderBean"
+ <bean id="encryptedUtSTSProviderBean"
class="org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider">
- <property name="issueOperation" ref="encryptedUtIssueDelegate"/>
- <property name="validateOperation" ref="encryptedUtValidateDelegate"/>
- </bean>
-
- <bean id="encryptedUtIssueDelegate"
- class="org.apache.cxf.sts.operation.TokenIssueOperation">
- <property name="tokenProviders" ref="encryptedUtSamlTokenProvider"/>
- <property name="services" ref="encryptedUtService"/>
- <property name="stsProperties" ref="encryptedUtSTSProperties"/>
- </bean>
-
- <bean id="encryptedUtValidateDelegate"
- class="org.apache.cxf.sts.operation.TokenValidateOperation">
- </bean>
-
- <bean id="encryptedUtSamlTokenProvider"
- class="org.apache.cxf.sts.token.provider.SAMLTokenProvider">
- </bean>
-
- <bean id="encryptedUtService"
- class="org.apache.cxf.sts.service.StaticService">
- <property name="endpoints" ref="encryptedUtEndpoints"/>
- </bean>
-
- <util:list id="encryptedUtEndpoints">
- <value>http://localhost:(\d)*/doubleit/services/doubleitasymmetricsaml1encrypted</value>
+ <property name="issueOperation" ref="encryptedUtIssueDelegate" />
+ <property name="validateOperation" ref="encryptedUtValidateDelegate" />
+ </bean>
+
+ <bean id="encryptedUtIssueDelegate" class="org.apache.cxf.sts.operation.TokenIssueOperation">
+ <property name="tokenProviders" ref="encryptedUtSamlTokenProvider" />
+ <property name="services" ref="encryptedUtService" />
+ <property name="stsProperties" ref="encryptedUtSTSProperties" />
+ </bean>
+
+ <bean id="encryptedUtValidateDelegate" class="org.apache.cxf.sts.operation.TokenValidateOperation">
+ </bean>
+
+ <bean id="encryptedUtSamlTokenProvider" class="org.apache.cxf.sts.token.provider.SAMLTokenProvider">
+ </bean>
+
+ <bean id="encryptedUtService" class="org.apache.cxf.sts.service.StaticService">
+ <property name="endpoints" ref="encryptedUtEndpoints" />
+ </bean>
+
+ <util:list id="encryptedUtEndpoints">
+ <value>http://localhost:(\d)*/doubleit/services/doubleitasymmetricsaml1encrypted
+ </value>
</util:list>
-
- <bean id="encryptedUtSTSProperties"
- class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
- <property name="signatureUsername" value="mystskey"/>
- <property name="callbackHandlerClass" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
- <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
- <property name="issuer" value="DoubleItSTSIssuer"/>
- <property name="encryptionUsername" value="myservicekey"/>
- </bean>
-
- <jaxws:endpoint id="EncryptedUTSTS"
- implementor="#encryptedUtSTSProviderBean"
- address="/UTEncrypted"
- wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"
- xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
- serviceName="ns1:SecurityTokenService"
- endpointName="ns1:UTEncrypted_Port">
- <jaxws:properties>
- <entry key="ws-security.callback-handler" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
- <entry key="ws-security.signature.properties" value="stsKeystore.properties"/>
- <entry key="ws-security.signature.username" value="mystskey"/>
- </jaxws:properties>
+
+ <bean id="encryptedUtSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
+ <property name="signaturePropertiesFile" value="stsKeystore.properties" />
+ <property name="signatureUsername" value="mystskey" />
+ <property name="callbackHandlerClass"
+ value="org.apache.cxf.sts.war.PasswordCallbackHandler" />
+ <property name="encryptionPropertiesFile" value="stsKeystore.properties" />
+ <property name="issuer" value="DoubleItSTSIssuer" />
+ <property name="encryptionUsername" value="myservicekey" />
+ </bean>
+
+ <jaxws:endpoint id="EncryptedUTSTS" implementor="#encryptedUtSTSProviderBean"
+ address="/UTEncrypted" wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"
+ xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
+ serviceName="ns1:SecurityTokenService" endpointName="ns1:UTEncrypted_Port">
+ <jaxws:properties>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.sts.war.PasswordCallbackHandler" />
+ <entry key="ws-security.signature.properties" value="stsKeystore.properties" />
+ <entry key="ws-security.signature.username" value="mystskey" />
+ </jaxws:properties>
</jaxws:endpoint>
-
+
</beans>
Modified: cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-transport.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-transport.xml?rev=1204574&r1=1204573&r2=1204574&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-transport.xml (original)
+++ cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-transport.xml Mon Nov 21 16:25:08 2011
@@ -39,81 +39,73 @@
</cxf:features>
</cxf:bus>
- <bean id="transportSTSProviderBean"
+ <bean id="transportSTSProviderBean"
class="org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider">
- <property name="issueOperation" ref="transportIssueDelegate"/>
- <property name="validateOperation" ref="transportValidateDelegate"/>
- </bean>
-
- <bean id="transportIssueDelegate"
- class="org.apache.cxf.sts.operation.TokenIssueOperation">
- <property name="tokenProviders" ref="transportTokenProviders"/>
- <property name="services" ref="transportService"/>
- <property name="stsProperties" ref="transportSTSProperties"/>
- </bean>
-
- <bean id="transportValidateDelegate"
- class="org.apache.cxf.sts.operation.TokenValidateOperation">
- <property name="tokenValidators" ref="transportTokenValidators"/>
- <property name="stsProperties" ref="transportSTSProperties"/>
+ <property name="issueOperation" ref="transportIssueDelegate" />
+ <property name="validateOperation" ref="transportValidateDelegate" />
</bean>
-
+
+ <bean id="transportIssueDelegate" class="org.apache.cxf.sts.operation.TokenIssueOperation">
+ <property name="tokenProviders" ref="transportTokenProviders" />
+ <property name="services" ref="transportService" />
+ <property name="stsProperties" ref="transportSTSProperties" />
+ </bean>
+
+ <bean id="transportValidateDelegate" class="org.apache.cxf.sts.operation.TokenValidateOperation">
+ <property name="tokenValidators" ref="transportTokenValidators" />
+ <property name="stsProperties" ref="transportSTSProperties" />
+ </bean>
+
<util:list id="transportTokenProviders">
- <ref bean="transportSamlTokenProvider"/>
+ <ref bean="transportSamlTokenProvider" />
</util:list>
-
+
<util:list id="transportTokenValidators">
- <ref bean="transportSamlTokenValidator"/>
- <ref bean="transportX509TokenValidator"/>
- <ref bean="transportUsernameTokenValidator"/>
+ <ref bean="transportSamlTokenValidator" />
+ <ref bean="transportX509TokenValidator" />
+ <ref bean="transportUsernameTokenValidator" />
</util:list>
-
- <bean id="transportSamlTokenProvider"
- class="org.apache.cxf.sts.token.provider.SAMLTokenProvider">
- </bean>
-
- <bean id="transportX509TokenValidator"
- class="org.apache.cxf.sts.token.validator.X509TokenValidator">
- </bean>
-
- <bean id="transportUsernameTokenValidator"
+
+ <bean id="transportSamlTokenProvider" class="org.apache.cxf.sts.token.provider.SAMLTokenProvider">
+ </bean>
+
+ <bean id="transportX509TokenValidator" class="org.apache.cxf.sts.token.validator.X509TokenValidator">
+ </bean>
+
+ <bean id="transportUsernameTokenValidator"
class="org.apache.cxf.sts.token.validator.UsernameTokenValidator">
- </bean>
-
- <bean id="transportSamlTokenValidator"
- class="org.apache.cxf.sts.token.validator.SAMLTokenValidator">
- </bean>
-
- <bean id="transportService"
- class="org.apache.cxf.sts.service.StaticService">
- <property name="endpoints" ref="transportEndpoints"/>
- </bean>
-
- <util:list id="transportEndpoints">
- <value>https://localhost:(\d)*/doubleit/services/doubleittransport.*</value>
+ </bean>
+
+ <bean id="transportSamlTokenValidator" class="org.apache.cxf.sts.token.validator.SAMLTokenValidator">
+ </bean>
+
+ <bean id="transportService" class="org.apache.cxf.sts.service.StaticService">
+ <property name="endpoints" ref="transportEndpoints" />
+ </bean>
+
+ <util:list id="transportEndpoints">
+ <value>https://localhost:(\d)*/doubleit/services/doubleittransport.*
+ </value>
</util:list>
-
- <bean id="transportSTSProperties"
- class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
- <property name="signatureUsername" value="mystskey"/>
- <property name="callbackHandlerClass" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
- <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
- <property name="issuer" value="DoubleItSTSIssuer"/>
- <property name="encryptionUsername" value="myservicekey"/>
- </bean>
-
- <jaxws:endpoint id="transportSTS"
- implementor="#transportSTSProviderBean"
- address="/Transport"
- wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"
- xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
- serviceName="ns1:SecurityTokenService"
- endpointName="ns1:Transport_Port">
- <jaxws:properties>
- <entry key="ws-security.callback-handler" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
- </jaxws:properties>
+
+ <bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
+ <property name="signaturePropertiesFile" value="stsKeystore.properties" />
+ <property name="signatureUsername" value="mystskey" />
+ <property name="callbackHandlerClass"
+ value="org.apache.cxf.sts.war.PasswordCallbackHandler" />
+ <property name="encryptionPropertiesFile" value="stsKeystore.properties" />
+ <property name="issuer" value="DoubleItSTSIssuer" />
+ <property name="encryptionUsername" value="myservicekey" />
+ </bean>
+
+ <jaxws:endpoint id="transportSTS" implementor="#transportSTSProviderBean"
+ address="/Transport" wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"
+ xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
+ serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_Port">
+ <jaxws:properties>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.sts.war.PasswordCallbackHandler" />
+ </jaxws:properties>
</jaxws:endpoint>
-
+
</beans>
Modified: cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-ut.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-ut.xml?rev=1204574&r1=1204573&r2=1204574&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-ut.xml (original)
+++ cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-ut.xml Mon Nov 21 16:25:08 2011
@@ -39,67 +39,60 @@
</cxf:features>
</cxf:bus>
- <bean id="utSTSProviderBean"
+ <bean id="utSTSProviderBean"
class="org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider">
- <property name="issueOperation" ref="utIssueDelegate"/>
- <property name="validateOperation" ref="utValidateDelegate"/>
- </bean>
-
- <bean id="utIssueDelegate"
- class="org.apache.cxf.sts.operation.TokenIssueOperation">
- <property name="tokenProviders" ref="utSamlTokenProvider"/>
- <property name="services" ref="utService"/>
- <property name="stsProperties" ref="utSTSProperties"/>
- </bean>
-
- <bean id="utValidateDelegate"
- class="org.apache.cxf.sts.operation.TokenValidateOperation">
- <property name="tokenValidators" ref="utSamlTokenValidator"/>
- <property name="stsProperties" ref="utSTSProperties"/>
- </bean>
-
- <bean id="utSamlTokenProvider"
- class="org.apache.cxf.sts.token.provider.SAMLTokenProvider">
- </bean>
-
- <bean id="utSamlTokenValidator"
- class="org.apache.cxf.sts.token.validator.SAMLTokenValidator">
- </bean>
-
- <bean id="utService"
- class="org.apache.cxf.sts.service.StaticService">
- <property name="endpoints" ref="utEndpoints"/>
- </bean>
-
- <util:list id="utEndpoints">
- <value>http://localhost:(\d)*/(doubleit|metrowsp)/services/doubleit(UT|.*symmetric.*|.*)</value>
+ <property name="issueOperation" ref="utIssueDelegate" />
+ <property name="validateOperation" ref="utValidateDelegate" />
+ </bean>
+
+ <bean id="utIssueDelegate" class="org.apache.cxf.sts.operation.TokenIssueOperation">
+ <property name="tokenProviders" ref="utSamlTokenProvider" />
+ <property name="services" ref="utService" />
+ <property name="stsProperties" ref="utSTSProperties" />
+ </bean>
+
+ <bean id="utValidateDelegate" class="org.apache.cxf.sts.operation.TokenValidateOperation">
+ <property name="tokenValidators" ref="utSamlTokenValidator" />
+ <property name="stsProperties" ref="utSTSProperties" />
+ </bean>
+
+ <bean id="utSamlTokenProvider" class="org.apache.cxf.sts.token.provider.SAMLTokenProvider">
+ </bean>
+
+ <bean id="utSamlTokenValidator" class="org.apache.cxf.sts.token.validator.SAMLTokenValidator">
+ </bean>
+
+ <bean id="utService" class="org.apache.cxf.sts.service.StaticService">
+ <property name="endpoints" ref="utEndpoints" />
+ </bean>
+
+ <util:list id="utEndpoints">
+ <value>http://localhost:(\d)*/(doubleit|metrowsp)/services/doubleit(UT|.*symmetric.*|.*)
+ </value>
</util:list>
-
- <bean id="utSTSProperties"
- class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
- <property name="signatureUsername" value="mystskey"/>
- <property name="callbackHandlerClass" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
- <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
- <property name="issuer" value="DoubleItSTSIssuer"/>
- <property name="encryptionUsername" value="myservicekey"/>
- </bean>
-
- <jaxws:endpoint id="UTSTS"
- implementor="#utSTSProviderBean"
- address="/UT"
- wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"
- xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
- serviceName="ns1:SecurityTokenService"
- endpointName="ns1:UT_Port">
- <jaxws:properties>
- <entry key="ws-security.callback-handler" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
- <entry key="ws-security.signature.properties" value="stsKeystore.properties"/>
- <!-- Below needs to be set to non-default value of false for Metro clients -->
- <entry key="ws-security.is-bsp-compliant" value="false"/>
- </jaxws:properties>
+
+ <bean id="utSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
+ <property name="signaturePropertiesFile" value="stsKeystore.properties" />
+ <property name="signatureUsername" value="mystskey" />
+ <property name="callbackHandlerClass"
+ value="org.apache.cxf.sts.war.PasswordCallbackHandler" />
+ <property name="encryptionPropertiesFile" value="stsKeystore.properties" />
+ <property name="issuer" value="DoubleItSTSIssuer" />
+ <property name="encryptionUsername" value="myservicekey" />
+ </bean>
+
+ <jaxws:endpoint id="UTSTS" implementor="#utSTSProviderBean"
+ address="/UT" wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"
+ xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
+ serviceName="ns1:SecurityTokenService" endpointName="ns1:UT_Port">
+ <jaxws:properties>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.sts.war.PasswordCallbackHandler" />
+ <entry key="ws-security.signature.properties" value="stsKeystore.properties" />
+ <!-- Below needs to be set to non-default value of false for Metro clients -->
+ <entry key="ws-security.is-bsp-compliant" value="false" />
+ </jaxws:properties>
</jaxws:endpoint>
-
+
</beans>
Modified: cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-x509.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-x509.xml?rev=1204574&r1=1204573&r2=1204574&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-x509.xml (original)
+++ cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-x509.xml Mon Nov 21 16:25:08 2011
@@ -40,67 +40,61 @@
</cxf:bus>
<bean id="x509STSProviderBean"
- class="org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider">
- <property name="issueOperation" ref="x509IssueDelegate"/>
- <property name="validateOperation" ref="x509ValidateDelegate"/>
- </bean>
-
- <bean id="x509IssueDelegate"
- class="org.apache.cxf.sts.operation.TokenIssueOperation">
- <property name="tokenProviders" ref="x509SamlTokenProvider"/>
- <property name="services" ref="x509Service"/>
- <property name="stsProperties" ref="x509STSProperties"/>
- </bean>
-
- <bean id="x509ValidateDelegate"
- class="org.apache.cxf.sts.operation.TokenValidateOperation">
- <property name="tokenValidators" ref="x509SamlTokenValidator"/>
- <property name="stsProperties" ref="x509STSProperties"/>
- </bean>
-
- <bean id="x509SamlTokenProvider"
- class="org.apache.cxf.sts.token.provider.SAMLTokenProvider">
+ class="org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider">
+ <property name="issueOperation" ref="x509IssueDelegate" />
+ <property name="validateOperation" ref="x509ValidateDelegate" />
</bean>
-
- <bean id="x509SamlTokenValidator"
- class="org.apache.cxf.sts.token.validator.SAMLTokenValidator">
- </bean>
-
- <bean id="x509Service"
- class="org.apache.cxf.sts.service.StaticService">
- <property name="endpoints" ref="x509Endpoints"/>
- </bean>
-
- <util:list id="x509Endpoints">
- <value>http://localhost:(\d)*/doubleit/services/doubleitsymmetric.*</value>
- <value>http://localhost:(\d)*/doubleit/services/doubleitasymmetric.*</value>
+
+ <bean id="x509IssueDelegate" class="org.apache.cxf.sts.operation.TokenIssueOperation">
+ <property name="tokenProviders" ref="x509SamlTokenProvider" />
+ <property name="services" ref="x509Service" />
+ <property name="stsProperties" ref="x509STSProperties" />
+ </bean>
+
+ <bean id="x509ValidateDelegate" class="org.apache.cxf.sts.operation.TokenValidateOperation">
+ <property name="tokenValidators" ref="x509SamlTokenValidator" />
+ <property name="stsProperties" ref="x509STSProperties" />
+ </bean>
+
+ <bean id="x509SamlTokenProvider" class="org.apache.cxf.sts.token.provider.SAMLTokenProvider">
+ </bean>
+
+ <bean id="x509SamlTokenValidator" class="org.apache.cxf.sts.token.validator.SAMLTokenValidator">
+ </bean>
+
+ <bean id="x509Service" class="org.apache.cxf.sts.service.StaticService">
+ <property name="endpoints" ref="x509Endpoints" />
+ </bean>
+
+ <util:list id="x509Endpoints">
+ <value>http://localhost:(\d)*/doubleit/services/doubleitsymmetric.*
+ </value>
+ <value>http://localhost:(\d)*/doubleit/services/doubleitasymmetric.*
+ </value>
</util:list>
-
- <bean id="x509STSProperties"
- class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
- <property name="signatureUsername" value="mystskey"/>
- <property name="callbackHandlerClass" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
- <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
- <property name="issuer" value="DoubleItSTSIssuer"/>
- <property name="encryptionUsername" value="myservicekey"/>
- </bean>
-
- <jaxws:endpoint id="X509STS"
- implementor="#x509STSProviderBean"
- address="/X509"
- wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"
- xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
- serviceName="ns1:SecurityTokenService"
- endpointName="ns1:X509_Port">
- <jaxws:properties>
- <entry key="ws-security.callback-handler" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
- <entry key="ws-security.signature.properties" value="stsKeystore.properties"/>
- <entry key="ws-security.signature.username" value="mystskey"/>
- <entry key="ws-security.encryption.username" value="useReqSigCert"/>
- </jaxws:properties>
+
+ <bean id="x509STSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
+ <property name="signaturePropertiesFile" value="stsKeystore.properties" />
+ <property name="signatureUsername" value="mystskey" />
+ <property name="callbackHandlerClass"
+ value="org.apache.cxf.sts.war.PasswordCallbackHandler" />
+ <property name="encryptionPropertiesFile" value="stsKeystore.properties" />
+ <property name="issuer" value="DoubleItSTSIssuer" />
+ <property name="encryptionUsername" value="myservicekey" />
+ </bean>
+
+ <jaxws:endpoint id="X509STS" implementor="#x509STSProviderBean"
+ address="/X509" wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"
+ xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
+ serviceName="ns1:SecurityTokenService" endpointName="ns1:X509_Port">
+ <jaxws:properties>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.sts.war.PasswordCallbackHandler" />
+ <entry key="ws-security.signature.properties" value="stsKeystore.properties" />
+ <entry key="ws-security.signature.username" value="mystskey" />
+ <entry key="ws-security.encryption.username" value="useReqSigCert" />
+ </jaxws:properties>
</jaxws:endpoint>
-
+
</beans>
Modified: cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/web.xml?rev=1204574&r1=1204573&r2=1204574&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/web.xml (original)
+++ cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/web.xml Mon Nov 21 16:25:08 2011
@@ -17,8 +17,8 @@
under the License.
-->
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<display-name>CXF STS</display-name>
<servlet>
@@ -37,5 +37,5 @@
<session-config>
<session-timeout>60</session-timeout>
</session-config>
-
+
</web-app>
Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/cxf-sts.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/cxf-sts.xml?rev=1204574&r1=1204573&r2=1204574&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/cxf-sts.xml (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/cxf-sts.xml Mon Nov 21 16:25:08 2011
@@ -42,62 +42,57 @@
</cxf:bus>
<bean id="x509STSProviderBean"
- class="org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider">
- <property name="issueOperation" ref="x509IssueDelegate"/>
- </bean>
-
- <bean id="x509IssueDelegate"
- class="org.apache.cxf.sts.operation.TokenIssueOperation">
- <property name="tokenProviders" ref="x509SamlTokenProvider"/>
- <property name="services" ref="x509Service"/>
- <property name="stsProperties" ref="x509STSProperties"/>
- <property name="encryptIssuedToken" value="true"/>
- </bean>
-
- <bean id="x509SamlTokenProvider"
- class="org.apache.cxf.sts.token.provider.SAMLTokenProvider">
- </bean>
-
- <bean id="x509Service"
- class="org.apache.cxf.sts.service.StaticService">
- <property name="endpoints" ref="x509Endpoints"/>
- <property name="encryptionProperties" ref="encProperties"/>
+ class="org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider">
+ <property name="issueOperation" ref="x509IssueDelegate" />
</bean>
-
- <util:list id="x509Endpoints">
- <value>https://localhost:(\d)*/doubleit/services/doubleittransport.*</value>
+
+ <bean id="x509IssueDelegate" class="org.apache.cxf.sts.operation.TokenIssueOperation">
+ <property name="tokenProviders" ref="x509SamlTokenProvider" />
+ <property name="services" ref="x509Service" />
+ <property name="stsProperties" ref="x509STSProperties" />
+ <property name="encryptIssuedToken" value="true" />
+ </bean>
+
+ <bean id="x509SamlTokenProvider" class="org.apache.cxf.sts.token.provider.SAMLTokenProvider">
+ </bean>
+
+ <bean id="x509Service" class="org.apache.cxf.sts.service.StaticService">
+ <property name="endpoints" ref="x509Endpoints" />
+ <property name="encryptionProperties" ref="encProperties" />
+ </bean>
+
+ <util:list id="x509Endpoints">
+ <value>https://localhost:(\d)*/doubleit/services/doubleittransport.*
+ </value>
</util:list>
-
+
<bean id="encProperties" class="org.apache.cxf.sts.service.EncryptionProperties">
- <property name="encryptionAlgorithm" value="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
- </bean>
-
- <bean id="x509STSProperties"
- class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
- <property name="signatureUsername" value="mystskey"/>
- <property name="callbackHandlerClass"
- value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
- <property name="issuer" value="DoubleItSTSIssuer"/>
- <property name="encryptionUsername" value="useReqSigCert"/>
- </bean>
-
- <jaxws:endpoint id="X509STS"
- implementor="#x509STSProviderBean"
- address="http://localhost:${testutil.ports.STSServer}/SecurityTokenService/X509"
- wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/ws-trust-1.4-service.wsdl"
- xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
- serviceName="ns1:SecurityTokenService"
- endpointName="ns1:X509_Port">
- <jaxws:properties>
- <entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <entry key="ws-security.signature.properties" value="stsKeystore.properties"/>
- <entry key="ws-security.signature.username" value="mystskey"/>
- </jaxws:properties>
+ <property name="encryptionAlgorithm" value="http://www.w3.org/2001/04/xmlenc#aes128-cbc" />
+ </bean>
+
+ <bean id="x509STSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
+ <property name="signaturePropertiesFile" value="stsKeystore.properties" />
+ <property name="signatureUsername" value="mystskey" />
+ <property name="callbackHandlerClass"
+ value="org.apache.cxf.systest.sts.common.CommonCallbackHandler" />
+ <property name="encryptionPropertiesFile" value="stsKeystore.properties" />
+ <property name="issuer" value="DoubleItSTSIssuer" />
+ <property name="encryptionUsername" value="useReqSigCert" />
+ </bean>
+
+ <jaxws:endpoint id="X509STS" implementor="#x509STSProviderBean"
+ address="http://localhost:${testutil.ports.STSServer}/SecurityTokenService/X509"
+ wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/ws-trust-1.4-service.wsdl"
+ xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
+ serviceName="ns1:SecurityTokenService" endpointName="ns1:X509_Port">
+ <jaxws:properties>
+ <entry key="ws-security.callback-handler"
+ value="org.apache.cxf.systest.sts.common.CommonCallbackHandler" />
+ <entry key="ws-security.signature.properties" value="stsKeystore.properties" />
+ <entry key="ws-security.signature.username" value="mystskey" />
+ </jaxws:properties>
</jaxws:endpoint>
-
+
</beans>
Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml?rev=1204574&r1=1204573&r2=1204574&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml Mon Nov 21 16:25:08 2011
@@ -91,12 +91,12 @@
</bean>
<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">
+ <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="bob"/>
<entry key="ws-security.callback-handler"
Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml?rev=1204574&r1=1204573&r2=1204574&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml Mon Nov 21 16:25:08 2011
@@ -48,176 +48,163 @@
</cxf:features>
</cxf:bus>
- <bean id="transportSTSProviderBean"
+ <bean id="transportSTSProviderBean"
class="org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider">
- <property name="issueOperation" ref="transportIssueDelegate"/>
- <property name="validateOperation" ref="transportValidateDelegate"/>
- </bean>
-
- <bean id="transportIssueDelegate"
- class="org.apache.cxf.sts.operation.TokenIssueOperation">
- <property name="tokenProviders" ref="transportTokenProviders"/>
- <property name="services" ref="transportService"/>
- <property name="stsProperties" ref="transportSTSProperties"/>
- <property name="claimsManager" ref="claimsManager"/>
- <property name="tokenStore" ref="defaultTokenStore"/>
- </bean>
-
- <bean id="transportValidateDelegate"
- class="org.apache.cxf.sts.operation.TokenValidateOperation">
- <property name="tokenProviders" ref="transportTokenProviders"/>
- <property name="tokenValidators" ref="transportTokenValidators"/>
- <property name="stsProperties" ref="transportSTSProperties"/>
- <property name="tokenStore" ref="defaultTokenStore"/>
- </bean>
-
- <bean id="defaultTokenStore"
- class="org.apache.cxf.sts.cache.DefaultInMemoryTokenStore">
- </bean>
-
+ <property name="issueOperation" ref="transportIssueDelegate" />
+ <property name="validateOperation" ref="transportValidateDelegate" />
+ </bean>
+
+ <bean id="transportIssueDelegate" class="org.apache.cxf.sts.operation.TokenIssueOperation">
+ <property name="tokenProviders" ref="transportTokenProviders" />
+ <property name="services" ref="transportService" />
+ <property name="stsProperties" ref="transportSTSProperties" />
+ <property name="claimsManager" ref="claimsManager" />
+ <property name="tokenStore" ref="defaultTokenStore" />
+ </bean>
+
+ <bean id="transportValidateDelegate" class="org.apache.cxf.sts.operation.TokenValidateOperation">
+ <property name="tokenProviders" ref="transportTokenProviders" />
+ <property name="tokenValidators" ref="transportTokenValidators" />
+ <property name="stsProperties" ref="transportSTSProperties" />
+ <property name="tokenStore" ref="defaultTokenStore" />
+ </bean>
+
+ <bean id="defaultTokenStore" class="org.apache.cxf.sts.cache.DefaultInMemoryTokenStore">
+ </bean>
+
<util:list id="transportTokenProviders">
- <ref bean="transportSamlTokenProvider"/>
- <ref bean="transportCustomBSTTokenProvider"/>
+ <ref bean="transportSamlTokenProvider" />
+ <ref bean="transportCustomBSTTokenProvider" />
</util:list>
-
+
<util:list id="transportTokenValidators">
- <ref bean="transportSamlTokenValidator"/>
- <ref bean="transportX509TokenValidator"/>
- <ref bean="transportUsernameTokenValidator"/>
- <ref bean="transportCustomBSTTokenValidator"/>
+ <ref bean="transportSamlTokenValidator" />
+ <ref bean="transportX509TokenValidator" />
+ <ref bean="transportUsernameTokenValidator" />
+ <ref bean="transportCustomBSTTokenValidator" />
</util:list>
-
+
<bean id="transportCustomBSTTokenProvider"
class="org.apache.cxf.systest.sts.deployment.CustomBSTTokenProvider">
- </bean>
-
- <bean id="transportSamlTokenProvider"
- class="org.apache.cxf.sts.token.provider.SAMLTokenProvider">
+ </bean>
+
+ <bean id="transportSamlTokenProvider" class="org.apache.cxf.sts.token.provider.SAMLTokenProvider">
<property name="attributeStatementProviders" ref="attributeStatementProvidersList" />
- </bean>
-
- <util:list id="attributeStatementProvidersList">
- <ref bean="defaultAttributeProvider"/>
- <ref bean="customAttributeProvider"/>
+ </bean>
+
+ <util:list id="attributeStatementProvidersList">
+ <ref bean="defaultAttributeProvider" />
+ <ref bean="customAttributeProvider" />
</util:list>
-
- <bean id="defaultAttributeProvider"
+
+ <bean id="defaultAttributeProvider"
class="org.apache.cxf.sts.token.provider.DefaultAttributeStatementProvider">
- </bean>
-
- <bean id="customAttributeProvider"
+ </bean>
+
+ <bean id="customAttributeProvider"
class="org.apache.cxf.systest.sts.deployment.CustomAttributeStatementProvider">
- </bean>
-
- <bean id="claimsManager"
- class="org.apache.cxf.sts.claims.ClaimsManager">
+ </bean>
+
+ <bean id="claimsManager" class="org.apache.cxf.sts.claims.ClaimsManager">
<property name="claimHandlers" ref="claimHandlerList" />
- </bean>
-
- <util:list id="claimHandlerList">
- <ref bean="customClaimsHandler"/>
+ </bean>
+
+ <util:list id="claimHandlerList">
+ <ref bean="customClaimsHandler" />
</util:list>
-
- <bean id="customClaimsHandler"
+
+ <bean id="customClaimsHandler"
class="org.apache.cxf.systest.sts.deployment.CustomClaimsHandler">
- </bean>
-
- <bean id="transportCustomBSTTokenValidator"
+ </bean>
+
+ <bean id="transportCustomBSTTokenValidator"
class="org.apache.cxf.systest.sts.deployment.CustomBSTTokenValidator">
- </bean>
-
- <bean id="transportX509TokenValidator"
- class="org.apache.cxf.sts.token.validator.X509TokenValidator">
- </bean>
-
- <bean id="transportUsernameTokenValidator"
+ </bean>
+
+ <bean id="transportX509TokenValidator" class="org.apache.cxf.sts.token.validator.X509TokenValidator">
+ </bean>
+
+ <bean id="transportUsernameTokenValidator"
class="org.apache.cxf.sts.token.validator.UsernameTokenValidator">
- </bean>
-
- <bean id="transportSamlTokenValidator"
- class="org.apache.cxf.sts.token.validator.SAMLTokenValidator">
- </bean>
-
- <bean id="transportService"
- class="org.apache.cxf.sts.service.StaticService">
- <property name="endpoints" ref="transportEndpoints"/>
- </bean>
-
- <util:list id="transportEndpoints">
- <value>https://localhost:(\d)*/doubleit/services/doubleittransport.*</value>
+ </bean>
+
+ <bean id="transportSamlTokenValidator" class="org.apache.cxf.sts.token.validator.SAMLTokenValidator">
+ </bean>
+
+ <bean id="transportService" class="org.apache.cxf.sts.service.StaticService">
+ <property name="endpoints" ref="transportEndpoints" />
+ </bean>
+
+ <util:list id="transportEndpoints">
+ <value>https://localhost:(\d)*/doubleit/services/doubleittransport.*
+ </value>
</util:list>
-
- <bean id="transportSTSProperties"
- class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
- <property name="signatureUsername" value="mystskey"/>
- <property name="callbackHandlerClass"
- value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
- <property name="issuer" value="DoubleItSTSIssuer"/>
- <property name="encryptionUsername" value="myservicekey"/>
- </bean>
-
- <jaxws:endpoint id="localSTS"
- implementor="#transportSTSProviderBean"
- address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport"
- wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
- xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
- depends-on="ClientAuthHttpsSettings"
- serviceName="ns1:SecurityTokenService"
- endpointName="ns1:Transport_Port">
- </jaxws:endpoint>
-
- <jaxws:endpoint id="localSoap12STS"
- implementor="#transportSTSProviderBean"
- address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/TransportSoap12"
- wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
- xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
- depends-on="ClientAuthHttpsSettings"
- serviceName="ns1:SecurityTokenService"
- endpointName="ns1:Transport_Soap12_Port">
- </jaxws:endpoint>
-
- <bean id="kerberosValidator"
- class="org.apache.ws.security.validate.KerberosTokenValidator">
- <property name="jaasLoginModuleName" value="bob"/>
- <property name="serviceName" value="bob@service.ws.apache.org"/>
- </bean>
-
- <jaxws:endpoint id="localKerberosSTS"
- implementor="#transportSTSProviderBean"
- address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Kerberos"
- wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
- xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
- depends-on="ClientAuthHttpsSettings"
- serviceName="ns1:SecurityTokenService"
- endpointName="ns1:Transport_Kerberos_Port">
- <jaxws:properties>
- <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
- </jaxws:properties>
- </jaxws:endpoint>
-
- <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf">
- <httpj:engine port="${testutil.ports.STSServer}">
- <httpj:tlsServerParameters>
- <sec:trustManagers>
- <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
- </sec:trustManagers>
- <sec:keyManagers keyPassword="stskpass">
- <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
- </sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_DES_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- <sec:include>.*_WITH_NULL_.*</sec:include>
- <sec:exclude>.*_DH_anon_.*</sec:exclude>
- </sec:cipherSuitesFilter>
- <sec:clientAuthentication want="true" required="true"/>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
+
+ <bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
+ <property name="signaturePropertiesFile" value="stsKeystore.properties" />
+ <property name="signatureUsername" value="mystskey" />
+ <property name="callbackHandlerClass"
+ value="org.apache.cxf.systest.sts.common.CommonCallbackHandler" />
+ <property name="encryptionPropertiesFile" value="stsKeystore.properties" />
+ <property name="issuer" value="DoubleItSTSIssuer" />
+ <property name="encryptionUsername" value="myservicekey" />
+ </bean>
+
+ <jaxws:endpoint id="localSTS" implementor="#transportSTSProviderBean"
+ address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport"
+ wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
+ xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
+ depends-on="ClientAuthHttpsSettings" serviceName="ns1:SecurityTokenService"
+ endpointName="ns1:Transport_Port">
+ </jaxws:endpoint>
+
+ <jaxws:endpoint id="localSoap12STS" implementor="#transportSTSProviderBean"
+ address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/TransportSoap12"
+ wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
+ xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
+ depends-on="ClientAuthHttpsSettings" serviceName="ns1:SecurityTokenService"
+ endpointName="ns1:Transport_Soap12_Port">
+ </jaxws:endpoint>
+
+ <bean id="kerberosValidator" class="org.apache.ws.security.validate.KerberosTokenValidator">
+ <property name="jaasLoginModuleName" value="bob" />
+ <property name="serviceName" value="bob@service.ws.apache.org" />
+ </bean>
+
+ <jaxws:endpoint id="localKerberosSTS" implementor="#transportSTSProviderBean"
+ address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Kerberos"
+ wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
+ xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
+ depends-on="ClientAuthHttpsSettings" serviceName="ns1:SecurityTokenService"
+ endpointName="ns1:Transport_Kerberos_Port">
+ <jaxws:properties>
+ <entry key="ws-security.bst.validator" value-ref="kerberosValidator" />
+ </jaxws:properties>
+ </jaxws:endpoint>
+
+ <httpj:engine-factory id="ClientAuthHttpsSettings"
+ bus="cxf">
+ <httpj:engine port="${testutil.ports.STSServer}">
+ <httpj:tlsServerParameters>
+ <sec:trustManagers>
+ <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks" />
+ </sec:trustManagers>
+ <sec:keyManagers keyPassword="stskpass">
+ <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks" />
+ </sec:keyManagers>
+ <sec:cipherSuitesFilter>
+ <sec:include>.*_EXPORT_.*</sec:include>
+ <sec:include>.*_EXPORT1024_.*</sec:include>
+ <sec:include>.*_WITH_DES_.*</sec:include>
+ <sec:include>.*_WITH_AES_.*</sec:include>
+ <sec:include>.*_WITH_NULL_.*</sec:include>
+ <sec:exclude>.*_DH_anon_.*</sec:exclude>
+ </sec:cipherSuitesFilter>
+ <sec:clientAuthentication want="true"
+ required="true" />
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
</beans>
Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml?rev=1204574&r1=1204573&r2=1204574&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml Mon Nov 21 16:25:08 2011
@@ -48,162 +48,152 @@
</cxf:features>
</cxf:bus>
- <bean id="transportSTSProviderBean"
+ <bean id="transportSTSProviderBean"
class="org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider">
- <property name="issueOperation" ref="transportIssueDelegate"/>
- <property name="validateOperation" ref="transportValidateDelegate"/>
- </bean>
-
- <bean id="transportIssueDelegate"
- class="org.apache.cxf.sts.operation.TokenIssueOperation">
- <property name="tokenProviders" ref="transportTokenProviders"/>
- <property name="services" ref="transportService"/>
- <property name="stsProperties" ref="transportSTSProperties"/>
- <property name="claimsManager" ref="claimsManager"/>
- <property name="tokenStore" ref="defaultTokenStore"/>
- </bean>
-
- <bean id="transportValidateDelegate"
- class="org.apache.cxf.sts.operation.TokenValidateOperation">
- <property name="tokenProviders" ref="transportTokenProviders"/>
- <property name="tokenValidators" ref="transportTokenValidators"/>
- <property name="stsProperties" ref="transportSTSProperties"/>
- <property name="tokenStore" ref="defaultTokenStore"/>
- </bean>
-
- <bean id="defaultTokenStore"
- class="org.apache.cxf.sts.cache.HazelCastTokenStore">
- <constructor-arg value="default" />
- </bean>
-
+ <property name="issueOperation" ref="transportIssueDelegate" />
+ <property name="validateOperation" ref="transportValidateDelegate" />
+ </bean>
+
+ <bean id="transportIssueDelegate" class="org.apache.cxf.sts.operation.TokenIssueOperation">
+ <property name="tokenProviders" ref="transportTokenProviders" />
+ <property name="services" ref="transportService" />
+ <property name="stsProperties" ref="transportSTSProperties" />
+ <property name="claimsManager" ref="claimsManager" />
+ <property name="tokenStore" ref="defaultTokenStore" />
+ </bean>
+
+ <bean id="transportValidateDelegate" class="org.apache.cxf.sts.operation.TokenValidateOperation">
+ <property name="tokenProviders" ref="transportTokenProviders" />
+ <property name="tokenValidators" ref="transportTokenValidators" />
+ <property name="stsProperties" ref="transportSTSProperties" />
+ <property name="tokenStore" ref="defaultTokenStore" />
+ </bean>
+
+ <bean id="defaultTokenStore" class="org.apache.cxf.sts.cache.HazelCastTokenStore">
+ <constructor-arg value="default" />
+ </bean>
+
<util:list id="transportTokenProviders">
- <ref bean="transportSamlTokenProvider"/>
- <ref bean="transportCustomBSTTokenProvider"/>
- <ref bean="transportSCTProvider"/>
- <ref bean="transportUTProvider"/>
+ <ref bean="transportSamlTokenProvider" />
+ <ref bean="transportCustomBSTTokenProvider" />
+ <ref bean="transportSCTProvider" />
+ <ref bean="transportUTProvider" />
</util:list>
-
+
<util:list id="transportTokenValidators">
- <ref bean="transportSamlTokenValidator"/>
- <ref bean="transportX509TokenValidator"/>
- <ref bean="transportUsernameTokenValidator"/>
- <ref bean="transportCustomBSTTokenValidator"/>
- <ref bean="transportSCTValidator"/>
+ <ref bean="transportSamlTokenValidator" />
+ <ref bean="transportX509TokenValidator" />
+ <ref bean="transportUsernameTokenValidator" />
+ <ref bean="transportCustomBSTTokenValidator" />
+ <ref bean="transportSCTValidator" />
</util:list>
-
+
<bean id="transportCustomBSTTokenProvider"
class="org.apache.cxf.systest.sts.deployment.CustomBSTTokenProvider">
- </bean>
-
- <bean id="transportUTProvider"
- class="org.apache.cxf.systest.sts.distributed_caching.CustomUsernameTokenProvider"/>
-
- <bean id="transportSamlTokenProvider"
- class="org.apache.cxf.sts.token.provider.SAMLTokenProvider">
+ </bean>
+
+ <bean id="transportUTProvider"
+ class="org.apache.cxf.systest.sts.distributed_caching.CustomUsernameTokenProvider" />
+
+ <bean id="transportSamlTokenProvider" class="org.apache.cxf.sts.token.provider.SAMLTokenProvider">
<property name="attributeStatementProviders" ref="attributeStatementProvidersList" />
- </bean>
-
- <bean id="transportSCTProvider"
- class="org.apache.cxf.sts.token.provider.SCTProvider">
- </bean>
-
- <util:list id="attributeStatementProvidersList">
- <ref bean="defaultAttributeProvider"/>
- <ref bean="customAttributeProvider"/>
+ </bean>
+
+ <bean id="transportSCTProvider" class="org.apache.cxf.sts.token.provider.SCTProvider">
+ </bean>
+
+ <util:list id="attributeStatementProvidersList">
+ <ref bean="defaultAttributeProvider" />
+ <ref bean="customAttributeProvider" />
</util:list>
-
- <bean id="defaultAttributeProvider"
+
+ <bean id="defaultAttributeProvider"
class="org.apache.cxf.sts.token.provider.DefaultAttributeStatementProvider">
- </bean>
-
- <bean id="customAttributeProvider"
+ </bean>
+
+ <bean id="customAttributeProvider"
class="org.apache.cxf.systest.sts.deployment.CustomAttributeStatementProvider">
- </bean>
-
- <bean id="claimsManager"
- class="org.apache.cxf.sts.claims.ClaimsManager">
+ </bean>
+
+ <bean id="claimsManager" class="org.apache.cxf.sts.claims.ClaimsManager">
<property name="claimHandlers" ref="claimHandlerList" />
- </bean>
-
- <util:list id="claimHandlerList">
- <ref bean="customClaimsHandler"/>
+ </bean>
+
+ <util:list id="claimHandlerList">
+ <ref bean="customClaimsHandler" />
</util:list>
-
- <bean id="customClaimsHandler"
+
+ <bean id="customClaimsHandler"
class="org.apache.cxf.systest.sts.deployment.CustomClaimsHandler">
- </bean>
-
- <bean id="transportCustomBSTTokenValidator"
+ </bean>
+
+ <bean id="transportCustomBSTTokenValidator"
class="org.apache.cxf.systest.sts.deployment.CustomBSTTokenValidator">
- </bean>
-
- <bean id="transportX509TokenValidator"
- class="org.apache.cxf.sts.token.validator.X509TokenValidator">
- </bean>
-
- <bean id="transportUsernameTokenValidator"
+ </bean>
+
+ <bean id="transportX509TokenValidator" class="org.apache.cxf.sts.token.validator.X509TokenValidator">
+ </bean>
+
+ <bean id="transportUsernameTokenValidator"
class="org.apache.cxf.sts.token.validator.UsernameTokenValidator">
- </bean>
-
- <bean id="transportSamlTokenValidator"
- class="org.apache.cxf.sts.token.validator.SAMLTokenValidator">
- </bean>
-
- <bean id="transportSCTValidator"
- class="org.apache.cxf.sts.token.validator.SCTValidator">
- </bean>
-
- <bean id="transportService"
- class="org.apache.cxf.sts.service.StaticService">
- <property name="endpoints" ref="transportEndpoints"/>
- </bean>
-
- <util:list id="transportEndpoints">
- <value>https://localhost:(\d)*/doubleit/services/doubleittransport.*</value>
+ </bean>
+
+ <bean id="transportSamlTokenValidator" class="org.apache.cxf.sts.token.validator.SAMLTokenValidator">
+ </bean>
+
+ <bean id="transportSCTValidator" class="org.apache.cxf.sts.token.validator.SCTValidator">
+ </bean>
+
+ <bean id="transportService" class="org.apache.cxf.sts.service.StaticService">
+ <property name="endpoints" ref="transportEndpoints" />
+ </bean>
+
+ <util:list id="transportEndpoints">
+ <value>https://localhost:(\d)*/doubleit/services/doubleittransport.*
+ </value>
</util:list>
-
- <bean id="transportSTSProperties"
- class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
- <property name="signatureUsername" value="mystskey"/>
- <property name="callbackHandlerClass"
- value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
- <property name="issuer" value="Issuer-A"/>
- <property name="encryptionUsername" value="myservicekey"/>
- </bean>
-
- <jaxws:endpoint id="STS1"
- implementor="#transportSTSProviderBean"
- address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport"
- wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
- xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
- depends-on="ClientAuthHttpsSettings"
- serviceName="ns1:SecurityTokenService"
- endpointName="ns1:Transport_Port">
- </jaxws:endpoint>
-
- <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf">
- <httpj:engine port="${testutil.ports.STSServer}">
- <httpj:tlsServerParameters>
- <sec:trustManagers>
- <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
- </sec:trustManagers>
- <sec:keyManagers keyPassword="stskpass">
- <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
- </sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_DES_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- <sec:include>.*_WITH_NULL_.*</sec:include>
- <sec:exclude>.*_DH_anon_.*</sec:exclude>
- </sec:cipherSuitesFilter>
- <sec:clientAuthentication want="true" required="true"/>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
+
+ <bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
+ <property name="signaturePropertiesFile" value="stsKeystore.properties" />
+ <property name="signatureUsername" value="mystskey" />
+ <property name="callbackHandlerClass"
+ value="org.apache.cxf.systest.sts.common.CommonCallbackHandler" />
+ <property name="encryptionPropertiesFile" value="stsKeystore.properties" />
+ <property name="issuer" value="Issuer-A" />
+ <property name="encryptionUsername" value="myservicekey" />
+ </bean>
+
+ <jaxws:endpoint id="STS1" implementor="#transportSTSProviderBean"
+ address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport"
+ wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
+ xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
+ depends-on="ClientAuthHttpsSettings" serviceName="ns1:SecurityTokenService"
+ endpointName="ns1:Transport_Port">
+ </jaxws:endpoint>
+
+ <httpj:engine-factory id="ClientAuthHttpsSettings"
+ bus="cxf">
+ <httpj:engine port="${testutil.ports.STSServer}">
+ <httpj:tlsServerParameters>
+ <sec:trustManagers>
+ <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks" />
+ </sec:trustManagers>
+ <sec:keyManagers keyPassword="stskpass">
+ <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks" />
+ </sec:keyManagers>
+ <sec:cipherSuitesFilter>
+ <sec:include>.*_EXPORT_.*</sec:include>
+ <sec:include>.*_EXPORT1024_.*</sec:include>
+ <sec:include>.*_WITH_DES_.*</sec:include>
+ <sec:include>.*_WITH_AES_.*</sec:include>
+ <sec:include>.*_WITH_NULL_.*</sec:include>
+ <sec:exclude>.*_DH_anon_.*</sec:exclude>
+ </sec:cipherSuitesFilter>
+ <sec:clientAuthentication want="true"
+ required="true" />
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
</beans>
Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-2.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-2.xml?rev=1204574&r1=1204573&r2=1204574&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-2.xml (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-2.xml Mon Nov 21 16:25:08 2011
@@ -48,152 +48,142 @@
</cxf:features>
</cxf:bus>
- <bean id="transportSTSProviderBean"
+ <bean id="transportSTSProviderBean"
class="org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider">
- <property name="issueOperation" ref="transportIssueDelegate"/>
- <property name="validateOperation" ref="transportValidateDelegate"/>
- </bean>
-
- <bean id="transportIssueDelegate"
- class="org.apache.cxf.sts.operation.TokenIssueOperation">
- <property name="tokenProviders" ref="transportTokenProviders"/>
- <property name="services" ref="transportService"/>
- <property name="stsProperties" ref="transportSTSProperties"/>
- <property name="claimsManager" ref="claimsManager"/>
- <!--<property name="cache" ref="defaultCache"/>-->
- </bean>
-
- <bean id="transportValidateDelegate"
- class="org.apache.cxf.sts.operation.TokenValidateOperation">
- <property name="tokenProviders" ref="transportTokenProviders"/>
- <property name="tokenValidators" ref="transportTokenValidators"/>
- <property name="stsProperties" ref="transportSTSProperties"/>
- <property name="tokenStore" ref="defaultTokenStore"/>
- </bean>
-
- <bean id="defaultTokenStore"
- class="org.apache.cxf.sts.cache.HazelCastTokenStore">
- <constructor-arg value="default" />
- </bean>
-
+ <property name="issueOperation" ref="transportIssueDelegate" />
+ <property name="validateOperation" ref="transportValidateDelegate" />
+ </bean>
+
+ <bean id="transportIssueDelegate" class="org.apache.cxf.sts.operation.TokenIssueOperation">
+ <property name="tokenProviders" ref="transportTokenProviders" />
+ <property name="services" ref="transportService" />
+ <property name="stsProperties" ref="transportSTSProperties" />
+ <property name="claimsManager" ref="claimsManager" />
+ <!--<property name="cache" ref="defaultCache"/> -->
+ </bean>
+
+ <bean id="transportValidateDelegate" class="org.apache.cxf.sts.operation.TokenValidateOperation">
+ <property name="tokenProviders" ref="transportTokenProviders" />
+ <property name="tokenValidators" ref="transportTokenValidators" />
+ <property name="stsProperties" ref="transportSTSProperties" />
+ <property name="tokenStore" ref="defaultTokenStore" />
+ </bean>
+
+ <bean id="defaultTokenStore" class="org.apache.cxf.sts.cache.HazelCastTokenStore">
+ <constructor-arg value="default" />
+ </bean>
+
<util:list id="transportTokenProviders">
- <ref bean="transportSamlTokenProvider"/>
- <ref bean="transportCustomBSTTokenProvider"/>
- <ref bean="transportSCTProvider"/>
+ <ref bean="transportSamlTokenProvider" />
+ <ref bean="transportCustomBSTTokenProvider" />
+ <ref bean="transportSCTProvider" />
</util:list>
-
+
<util:list id="transportTokenValidators">
- <ref bean="transportSamlTokenValidator"/>
- <ref bean="transportX509TokenValidator"/>
- <ref bean="transportUsernameTokenValidator"/>
- <ref bean="transportCustomBSTTokenValidator"/>
- <ref bean="transportSCTValidator"/>
+ <ref bean="transportSamlTokenValidator" />
+ <ref bean="transportX509TokenValidator" />
+ <ref bean="transportUsernameTokenValidator" />
+ <ref bean="transportCustomBSTTokenValidator" />
+ <ref bean="transportSCTValidator" />
</util:list>
-
+
<bean id="transportCustomBSTTokenProvider"
class="org.apache.cxf.systest.sts.deployment.CustomBSTTokenProvider">
- </bean>
-
- <bean id="transportSamlTokenProvider"
- class="org.apache.cxf.sts.token.provider.SAMLTokenProvider">
+ </bean>
+
+ <bean id="transportSamlTokenProvider" class="org.apache.cxf.sts.token.provider.SAMLTokenProvider">
<property name="attributeStatementProviders" ref="attributeStatementProvidersList" />
- </bean>
-
- <bean id="transportSCTProvider"
- class="org.apache.cxf.sts.token.provider.SCTProvider">
- </bean>
-
- <util:list id="attributeStatementProvidersList">
- <ref bean="defaultAttributeProvider"/>
- <ref bean="customAttributeProvider"/>
+ </bean>
+
+ <bean id="transportSCTProvider" class="org.apache.cxf.sts.token.provider.SCTProvider">
+ </bean>
+
+ <util:list id="attributeStatementProvidersList">
+ <ref bean="defaultAttributeProvider" />
+ <ref bean="customAttributeProvider" />
</util:list>
-
- <bean id="defaultAttributeProvider"
+
+ <bean id="defaultAttributeProvider"
class="org.apache.cxf.sts.token.provider.DefaultAttributeStatementProvider">
- </bean>
-
- <bean id="customAttributeProvider"
+ </bean>
+
+ <bean id="customAttributeProvider"
class="org.apache.cxf.systest.sts.deployment.CustomAttributeStatementProvider">
- </bean>
-
- <bean id="claimsManager"
- class="org.apache.cxf.sts.claims.ClaimsManager">
+ </bean>
+
+ <bean id="claimsManager" class="org.apache.cxf.sts.claims.ClaimsManager">
<property name="claimHandlers" ref="claimHandlerList" />
- </bean>
-
- <util:list id="claimHandlerList">
- <ref bean="customClaimsHandler"/>
+ </bean>
+
+ <util:list id="claimHandlerList">
+ <ref bean="customClaimsHandler" />
</util:list>
-
- <bean id="customClaimsHandler"
+
+ <bean id="customClaimsHandler"
class="org.apache.cxf.systest.sts.deployment.CustomClaimsHandler">
- </bean>
-
- <bean id="transportCustomBSTTokenValidator"
+ </bean>
+
+ <bean id="transportCustomBSTTokenValidator"
class="org.apache.cxf.systest.sts.deployment.CustomBSTTokenValidator">
- </bean>
-
- <bean id="transportX509TokenValidator"
- class="org.apache.cxf.sts.token.validator.X509TokenValidator">
- </bean>
-
- <bean id="transportUsernameTokenValidator"
+ </bean>
+
+ <bean id="transportX509TokenValidator" class="org.apache.cxf.sts.token.validator.X509TokenValidator">
+ </bean>
+
+ <bean id="transportUsernameTokenValidator"
class="org.apache.cxf.sts.token.validator.UsernameTokenValidator">
- </bean>
-
- <bean id="transportSamlTokenValidator"
- class="org.apache.cxf.sts.token.validator.SAMLTokenValidator">
- </bean>
-
- <bean id="transportSCTValidator"
- class="org.apache.cxf.sts.token.validator.SCTValidator">
- </bean>
-
- <bean id="transportService"
- class="org.apache.cxf.sts.service.StaticService">
- <property name="endpoints" ref="transportEndpoints"/>
- </bean>
-
- <util:list id="transportEndpoints">
- <value>https://localhost:(\d)*/doubleit/services/doubleittransport.*</value>
+ </bean>
+
+ <bean id="transportSamlTokenValidator" class="org.apache.cxf.sts.token.validator.SAMLTokenValidator">
+ </bean>
+
+ <bean id="transportSCTValidator" class="org.apache.cxf.sts.token.validator.SCTValidator">
+ </bean>
+
+ <bean id="transportService" class="org.apache.cxf.sts.service.StaticService">
+ <property name="endpoints" ref="transportEndpoints" />
+ </bean>
+
+ <util:list id="transportEndpoints">
+ <value>https://localhost:(\d)*/doubleit/services/doubleittransport.*
+ </value>
</util:list>
-
- <bean id="transportSTSProperties"
- class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="issuer" value="Issuer-B"/>
- </bean>
-
- <jaxws:endpoint id="STS2"
- implementor="#transportSTSProviderBean"
- address="https://localhost:${testutil.ports.STSServer.2}/SecurityTokenService/Transport"
- wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
- xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
- depends-on="ClientAuthHttpsSettings"
- serviceName="ns1:SecurityTokenService"
- endpointName="ns1:Transport_Port">
- </jaxws:endpoint>
-
- <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf">
- <httpj:engine port="${testutil.ports.STSServer.2}">
- <httpj:tlsServerParameters>
- <sec:trustManagers>
- <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
- </sec:trustManagers>
- <sec:keyManagers keyPassword="stskpass">
- <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
- </sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_DES_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- <sec:include>.*_WITH_NULL_.*</sec:include>
- <sec:exclude>.*_DH_anon_.*</sec:exclude>
- </sec:cipherSuitesFilter>
- <sec:clientAuthentication want="true" required="true"/>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
+
+ <bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
+ <property name="issuer" value="Issuer-B" />
+ </bean>
+
+ <jaxws:endpoint id="STS2" implementor="#transportSTSProviderBean"
+ address="https://localhost:${testutil.ports.STSServer.2}/SecurityTokenService/Transport"
+ wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
+ xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
+ depends-on="ClientAuthHttpsSettings" serviceName="ns1:SecurityTokenService"
+ endpointName="ns1:Transport_Port">
+ </jaxws:endpoint>
+
+ <httpj:engine-factory id="ClientAuthHttpsSettings"
+ bus="cxf">
+ <httpj:engine port="${testutil.ports.STSServer.2}">
+ <httpj:tlsServerParameters>
+ <sec:trustManagers>
+ <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks" />
+ </sec:trustManagers>
+ <sec:keyManagers keyPassword="stskpass">
+ <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks" />
+ </sec:keyManagers>
+ <sec:cipherSuitesFilter>
+ <sec:include>.*_EXPORT_.*</sec:include>
+ <sec:include>.*_EXPORT1024_.*</sec:include>
+ <sec:include>.*_WITH_DES_.*</sec:include>
+ <sec:include>.*_WITH_AES_.*</sec:include>
+ <sec:include>.*_WITH_NULL_.*</sec:include>
+ <sec:exclude>.*_DH_anon_.*</sec:exclude>
+ </sec:cipherSuitesFilter>
+ <sec:clientAuthentication want="true"
+ required="true" />
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
</beans>
Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml?rev=1204574&r1=1204573&r2=1204574&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml Mon Nov 21 16:25:08 2011
@@ -48,144 +48,134 @@
</cxf:features>
</cxf:bus>
- <bean id="transportSTSProviderBean"
+ <bean id="transportSTSProviderBean"
class="org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider">
- <property name="issueOperation" ref="transportIssueDelegate"/>
- <property name="validateOperation" ref="transportValidateDelegate"/>
- </bean>
-
- <bean id="transportIssueDelegate"
- class="org.apache.cxf.sts.operation.TokenIssueOperation">
- <property name="tokenProviders" ref="transportTokenProviders"/>
- <property name="services" ref="transportService"/>
- <property name="stsProperties" ref="transportSTSProperties"/>
- </bean>
-
- <bean id="transportValidateDelegate"
- class="org.apache.cxf.sts.operation.TokenValidateOperation">
- <property name="tokenProviders" ref="transportTokenProviders"/>
- <property name="tokenValidators" ref="transportTokenValidators"/>
- <property name="stsProperties" ref="transportSTSProperties"/>
+ <property name="issueOperation" ref="transportIssueDelegate" />
+ <property name="validateOperation" ref="transportValidateDelegate" />
</bean>
-
+
+ <bean id="transportIssueDelegate" class="org.apache.cxf.sts.operation.TokenIssueOperation">
+ <property name="tokenProviders" ref="transportTokenProviders" />
+ <property name="services" ref="transportService" />
+ <property name="stsProperties" ref="transportSTSProperties" />
+ </bean>
+
+ <bean id="transportValidateDelegate" class="org.apache.cxf.sts.operation.TokenValidateOperation">
+ <property name="tokenProviders" ref="transportTokenProviders" />
+ <property name="tokenValidators" ref="transportTokenValidators" />
+ <property name="stsProperties" ref="transportSTSProperties" />
+ </bean>
+
<util:list id="transportTokenProviders">
- <ref bean="transportSAMLProvider"/>
+ <ref bean="transportSAMLProvider" />
</util:list>
-
+
<util:list id="transportTokenValidators">
- <ref bean="transportSAMLValidator"/>
+ <ref bean="transportSAMLValidator" />
</util:list>
-
- <bean id="realmA"
- class="org.apache.cxf.sts.token.realm.SAMLRealm">
- <property name="issuer" value="A-Issuer"/>
- <property name="signatureAlias" value="myclientkey"/>
- </bean>
-
- <bean id="realmC"
- class="org.apache.cxf.sts.token.realm.SAMLRealm">
- <property name="issuer" value="C-Issuer"/>
- <property name="signatureAlias" value="myservicekey"/>
- </bean>
-
+
+ <bean id="realmA" class="org.apache.cxf.sts.token.realm.SAMLRealm">
+ <property name="issuer" value="A-Issuer" />
+ <property name="signatureAlias" value="myclientkey" />
+ </bean>
+
+ <bean id="realmC" class="org.apache.cxf.sts.token.realm.SAMLRealm">
+ <property name="issuer" value="C-Issuer" />
+ <property name="signatureAlias" value="myservicekey" />
+ </bean>
+
<util:map id="realms">
- <entry key="A" value-ref="realmA"/>
- <entry key="C" value-ref="realmC"/>
- </util:map>
-
- <bean id="transportSAMLProvider"
- class="org.apache.cxf.sts.token.provider.SAMLTokenProvider">
- <property name="realmMap" ref="realms"/>
- </bean>
-
- <bean id="transportSAMLValidator"
- class="org.apache.cxf.sts.token.validator.SAMLTokenValidator">
- </bean>
-
- <bean id="transportService"
- class="org.apache.cxf.sts.service.StaticService">
- <property name="endpoints" ref="transportEndpoints"/>
- </bean>
-
- <util:list id="transportEndpoints">
- <value>https://localhost:(\d)*/doubleit/services/doubleitrealm.*</value>
+ <entry key="A" value-ref="realmA" />
+ <entry key="C" value-ref="realmC" />
+ </util:map>
+
+ <bean id="transportSAMLProvider" class="org.apache.cxf.sts.token.provider.SAMLTokenProvider">
+ <property name="realmMap" ref="realms" />
+ </bean>
+
+ <bean id="transportSAMLValidator" class="org.apache.cxf.sts.token.validator.SAMLTokenValidator">
+ </bean>
+
+ <bean id="transportService" class="org.apache.cxf.sts.service.StaticService">
+ <property name="endpoints" ref="transportEndpoints" />
+ </bean>
+
+ <util:list id="transportEndpoints">
+ <value>https://localhost:(\d)*/doubleit/services/doubleitrealm.*
+ </value>
</util:list>
-
- <bean id="customRealmParser" class="org.apache.cxf.systest.sts.realms.URLRealmParser"/>
-
- <bean id="transportSTSProperties"
- class="org.apache.cxf.sts.StaticSTSProperties">
- <property name="signaturePropertiesFile" value="org/apache/cxf/systest/sts/realms/stsKeystoreRealms.properties"/>
- <property name="signatureUsername" value="mystskey"/>
- <property name="callbackHandlerClass"
- value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- <property name="realmParser" ref="customRealmParser"/>
- <property name="issuer" value="saml1-issuer"/>
- </bean>
-
- <jaxws:endpoint id="RealmASTS"
- implementor="#transportSTSProviderBean"
- address="https://localhost:${testutil.ports.STSServer.2}/SecurityTokenService/realmA"
- wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
- xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
- depends-on="ClientAuthHttpsSettings"
- serviceName="ns1:SecurityTokenService"
- endpointName="ns1:Transport_Port">
- <jaxws:properties>
- <entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- </jaxws:properties>
- </jaxws:endpoint>
-
- <jaxws:endpoint id="DefaultRealmSTS"
- implementor="#transportSTSProviderBean"
- address="https://localhost:${testutil.ports.STSServer.2}/SecurityTokenService/realmdefault"
- wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
- xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
- depends-on="ClientAuthHttpsSettings"
- serviceName="ns1:SecurityTokenService"
- endpointName="ns1:Transport_Port">
- <jaxws:properties>
- <entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- </jaxws:properties>
- </jaxws:endpoint>
-
- <jaxws:endpoint id="RealmCSTS"
- implementor="#transportSTSProviderBean"
- address="https://localhost:${testutil.ports.STSServer.2}/SecurityTokenService/realmC"
- wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
- xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
- depends-on="ClientAuthHttpsSettings"
- serviceName="ns1:SecurityTokenService"
- endpointName="ns1:Transport_Port">
- <jaxws:properties>
- <entry key="ws-security.callback-handler"
- value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
- </jaxws:properties>
- </jaxws:endpoint>
-
- <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf">
- <httpj:engine port="${testutil.ports.STSServer.2}">
- <httpj:tlsServerParameters>
- <sec:trustManagers>
- <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
- </sec:trustManagers>
- <sec:keyManagers keyPassword="stskpass">
- <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
- </sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_DES_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- <sec:include>.*_WITH_NULL_.*</sec:include>
- <sec:exclude>.*_DH_anon_.*</sec:exclude>
- </sec:cipherSuitesFilter>
- <sec:clientAuthentication want="true" required="true"/>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
+
+ <bean id="customRealmParser" class="org.apache.cxf.systest.sts.realms.URLRealmParser" />
+
+ <bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
+ <property name="signaturePropertiesFile"
+ value="org/apache/cxf/systest/sts/realms/stsKeystoreRealms.properties" />
+ <property name="signatureUsername" value="mystskey" />
+ <property name="callbackHandlerClass"
+ value="org.apache.cxf.systest.sts.common.CommonCallbackHandler" />
+ <property name="realmParser" ref="customRealmParser" />
+ <property name="issuer" value="saml1-issuer" />
+ </bean>
+
+ <jaxws:endpoint id="RealmASTS" implementor="#transportSTSProviderBean"
+ address="https://localhost:${testutil.ports.STSServer.2}/SecurityTokenService/realmA"
+ wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
+ xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
+ depends-on="ClientAuthHttpsSettings" serviceName="ns1:SecurityTokenService"
+ endpointName="ns1:Transport_Port">
+ <jaxws:properties>
+ <entry key="ws-security.callback-handler"
+ value="org.apache.cxf.systest.sts.common.CommonCallbackHandler" />
+ </jaxws:properties>
+ </jaxws:endpoint>
+
+ <jaxws:endpoint id="DefaultRealmSTS" implementor="#transportSTSProviderBean"
+ address="https://localhost:${testutil.ports.STSServer.2}/SecurityTokenService/realmdefault"
+ wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
+ xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
+ depends-on="ClientAuthHttpsSettings" serviceName="ns1:SecurityTokenService"
+ endpointName="ns1:Transport_Port">
+ <jaxws:properties>
+ <entry key="ws-security.callback-handler"
+ value="org.apache.cxf.systest.sts.common.CommonCallbackHandler" />
+ </jaxws:properties>
+ </jaxws:endpoint>
+
+ <jaxws:endpoint id="RealmCSTS" implementor="#transportSTSProviderBean"
+ address="https://localhost:${testutil.ports.STSServer.2}/SecurityTokenService/realmC"
+ wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
+ xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
+ depends-on="ClientAuthHttpsSettings" serviceName="ns1:SecurityTokenService"
+ endpointName="ns1:Transport_Port">
+ <jaxws:properties>
+ <entry key="ws-security.callback-handler"
+ value="org.apache.cxf.systest.sts.common.CommonCallbackHandler" />
+ </jaxws:properties>
+ </jaxws:endpoint>
+
+ <httpj:engine-factory id="ClientAuthHttpsSettings"
+ bus="cxf">
+ <httpj:engine port="${testutil.ports.STSServer.2}">
+ <httpj:tlsServerParameters>
+ <sec:trustManagers>
+ <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks" />
+ </sec:trustManagers>
+ <sec:keyManagers keyPassword="stskpass">
+ <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks" />
+ </sec:keyManagers>
+ <sec:cipherSuitesFilter>
+ <sec:include>.*_EXPORT_.*</sec:include>
+ <sec:include>.*_EXPORT1024_.*</sec:include>
+ <sec:include>.*_WITH_DES_.*</sec:include>
+ <sec:include>.*_WITH_AES_.*</sec:include>
+ <sec:include>.*_WITH_NULL_.*</sec:include>
+ <sec:exclude>.*_DH_anon_.*</sec:exclude>
+ </sec:cipherSuitesFilter>
+ <sec:clientAuthentication want="true"
+ required="true" />
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
</beans>