cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1244457 - in /cxf/branches/2.5.x-fixes/services/sts: sts-war/src/main/webapp/WEB-INF/wsdl/ systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/ systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/...
Date Wed, 15 Feb 2012 12:20:23 GMT
Author: coheigea
Date: Wed Feb 15 12:20:22 2012
New Revision: 1244457

URL: http://svn.apache.org/viewvc?rev=1244457&view=rev
Log:
Fixing incorrect HttpsToken assertions in STS wsdls

Modified:
    cxf/branches/2.5.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/DoubleIt.wsdl
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/DoubleIt.wsdl
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/DoubleIt.wsdl
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/DoubleIt.wsdl
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/DoubleIt.wsdl
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/DoubleIt.wsdl
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/DoubleIt.wsdl
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/DoubleIt.wsdl
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/ws-trust-1.4-service.wsdl
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/DoubleIt.wsdl
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/DoubleIt.wsdl
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/DoubleIt.wsdl
    cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/DoubleIt.wsdl
    cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl
    cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/DoubleIt.wsdl
    cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/DoubleIt.wsdl
    cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/DoubleIt.wsdl

Modified: cxf/branches/2.5.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl?rev=1244457&r1=1244456&r2=1244457&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl
Wed Feb 15 12:20:22 2012
@@ -622,7 +622,9 @@
                <wsp:Policy>
                   <sp:TransportToken>
                      <wsp:Policy>
-                        <sp:HttpsToken RequireClientCertificate="false"/>
+                        <sp:HttpsToken>
+                            <wsp:Policy/>
+                        </sp:HttpsToken>
                      </wsp:Policy>
                   </sp:TransportToken>
                   <sp:AlgorithmSuite>
@@ -728,4 +730,4 @@
       </wsp:ExactlyOne>
    </wsp:Policy>
 
-</wsdl:definitions>
\ No newline at end of file
+</wsdl:definitions>

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/DoubleIt.wsdl?rev=1244457&r1=1244456&r2=1244457&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/DoubleIt.wsdl
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/DoubleIt.wsdl
Wed Feb 15 12:20:22 2012
@@ -60,7 +60,9 @@
 					<wsp:Policy>
 						<sp:TransportToken>
 							<wsp:Policy>
-								<sp:HttpsToken RequireClientCertificate="false" />
+								<sp:HttpsToken>
+                                                                    <wsp:Policy/>
+                                                                </sp:HttpsToken>
 							</wsp:Policy>
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/DoubleIt.wsdl?rev=1244457&r1=1244456&r2=1244457&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/DoubleIt.wsdl
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/DoubleIt.wsdl
Wed Feb 15 12:20:22 2012
@@ -107,7 +107,9 @@
 					<wsp:Policy>
 						<sp:TransportToken>
 							<wsp:Policy>
-								<sp:HttpsToken RequireClientCertificate="false" />
+								<sp:HttpsToken>
+                                                                    <wsp:Policy/>
+                                                                </sp:HttpsToken>
 							</wsp:Policy>
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
@@ -186,7 +188,9 @@
 										</wsaw:Metadata>
 									</sp:Issuer>
 								</sp:IssuedToken>
-								<sp:HttpsToken RequireClientCertificate="false" />
+								<sp:HttpsToken>
+                                                                    <wsp:Policy/>
+                                                                </sp:HttpsToken>
 							</wsp:Policy>
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/DoubleIt.wsdl?rev=1244457&r1=1244456&r2=1244457&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/DoubleIt.wsdl
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/DoubleIt.wsdl
Wed Feb 15 12:20:22 2012
@@ -136,7 +136,9 @@
 										</wsaw:Metadata>
 									</sp:Issuer>
 								</sp:IssuedToken>
-								<sp:HttpsToken RequireClientCertificate="false" />
+								<sp:HttpsToken>
+                                                                    <wsp:Policy/>
+                                                                </sp:HttpsToken>
 							</wsp:Policy>
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
@@ -181,7 +183,9 @@
 					<wsp:Policy>
 						<sp:TransportToken>
 							<wsp:Policy>
-								<sp:HttpsToken RequireClientCertificate="false" />
+								<sp:HttpsToken>
+                                                                    <wsp:Policy/>
+                                                                </sp:HttpsToken>
 							</wsp:Policy>
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
@@ -289,7 +293,9 @@
 										</wsaw:Metadata>
 									</sp:Issuer>
 								</sp:IssuedToken>
