cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1187436 [2/2] - in /cxf/trunk/services/sts/systests: ./ advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/ advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/ advanced/src/test/java/org/apache/cxf/systest/sts/bina...
Date Fri, 21 Oct 2011 16:10:02 GMT
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=1187436&r1=1187435&r2=1187436&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
Fri Oct 21 16:10:00 2011
@@ -40,6 +40,8 @@
             http://www.springframework.org/schema/util
             http://www.springframework.org/schema/util/spring-util-2.0.xsd">
     
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+    
     <cxf:bus>
         <cxf:features>
             <cxf:logging/>
@@ -120,13 +122,14 @@
 		class="org.apache.cxf.sts.token.validator.SCTValidator">
     </bean>
     
-     <bean id="transportSCTCanceller"
+    <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">
@@ -134,6 +137,10 @@
 		<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"/>
@@ -147,7 +154,7 @@
     
    <jaxws:endpoint id="localSCTSTS"
         implementor="#transportSTSProviderBean"
-        address="https://localhost:8084/SecurityTokenService/TransportSCT" 
+        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"
@@ -166,7 +173,7 @@
    
    <jaxws:endpoint id="localSCTEncryptedSTS"
         implementor="#transportSTSEncryptedProviderBean"
-        address="https://localhost:8084/SecurityTokenService/TransportSCTEncrypted" 
+        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"
@@ -185,7 +192,7 @@
    
    <jaxws:endpoint id="localSCTEndorsingSTS"
         implementor="#transportSTSProviderBean"
-        address="https://localhost:8084/SecurityTokenService/TransportEndorsing" 
+        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"
@@ -211,7 +218,7 @@
    <bean id="sctOutInterceptor" class="org.apache.cxf.sts.interceptor.SCTOutInterceptor"/>
 	 
    <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf">
-      <httpj:engine port="8084">
+      <httpj:engine port="${testutil.ports.STSServer}">
       <httpj:tlsServerParameters>
         <sec:trustManagers>
           <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>

Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/ws-trust-1.4-service.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/ws-trust-1.4-service.wsdl?rev=1187436&r1=1187435&r2=1187436&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/ws-trust-1.4-service.wsdl
(original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/ws-trust-1.4-service.wsdl
Fri Oct 21 16:10:00 2011
@@ -278,7 +278,7 @@
                   </sp:TransportToken>
                   <sp:AlgorithmSuite>
                      <wsp:Policy>
-                        <sp:TripleDesRsa15 />
+                        <sp:Basic128 />
                      </wsp:Policy>
                   </sp:AlgorithmSuite>
                   <sp:Layout>
@@ -324,7 +324,7 @@
                   </sp:TransportToken>
                   <sp:AlgorithmSuite>
                      <wsp:Policy>
-                        <sp:TripleDesRsa15 />
+                        <sp:Basic128 />
                      </wsp:Policy>
                   </sp:AlgorithmSuite>
                   <sp:Layout>

Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml?rev=1187436&r1=1187435&r2=1187436&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml
(original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml
Fri Oct 21 16:10:00 2011
@@ -29,6 +29,8 @@ http://cxf.apache.org/jaxws http://cxf.a
 http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
 http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
 
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+    
     <cxf:bus>
         <cxf:features>
             <cxf:logging/>
@@ -41,7 +43,7 @@ http://cxf.apache.org/configuration/secu
                <bean class="org.apache.cxf.ws.security.trust.STSClient">
                    <constructor-arg ref="cxf"/>
                    <property name="wsdlLocation" 
-                             value="https://localhost:8084/SecurityTokenService/TransportSoap12?wsdl"/>
+                             value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/TransportSoap12?wsdl"/>
                    <property name="serviceName" 
                              value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
                    <property name="endpointName" 

Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml?rev=1187436&r1=1187435&r2=1187436&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml
(original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml
Fri Oct 21 16:10:00 2011
@@ -61,7 +61,7 @@
                <bean class="org.apache.cxf.ws.security.trust.STSClient">
                    <constructor-arg ref="cxf"/>
                    <property name="wsdlLocation" 
-                             value="https://localhost:8084/SecurityTokenService/TransportSoap12?wsdl"/>
+                             value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/TransportSoap12?wsdl"/>
                    <property name="serviceName" 
                              value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
                    <property name="endpointName" 

Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml?rev=1187436&r1=1187435&r2=1187436&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml
(original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml
Fri Oct 21 16:10:00 2011
@@ -65,7 +65,7 @@
                <bean class="org.apache.cxf.ws.security.trust.STSClient">
                    <constructor-arg ref="cxf"/>
                    <property name="wsdlLocation" 
-                             value="https://localhost:8084/SecurityTokenService/Transport?wsdl"/>
+                             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" 

Modified: cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml?rev=1187436&r1=1187435&r2=1187436&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml
(original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml
Fri Oct 21 16:10:00 2011
@@ -65,7 +65,7 @@
                <bean class="org.apache.cxf.ws.security.trust.STSClient">
                    <constructor-arg ref="cxf"/>
                    <property name="wsdlLocation" 
-                             value="https://localhost:8084/SecurityTokenService/Transport?wsdl"/>
+                             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" 

Modified: cxf/trunk/services/sts/systests/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/pom.xml?rev=1187436&r1=1187435&r2=1187436&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/pom.xml (original)
+++ cxf/trunk/services/sts/systests/pom.xml Fri Oct 21 16:10:00 2011
@@ -34,7 +34,7 @@
 
     <modules>
         <module>basic</module>
-        <!--<module>advanced</module>-->
+        <module>advanced</module>
     </modules>
 
 </project>



Mime
View raw message