cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1204574 [2/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/...
Date Mon, 21 Nov 2011 16:25:09 GMT
Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.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-saml2.xml (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml Mon Nov 21 16:25:08 2011
@@ -49,119 +49,113 @@
     </cxf:bus>
 
     <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"/>
+	    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" />
 	</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="realmB"
-        class="org.apache.cxf.sts.token.realm.SAMLRealm">
-        <property name="issuer" value="B-Issuer"/>
-    </bean>
-	
+
+	<bean id="realmB" class="org.apache.cxf.sts.token.realm.SAMLRealm">
+		<property name="issuer" value="B-Issuer" />
+	</bean>
+
 	<util:map id="realms">
-        <entry key="B" value-ref="realmB"/>
-    </util:map>
-	
-    <bean id="transportSAMLProvider"
-		class="org.apache.cxf.sts.token.provider.SAMLTokenProvider">
-		<property name="realmMap" ref="realms"/>
-    </bean>
-    
-    <bean id="customSAMLRealmCodec" class="org.apache.cxf.systest.sts.realms.IssuerSAMLRealmCodec"/>
+		<entry key="B" value-ref="realmB" />
+	</util:map>
 
-    <bean id="transportSAMLValidator"
-		class="org.apache.cxf.sts.token.validator.SAMLTokenValidator">
-		<property name="subjectConstraints" ref="subjectConstraintList"/>
-		<property name="samlRealmCodec" ref="customSAMLRealmCodec"/>
-    </bean>
-    
-    <util:list id="subjectConstraintList">
+	<bean id="transportSAMLProvider" class="org.apache.cxf.sts.token.provider.SAMLTokenProvider">
+		<property name="realmMap" ref="realms" />
+	</bean>
+
+	<bean id="customSAMLRealmCodec" class="org.apache.cxf.systest.sts.realms.IssuerSAMLRealmCodec" />
+
+	<bean id="transportSAMLValidator" class="org.apache.cxf.sts.token.validator.SAMLTokenValidator">
+		<property name="subjectConstraints" ref="subjectConstraintList" />
+		<property name="samlRealmCodec" ref="customSAMLRealmCodec" />
+	</bean>
+
+	<util:list id="subjectConstraintList">
 		<value>.*CN=www.client.com.*</value>
 		<value>.*CN=www.sts.com.*</value>
 	</util:list>
-	
-    <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>
+
+	<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="customIdentityMapper" class="org.apache.cxf.systest.sts.realms.CustomIdentityMapper"/>
-	
-    <bean id="customRealmParser" class="org.apache.cxf.systest.sts.realms.URLRealmParser"/>
-	
-	<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="issuer" value="saml2-issuer"/>
-		<property name="identityMapper" ref="customIdentityMapper"/>
-		<property name="realmParser" ref="customRealmParser"/>
-    </bean>
-    
-   <jaxws:endpoint id="RealmBSTS"
-        implementor="#transportSTSProviderBean"
-        address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/realmB" 
-        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}">
-      <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="customIdentityMapper" class="org.apache.cxf.systest.sts.realms.CustomIdentityMapper" />
+
+	<bean id="customRealmParser" class="org.apache.cxf.systest.sts.realms.URLRealmParser" />
+
+	<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="issuer" value="saml2-issuer" />
+		<property name="identityMapper" ref="customIdentityMapper" />
+		<property name="realmParser" ref="customRealmParser" />
+	</bean>
+
+	<jaxws:endpoint id="RealmBSTS" implementor="#transportSTSProviderBean"
+		address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/realmB"
+		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}">
+			<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/secure_conv/cxf-sts.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/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/secure_conv/cxf-sts.xml (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml Mon Nov 21 16:25:08 2011
@@ -49,195 +49,183 @@
     </cxf:bus>
 
     <bean id="transportSTSProviderBean"
-		class="org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider">
-		<property name="issueOperation" ref="transportIssueDelegate"/>
-		<property name="validateOperation" ref="transportValidateDelegate"/>
-		<property name="cancelOperation" ref="transportCancelDelegate"/>
-	</bean>	
-	
-	<bean id="transportSTSEncryptedProviderBean"
-        class="org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider">
-        <property name="issueOperation" ref="transportEncryptedIssueDelegate"/>
-        <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="tokenStore" ref="defaultTokenStore"/>
-	</bean>
-	
-	<bean id="transportEncryptedIssueDelegate"
-        class="org.apache.cxf.sts.operation.TokenIssueOperation">
-        <property name="tokenProviders" ref="transportTokenProviders"/>
-        <property name="services" ref="transportService"/>
-        <property name="stsProperties" ref="transportSTSProperties"/>
-        <property name="encryptIssuedToken" value="true"/>
-        <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="transportCancelDelegate"
-        class="org.apache.cxf.sts.operation.TokenCancelOperation">
-        <property name="tokenCancellers" ref="transportTokenCancellers"/>
-        <property name="stsProperties" ref="transportSTSProperties"/>
-        <property name="tokenStore" ref="defaultTokenStore"/>
-    </bean>
-	
-	<bean id="defaultTokenStore"
-        class="org.apache.cxf.sts.cache.DefaultInMemoryTokenStore">
+	    class="org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider">
+	    <property name="issueOperation" ref="transportIssueDelegate" />
+	    <property name="validateOperation" ref="transportValidateDelegate" />
+	    <property name="cancelOperation" ref="transportCancelDelegate" />
     </bean>
-	
+
+	<bean id="transportSTSEncryptedProviderBean"
+		class="org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider">
+		<property name="issueOperation" ref="transportEncryptedIssueDelegate" />
+		<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="tokenStore" ref="defaultTokenStore" />
+	</bean>
+
+	<bean id="transportEncryptedIssueDelegate" class="org.apache.cxf.sts.operation.TokenIssueOperation">
+		<property name="tokenProviders" ref="transportTokenProviders" />
+		<property name="services" ref="transportService" />
+		<property name="stsProperties" ref="transportSTSProperties" />
+		<property name="encryptIssuedToken" value="true" />
+		<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="transportCancelDelegate" class="org.apache.cxf.sts.operation.TokenCancelOperation">
+		<property name="tokenCancellers" ref="transportTokenCancellers" />
+		<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="transportSCTProvider"/>
-		<ref bean="transportSCTSamlTokenProvider"/>
+		<ref bean="transportSCTProvider" />
+		<ref bean="transportSCTSamlTokenProvider" />
 	</util:list>
-	
+
 	<util:list id="transportTokenValidators">
-		<ref bean="transportSCTValidator"/>
+		<ref bean="transportSCTValidator" />
 	</util:list>
-	
+
 	<util:list id="transportTokenCancellers">
-        <ref bean="transportSCTCanceller"/>
-    </util:list>
-    
-    <bean id="transportSCTProvider"
-		class="org.apache.cxf.sts.token.provider.SCTProvider">
-    </bean>
+		<ref bean="transportSCTCanceller" />
+	</util:list>
 
-    <bean id="transportSCTSamlTokenProvider"
-        class="org.apache.cxf.systest.sts.secure_conv.SCTSAMLTokenProvider">
-    </bean>
+	<bean id="transportSCTProvider" class="org.apache.cxf.sts.token.provider.SCTProvider">
+	</bean>
 
-    <bean id="transportSCTValidator"
-		class="org.apache.cxf.sts.token.validator.SCTValidator">
-    </bean>
-    
-    <bean id="transportSCTCanceller"
-        class="org.apache.cxf.sts.token.canceller.SCTCanceller">
-    </bean>
-    
-    <bean id="transportService"
-        class="org.apache.cxf.sts.service.StaticService">
-        <property name="endpoints" ref="transportEndpoints"/>
-        <property name="encryptionProperties" ref="encProperties"/>
-    </bean>
-    
-    <util:list id="transportEndpoints">
-		<value>https://localhost:(\d)*/doubleit/services/doubleittransport.*</value>
-		<value>http://localhost:(\d)*/doubleit/services/doubleitsymmetric.*</value>
+	<bean id="transportSCTSamlTokenProvider"
+		class="org.apache.cxf.systest.sts.secure_conv.SCTSAMLTokenProvider">
+	</bean>
+
+	<bean id="transportSCTValidator" class="org.apache.cxf.sts.token.validator.SCTValidator">
+	</bean>
+
+	<bean id="transportSCTCanceller" class="org.apache.cxf.sts.token.canceller.SCTCanceller">
+	</bean>
+
+	<bean id="transportService" class="org.apache.cxf.sts.service.StaticService">
+		<property name="endpoints" ref="transportEndpoints" />
+		<property name="encryptionProperties" ref="encProperties" />
+	</bean>
+
+	<util:list id="transportEndpoints">
+		<value>https://localhost:(\d)*/doubleit/services/doubleittransport.*
+		</value>
+		<value>http://localhost:(\d)*/doubleit/services/doubleitsymmetric.*
+		</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="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="localSCTSTS"
-        implementor="#transportSTSProviderBean"
-        address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/TransportSCT" 
-        wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/secure_conv/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:inInterceptors>
-            <ref bean="sctInterceptor"/>
-        </jaxws:inInterceptors>
-        <jaxws:outInterceptors>
-            <ref bean="sctOutInterceptor"/>
-        </jaxws:outInterceptors>
-         <jaxws:outFaultInterceptors>
-            <ref bean="sctOutInterceptor"/>
-        </jaxws:outFaultInterceptors>
-   </jaxws:endpoint>
-   
-   <jaxws:endpoint id="localSCTEncryptedSTS"
-        implementor="#transportSTSEncryptedProviderBean"
-        address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/TransportSCTEncrypted" 
-        wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/secure_conv/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:inInterceptors>
-            <ref bean="sctInterceptor"/>
-        </jaxws:inInterceptors>
-        <jaxws:outInterceptors>
-            <ref bean="sctOutInterceptor"/>
-        </jaxws:outInterceptors>
-         <jaxws:outFaultInterceptors>
-            <ref bean="sctOutInterceptor"/>
-        </jaxws:outFaultInterceptors>
-   </jaxws:endpoint>
-   
-   <jaxws:endpoint id="localSCTEndorsingSTS"
-        implementor="#transportSTSProviderBean"
-        address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/TransportEndorsing" 
-        wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/secure_conv/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_Endorsing_Port">
-        <jaxws:inInterceptors>
-            <ref bean="sctInterceptor"/>
-        </jaxws:inInterceptors>
-        <jaxws:outInterceptors>
-            <ref bean="sctOutInterceptor"/>
-        </jaxws:outInterceptors>
-         <jaxws:outFaultInterceptors>
-            <ref bean="sctOutInterceptor"/>
-        </jaxws:outFaultInterceptors>
-        <jaxws:properties>
-            <entry key="org.apache.cxf.ws.security.tokenstore.TokenStore">
-                <ref bean="defaultTokenStore"/>
-            </entry>
-        </jaxws:properties>
-   </jaxws:endpoint>
-   
-   <bean id="sctInterceptor" class="org.apache.cxf.sts.interceptor.SCTInInterceptor"/>
-   <bean id="sctOutInterceptor" class="org.apache.cxf.sts.interceptor.SCTOutInterceptor"/>
-	 
-   <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>
+		<property name="encryptionAlgorithm" value="http://www.w3.org/2001/04/xmlenc#aes128-cbc" />
+	</bean>
+
+	<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="localSCTSTS" implementor="#transportSTSProviderBean"
+		address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/TransportSCT"
+		wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/secure_conv/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:inInterceptors>
+			<ref bean="sctInterceptor" />
+		</jaxws:inInterceptors>
+		<jaxws:outInterceptors>
+			<ref bean="sctOutInterceptor" />
+		</jaxws:outInterceptors>
+		<jaxws:outFaultInterceptors>
+			<ref bean="sctOutInterceptor" />
+		</jaxws:outFaultInterceptors>
+	</jaxws:endpoint>
+
+	<jaxws:endpoint id="localSCTEncryptedSTS" implementor="#transportSTSEncryptedProviderBean"
+		address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/TransportSCTEncrypted"
+		wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/secure_conv/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:inInterceptors>
+			<ref bean="sctInterceptor" />
+		</jaxws:inInterceptors>
+		<jaxws:outInterceptors>
+			<ref bean="sctOutInterceptor" />
+		</jaxws:outInterceptors>
+		<jaxws:outFaultInterceptors>
+			<ref bean="sctOutInterceptor" />
+		</jaxws:outFaultInterceptors>
+	</jaxws:endpoint>
+
+	<jaxws:endpoint id="localSCTEndorsingSTS" implementor="#transportSTSProviderBean"
+		address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/TransportEndorsing"
+		wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/secure_conv/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_Endorsing_Port">
+		<jaxws:inInterceptors>
+			<ref bean="sctInterceptor" />
+		</jaxws:inInterceptors>
+		<jaxws:outInterceptors>
+			<ref bean="sctOutInterceptor" />
+		</jaxws:outInterceptors>
+		<jaxws:outFaultInterceptors>
+			<ref bean="sctOutInterceptor" />
+		</jaxws:outFaultInterceptors>
+		<jaxws:properties>
+			<entry key="org.apache.cxf.ws.security.tokenstore.TokenStore">
+				<ref bean="defaultTokenStore" />
+			</entry>
+		</jaxws:properties>
+	</jaxws:endpoint>
+
+	<bean id="sctInterceptor" class="org.apache.cxf.sts.interceptor.SCTInInterceptor" />
+	<bean id="sctOutInterceptor" class="org.apache.cxf.sts.interceptor.SCTOutInterceptor" />
+
+	<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/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml?rev=1204574&r1=1204573&r2=1204574&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml (original)
+++ cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml Mon Nov 21 16:25:08 2011
@@ -41,62 +41,56 @@
         </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.systest.sts.common.CommonCallbackHandler"/>
-		<property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
-		<property name="issuer" value="DoubleItSTSIssuer"/>
-		<property name="encryptionUsername" value="myservicekey"/>
-    </bean>
-    
-	<jaxws:endpoint id="EncryptedUTSTS"
-		implementor="#encryptedUtSTSProviderBean"
-		address="http://localhost:${testutil.ports.STSServer.2}/SecurityTokenService/UTEncrypted" 
-        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/"
-        serviceName="ns1:SecurityTokenService"
-        endpointName="ns1:UTEncrypted_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> 
+
+	<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.systest.sts.common.CommonCallbackHandler" />
+		<property name="encryptionPropertiesFile" value="stsKeystore.properties" />
+		<property name="issuer" value="DoubleItSTSIssuer" />
+		<property name="encryptionUsername" value="myservicekey" />
+	</bean>
+
+	<jaxws:endpoint id="EncryptedUTSTS" implementor="#encryptedUtSTSProviderBean"
+		address="http://localhost:${testutil.ports.STSServer.2}/SecurityTokenService/UTEncrypted"
+		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/"
+		serviceName="ns1:SecurityTokenService" endpointName="ns1:UTEncrypted_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/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml?rev=1204574&r1=1204573&r2=1204574&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml (original)
+++ cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml Mon Nov 21 16:25:08 2011
@@ -48,104 +48,98 @@
     </cxf:bus>
 
     <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"/>
+	    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" />
 	</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.systest.sts.common.CommonCallbackHandler"/>
-		<property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
-		<property name="issuer" value="DoubleItSTSIssuer"/>
-		<property name="encryptionUsername" value="myservicekey"/>
-    </bean>
-    
-	<jaxws:endpoint id="transportSTS"
-		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/"
-        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> 
+
+	<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="transportSTS" 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/"
+		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}">
-        <httpj:tlsServerParameters>
-        <sec:keyManagers keyPassword="skpass">
-          <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/>
-        </sec:keyManagers>
-        <sec:trustManagers>
-          <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
-        </sec:trustManagers>
-        <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="false" required="false"/>
-        </httpj:tlsServerParameters>
-       </httpj:engine>
-   </httpj:engine-factory>
-	
+
+	<httpj:engine-factory id="ClientAuthHttpsSettings"
+		bus="cxf">
+		<httpj:engine port="${testutil.ports.STSServer}">
+			<httpj:tlsServerParameters>
+				<sec:keyManagers keyPassword="skpass">
+					<sec:keyStore type="jks" password="sspass" resource="servicestore.jks" />
+				</sec:keyManagers>
+				<sec:trustManagers>
+					<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks" />
+				</sec:trustManagers>
+				<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="false"
+					required="false" />
+			</httpj:tlsServerParameters>
+		</httpj:engine>
+	</httpj:engine-factory>
+        
 </beans>
 