-								<sp:HttpsToken RequireClientCertificate="false" />
+								<sp:HttpsToken>
+                                                                    <wsp:Policy/>
+                                                                </sp:HttpsToken>
 							</wsp:Policy>
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/DoubleIt.wsdl?rev=1244457&r1=1244456&r2=1244457&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/DoubleIt.wsdl
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/DoubleIt.wsdl
Wed Feb 15 12:20:22 2012
@@ -63,7 +63,9 @@
 					<wsp:Policy>
 						<sp:TransportToken>
 							<wsp:Policy>
-								<sp:HttpsToken RequireClientCertificate="false" />
+								<sp:HttpsToken>
+                                                                    <wsp:Policy/>
+                                                                </sp:HttpsToken>
 							</wsp:Policy>
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl?rev=1244457&r1=1244456&r2=1244457&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl
Wed Feb 15 12:20:22 2012
@@ -270,7 +270,11 @@
                <wsp:Policy>
                   <sp:TransportToken>
                      <wsp:Policy>
-                        <sp:HttpsToken RequireClientCertificate="true"/>
+                        <sp:HttpsToken>
+                            <wsp:Policy>
+                                <sp:RequireClientCertificate />
+                            </wsp:Policy>
+                        </sp:HttpsToken>
                      </wsp:Policy>
                   </sp:TransportToken>
                   <sp:AlgorithmSuite>
@@ -316,7 +320,11 @@
                <wsp:Policy>
                   <sp:TransportToken>
                      <wsp:Policy>
-                        <sp:HttpsToken RequireClientCertificate="true"/>
+                        <sp:HttpsToken>
+                            <wsp:Policy>
+                                <sp:RequireClientCertificate />
+                            </wsp:Policy>
+                        </sp:HttpsToken>
                      </wsp:Policy>
                   </sp:TransportToken>
                   <sp:AlgorithmSuite>
@@ -421,4 +429,4 @@
       </wsp:ExactlyOne>
    </wsp:Policy>
 
-</wsdl:definitions>
\ No newline at end of file
+</wsdl:definitions>

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/DoubleIt.wsdl?rev=1244457&r1=1244456&r2=1244457&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/DoubleIt.wsdl
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/DoubleIt.wsdl
Wed Feb 15 12:20:22 2012
@@ -105,7 +105,9 @@
 					<wsp:Policy>
 						<sp:TransportToken>
 							<wsp:Policy>
-								<sp:HttpsToken RequireClientCertificate="false" />
+								<sp:HttpsToken>
+                                                                    <wsp:Policy/>
+                                                                </sp:HttpsToken>
 							</wsp:Policy>
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
@@ -179,7 +181,9 @@
 					<wsp:Policy>
 						<sp:TransportToken>
 							<wsp:Policy>
-								<sp:HttpsToken RequireClientCertificate="false" />
+								<sp:HttpsToken>
+                                                                    <wsp:Policy/>
+                                                                </sp:HttpsToken>
 							</wsp:Policy>
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
@@ -253,7 +257,9 @@
 					<wsp:Policy>
 						<sp:TransportToken>
 							<wsp:Policy>
-								<sp:HttpsToken RequireClientCertificate="false" />
+								<sp:HttpsToken>
+                                                                    <wsp:Policy/>
+                                                                </sp:HttpsToken>
 							</wsp:Policy>
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/DoubleIt.wsdl?rev=1244457&r1=1244456&r2=1244457&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/DoubleIt.wsdl
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/DoubleIt.wsdl
Wed Feb 15 12:20:22 2012
@@ -63,7 +63,9 @@
 					<wsp:Policy>
 						<sp:TransportToken>
 							<wsp:Policy>
-								<sp:HttpsToken RequireClientCertificate="false" />
+								<sp:HttpsToken>
+                                                                    <wsp:Policy/>
+                                                                </sp:HttpsToken>
 							</wsp:Policy>
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/DoubleIt.wsdl?rev=1244457&r1=1244456&r2=1244457&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/DoubleIt.wsdl
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/DoubleIt.wsdl
Wed Feb 15 12:20:22 2012
@@ -75,7 +75,9 @@
 					<wsp:Policy>
 						<sp:TransportToken>
 							<wsp:Policy>
-								<sp:HttpsToken RequireClientCertificate="false" />
+								<sp:HttpsToken>
+                                                                    <wsp:Policy/>
+                                                                </sp:HttpsToken>
 							</wsp:Policy>
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/DoubleIt.wsdl?rev=1244457&r1=1244456&r2=1244457&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/DoubleIt.wsdl
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/DoubleIt.wsdl
Wed Feb 15 12:20:22 2012
@@ -84,7 +84,9 @@
                     <wsp:Policy>
                         <sp:TransportToken>
                             <wsp:Policy>
-                                <sp:HttpsToken RequireClientCertificate="false" />
+                                <sp:HttpsToken>
+                                    <wsp:Policy/>
+                                </sp:HttpsToken>
                             </wsp:Policy>
                         </sp:TransportToken>
                         <sp:AlgorithmSuite>
@@ -113,7 +115,9 @@
                                             <wsp:Policy>
                                                 <sp:TransportToken>
                                                     <wsp:Policy>
-                                                        <sp:HttpsToken RequireClientCertificate="false"
/>
+                                                        <sp:HttpsToken>
+                                                            <wsp:Policy/>
+                                                        </sp:HttpsToken>
                                                     </wsp:Policy>
                                                 </sp:TransportToken>
                                                 <sp:AlgorithmSuite>
@@ -190,7 +194,9 @@
                                                 <wsp:Policy>
                                                     <sp:TransportToken>
                                                         <wsp:Policy>
-                                                            <sp:HttpsToken RequireClientCertificate="false"
/>
+                                                            <sp:HttpsToken>
+                                                                <wsp:Policy/>
+                                                            </sp:HttpsToken>
                                                         </wsp:Policy>
                                                     </sp:TransportToken>
                                                     <sp:AlgorithmSuite>

Modified: cxf/branches/2.5.x-fixes/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/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/ws-trust-1.4-service.wsdl?rev=1244457&r1=1244456&r2=1244457&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/ws-trust-1.4-service.wsdl
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/ws-trust-1.4-service.wsdl
Wed Feb 15 12:20:22 2012
@@ -273,7 +273,11 @@
                <wsp:Policy>
                   <sp:TransportToken>
                      <wsp:Policy>
-                        <sp:HttpsToken RequireClientCertificate="true"/>
+                        <sp:HttpsToken>
+                            <wsp:Policy>
+                                <sp:RequireClientCertificate />
+                            </wsp:Policy>
+                        </sp:HttpsToken>
                      </wsp:Policy>
                   </sp:TransportToken>
                   <sp:AlgorithmSuite>
@@ -319,7 +323,11 @@
                <wsp:Policy>
                   <sp:TransportToken>
                      <wsp:Policy>
-                        <sp:HttpsToken RequireClientCertificate="true"/>
+                        <sp:HttpsToken>
+                            <wsp:Policy>
+                                <sp:RequireClientCertificate />
+                            </wsp:Policy>
+                        </sp:HttpsToken>
                      </wsp:Policy>
                   </sp:TransportToken>
                   <sp:AlgorithmSuite>
@@ -423,4 +431,4 @@
       </wsp:ExactlyOne>
    </wsp:Policy>
 
-</wsdl:definitions>
\ No newline at end of file
+</wsdl:definitions>

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/DoubleIt.wsdl?rev=1244457&r1=1244456&r2=1244457&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/DoubleIt.wsdl
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/DoubleIt.wsdl
Wed Feb 15 12:20:22 2012
@@ -87,7 +87,9 @@
 										</wsaw:Metadata>
 									</sp:Issuer>
 								</sp:IssuedToken>
-								<sp:HttpsToken RequireClientCertificate="false" />
+								<sp:HttpsToken>
+                                                                    <wsp:Policy/>
+                                                                </sp:HttpsToken>
 							</wsp:Policy>
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/DoubleIt.wsdl?rev=1244457&r1=1244456&r2=1244457&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/DoubleIt.wsdl
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/DoubleIt.wsdl
Wed Feb 15 12:20:22 2012
@@ -63,7 +63,9 @@
 					<wsp:Policy>
 						<sp:TransportToken>
 							<wsp:Policy>
-								<sp:HttpsToken RequireClientCertificate="false" />
+								<sp:HttpsToken>
+                                                                    <wsp:Policy/>
+                                                                </sp:HttpsToken>
 							</wsp:Policy>
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/DoubleIt.wsdl?rev=1244457&r1=1244456&r2=1244457&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/DoubleIt.wsdl
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/DoubleIt.wsdl
Wed Feb 15 12:20:22 2012
@@ -63,7 +63,9 @@
 					<wsp:Policy>
 						<sp:TransportToken>
 							<wsp:Policy>