Modified: cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml?rev=1204574&r1=1204573&r2=1204574&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml (original)
+++ cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml Mon Nov 21 16:25:08 2011
@@ -42,66 +42,59 @@
     </cxf:bus>
 
     <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">
+	    class="org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider">
+	    <property name="issueOperation" ref="utIssueDelegate" />
+	    <property name="validateOperation" ref="utValidateDelegate" />
     </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>
+
+	<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.systest.sts.common.CommonCallbackHandler"/>
-		<property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
-		<property name="issuer" value="DoubleItSTSIssuer"/>
-		<property name="encryptionUsername" value="myservicekey"/>
-    </bean>
-    
-	<jaxws:endpoint id="UTSTS"
-		implementor="#utSTSProviderBean"
-		address="http://localhost:${testutil.ports.STSServer.2}/SecurityTokenService/UT" 
-        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/"
-        serviceName="ns1:SecurityTokenService"
-        endpointName="ns1:UT_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"/>
-        </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.systest.sts.common.CommonCallbackHandler" />
+		<property name="encryptionPropertiesFile" value="stsKeystore.properties" />
+		<property name="issuer" value="DoubleItSTSIssuer" />
+		<property name="encryptionUsername" value="myservicekey" />
+	</bean>
+
+	<jaxws:endpoint id="UTSTS" implementor="#utSTSProviderBean"
+		address="http://localhost:${testutil.ports.STSServer.2}/SecurityTokenService/UT"
+		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/"
+		serviceName="ns1:SecurityTokenService" endpointName="ns1:UT_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" />
+		</jaxws:properties>
 	</jaxws:endpoint>
-	
+        
 
 </beans>
 

Modified: cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml?rev=1204574&r1=1204573&r2=1204574&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml (original)
+++ cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml Mon Nov 21 16:25:08 2011
@@ -10,7 +10,7 @@
   http://www.apache.org/licenses/LICENSE-2.0
  
   Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
+  software distributed under the License is d   istributed on an
   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
   KIND, either express or implied. See the License for the
   specific language governing permissions and limitations
@@ -42,69 +42,63 @@
     </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.systest.sts.common.CommonCallbackHandler"/>
-		<property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
-		<property name="issuer" value="DoubleItSTSIssuer"/>
-		<property name="encryptionUsername" value="myservicekey"/>
-    </bean>
-    
-	<jaxws:endpoint id="X509STS"
-		implementor="#x509STSProviderBean"
-		address="http://localhost:${testutil.ports.STSServer.2}/SecurityTokenService/X509" 
-        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/"
-        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"/>
-            <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.systest.sts.common.CommonCallbackHandler" />
+		<property name="encryptionPropertiesFile" value="stsKeystore.properties" />
+		<property name="issuer" value="DoubleItSTSIssuer" />
+		<property name="encryptionUsername" value="myservicekey" />
+	</bean>
+
+	<jaxws:endpoint id="X509STS" implementor="#x509STSProviderBean"
+		address="http://localhost:${testutil.ports.STSServer.2}/SecurityTokenService/X509"
+		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/"
+		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" />
+			<entry key="ws-security.encryption.username" value="useReqSigCert" />
+		</jaxws:properties>
 	</jaxws:endpoint>
-	
+        
 
 </beans>
 



Mime
View raw message