-								<sp:HttpsToken RequireClientCertificate="false" />
+								<sp:HttpsToken>
+                                                                    <wsp:Policy/>
+                                                                </sp:HttpsToken>
 							</wsp:Policy>
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/DoubleIt.wsdl?rev=1244457&r1=1244456&r2=1244457&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/DoubleIt.wsdl
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/DoubleIt.wsdl
Wed Feb 15 12:20:22 2012
@@ -64,7 +64,9 @@
 					<wsp:Policy>
 						<sp:TransportToken>
 							<wsp:Policy>
-								<sp:HttpsToken RequireClientCertificate="false" />
+								<sp:HttpsToken>
+                                                                    <wsp:Policy/>
+                                                                </sp:HttpsToken>
 							</wsp:Policy>
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl?rev=1244457&r1=1244456&r2=1244457&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl
Wed Feb 15 12:20:22 2012
@@ -622,7 +622,9 @@
                <wsp:Policy>
                   <sp:TransportToken>
                      <wsp:Policy>
-                        <sp:HttpsToken RequireClientCertificate="false"/>
+                        <sp:HttpsToken>
+                            <wsp:Policy/>
+                        </sp:HttpsToken>
                      </wsp:Policy>
                   </sp:TransportToken>
                   <sp:AlgorithmSuite>
@@ -728,4 +730,4 @@
       </wsp:ExactlyOne>
    </wsp:Policy>
 
-</wsdl:definitions>
\ No newline at end of file
+</wsdl:definitions>

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/DoubleIt.wsdl?rev=1244457&r1=1244456&r2=1244457&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/DoubleIt.wsdl
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/DoubleIt.wsdl
Wed Feb 15 12:20:22 2012
@@ -84,7 +84,9 @@
 					<wsp:Policy>
 						<sp:TransportToken>
 							<wsp:Policy>
-								<sp:HttpsToken RequireClientCertificate="false" />
+								<sp:HttpsToken>
+                                                                    <wsp:Policy/>
+                                                                </sp:HttpsToken>
 							</wsp:Policy>
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
@@ -181,7 +183,9 @@
 										</wsaw:Metadata>
 									</sp:Issuer>
 								</sp:IssuedToken>
-								<sp:HttpsToken RequireClientCertificate="false" />
+								<sp:HttpsToken>
+                                                                    <wsp:Policy/>
+                                                                </sp:HttpsToken>
 							</wsp:Policy>
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/DoubleIt.wsdl?rev=1244457&r1=1244456&r2=1244457&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/DoubleIt.wsdl
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/DoubleIt.wsdl
Wed Feb 15 12:20:22 2012
@@ -85,7 +85,9 @@
 					<wsp:Policy>
 						<sp:TransportToken>
 							<wsp:Policy>
-								<sp:HttpsToken RequireClientCertificate="false" />
+								<sp:HttpsToken>
+                                                                    <wsp:Policy/>
+                                                                </sp:HttpsToken>
 							</wsp:Policy>
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
@@ -140,7 +142,11 @@
 					<wsp:Policy>
 						<sp:TransportToken>
 							<wsp:Policy>
-								<sp:HttpsToken RequireClientCertificate="true" />
+								<sp:HttpsToken>
+                                                                  <wsp:Policy>
+                                                                      <sp:RequireClientCertificate
/>
+                                                                  </wsp:Policy>
+                                                                </sp:HttpsToken>
 							</wsp:Policy>
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/DoubleIt.wsdl?rev=1244457&r1=1244456&r2=1244457&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/DoubleIt.wsdl
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/DoubleIt.wsdl
Wed Feb 15 12:20:22 2012
@@ -128,7 +128,9 @@
 										</wsaw:Metadata>
 									</sp:Issuer>
 								</sp:IssuedToken>
-								<sp:HttpsToken RequireClientCertificate="false" />
+								<sp:HttpsToken>
+                                                                    <wsp:Policy/>
+                                                                </sp:HttpsToken>
 							</wsp:Policy>
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
@@ -196,7 +198,9 @@
 										</wsaw:Metadata>
 									</sp:Issuer>
 								</sp:IssuedToken>
-								<sp:HttpsToken RequireClientCertificate="false" />
+								<sp:HttpsToken>
+                                                                    <wsp:Policy/>
+                                                                </sp:HttpsToken>
 							</wsp:Policy>
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
@@ -240,7 +244,9 @@
 					<wsp:Policy>
 						<sp:TransportToken>
 							<wsp:Policy>
-								<sp:HttpsToken RequireClientCertificate="false" />
+								<sp:HttpsToken>
+                                                                    <wsp:Policy/>
+                                                                </sp:HttpsToken>
 							</wsp:Policy>
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>



Mime
View raw message