cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1552645 - in /cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/java_first_policies: AlternativesPolicy.xml UsernamePasswordPolicy.xml UsernamePasswordToken.xml UsernamePolicy.xml
Date Fri, 20 Dec 2013 13:19:33 GMT
Author: coheigea
Date: Fri Dec 20 13:19:33 2013
New Revision: 1552645

URL: http://svn.apache.org/r1552645
Log:
Fixing last commit

Modified:
    cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/java_first_policies/AlternativesPolicy.xml
    cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/java_first_policies/UsernamePasswordPolicy.xml
    cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/java_first_policies/UsernamePasswordToken.xml
    cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/java_first_policies/UsernamePolicy.xml

Modified: cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/java_first_policies/AlternativesPolicy.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/java_first_policies/AlternativesPolicy.xml?rev=1552645&r1=1552644&r2=1552645&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/java_first_policies/AlternativesPolicy.xml
(original)
+++ cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/java_first_policies/AlternativesPolicy.xml
Fri Dec 20 13:19:33 2013
@@ -1,71 +1,3 @@
-<<<<<<< HEAD
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<wsp:Policy wsu:Id="AlternativesPolicy" xmlns:wsp="http://www.w3.org/ns/ws-policy"
-	xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
-	xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-	<wsp:ExactlyOne>
-		<wsp:All>
-			<sp:TransportBinding>
-				<wsp:Policy>
-					<sp:TransportToken>
-						<wsp:Policy>
-							<sp:HttpsToken>
-								<wsp:Policy>
-									<sp:RequireClientCertificate />
-								</wsp:Policy>
-							</sp:HttpsToken>
-						</wsp:Policy>
-					</sp:TransportToken>
-					<sp:AlgorithmSuite>
-						<wsp:Policy>
-							<sp:Basic256 />
-						</wsp:Policy>
-					</sp:AlgorithmSuite>
-				</wsp:Policy>
-			</sp:TransportBinding>
-
-			<sp:SupportingTokens>
-				<wsp:Policy>
-					<sp:UsernameToken>
-						<wsp:Policy>
-							<sp:NoPassword />
-						</wsp:Policy>
-					</sp:UsernameToken>
-				</wsp:Policy>
-			</sp:SupportingTokens>
-		</wsp:All>
-
-		<wsp:All>
-			<sp:TransportBinding>
-				<wsp:Policy>
-					<sp:TransportToken>
-						<wsp:Policy>
-							<sp:HttpsToken>
-								<wsp:Policy />
-							</sp:HttpsToken>
-						</wsp:Policy>
-					</sp:TransportToken>
-					<sp:AlgorithmSuite>
-						<wsp:Policy>
-							<sp:Basic256 />
-						</wsp:Policy>
-					</sp:AlgorithmSuite>
-				</wsp:Policy>
-			</sp:TransportBinding>
-
-			<sp:SupportingTokens>
-				<wsp:Policy>
-					<sp:UsernameToken>
-						<wsp:Policy>
-							<sp:WssUsernameToken11 />
-						</wsp:Policy>
-					</sp:UsernameToken>
-				</wsp:Policy>
-			</sp:SupportingTokens>
-		</wsp:All>
-	</wsp:ExactlyOne>
-=======
 <?xml version="1.0" encoding="UTF-8"?>
 <wsp:Policy xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702" wsu:Id="AlternativesPolicy">
     <wsp:ExactlyOne>
@@ -126,5 +58,4 @@
             </sp:SupportingTokens>
         </wsp:All>
     </wsp:ExactlyOne>
->>>>>>> f90a533... Fixing policies to add a Inclusion Type
 </wsp:Policy>

Modified: cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/java_first_policies/UsernamePasswordPolicy.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/java_first_policies/UsernamePasswordPolicy.xml?rev=1552645&r1=1552644&r2=1552645&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/java_first_policies/UsernamePasswordPolicy.xml
(original)
+++ cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/java_first_policies/UsernamePasswordPolicy.xml
Fri Dec 20 13:19:33 2013
@@ -1,41 +1,3 @@
-<<<<<<< HEAD
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<wsp:Policy wsu:Id="UsernamePasswordPolicy"
-	xmlns:wsp="http://www.w3.org/ns/ws-policy"
-	xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
-	xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-	<wsp:ExactlyOne>
-		<wsp:All>
-			<sp:TransportBinding>
-				<wsp:Policy>
-					<sp:TransportToken>
-						<wsp:Policy>
-							<sp:HttpsToken>
-								<wsp:Policy />
-							</sp:HttpsToken>
-						</wsp:Policy>
-					</sp:TransportToken>
-					<sp:AlgorithmSuite>
-						<wsp:Policy>
-							<sp:Basic256 />
-						</wsp:Policy>
-					</sp:AlgorithmSuite>
-				</wsp:Policy>
-			</sp:TransportBinding>
-
-			<sp:SupportingTokens>
-				<wsp:Policy>
-					<sp:UsernameToken>
-						<wsp:Policy>
-							<sp:WssUsernameToken11 />
-						</wsp:Policy>
-					</sp:UsernameToken>
-				</wsp:Policy>
-			</sp:SupportingTokens>
-		</wsp:All>
-	</wsp:ExactlyOne>
-=======
 <?xml version="1.0" encoding="UTF-8"?>
 <wsp:Policy xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702" wsu:Id="UsernamePasswordPolicy">
     <wsp:ExactlyOne>
@@ -67,5 +29,4 @@
             </sp:SupportingTokens>
         </wsp:All>
     </wsp:ExactlyOne>
->>>>>>> f90a533... Fixing policies to add a Inclusion Type
 </wsp:Policy>

Modified: cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/java_first_policies/UsernamePasswordToken.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/java_first_policies/UsernamePasswordToken.xml?rev=1552645&r1=1552644&r2=1552645&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/java_first_policies/UsernamePasswordToken.xml
(original)
+++ cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/java_first_policies/UsernamePasswordToken.xml
Fri Dec 20 13:19:33 2013
@@ -1,24 +1,3 @@
-<<<<<<< HEAD
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<wsp:Policy wsu:Id="TransportAndUsernamePolicy" xmlns:wsp="http://www.w3.org/ns/ws-policy"
-	xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
-	xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-	<wsp:ExactlyOne>
-		<wsp:All>
-			<sp:SupportingTokens>
-				<wsp:Policy>
-					<sp:UsernameToken>
-						<wsp:Policy>
-							<sp:WssUsernameToken10 />
-						</wsp:Policy>
-					</sp:UsernameToken>
-				</wsp:Policy>
-			</sp:SupportingTokens>
-		</wsp:All>
-	</wsp:ExactlyOne>
-</wsp:Policy>
-=======
 <?xml version="1.0" encoding="UTF-8"?>
 <wsp:Policy xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702" wsu:Id="TransportAndUsernamePolicy">
     <wsp:ExactlyOne>
@@ -35,4 +14,3 @@
         </wsp:All>
     </wsp:ExactlyOne>
 </wsp:Policy>
->>>>>>> f90a533... Fixing policies to add a Inclusion Type

Modified: cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/java_first_policies/UsernamePolicy.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/java_first_policies/UsernamePolicy.xml?rev=1552645&r1=1552644&r2=1552645&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/java_first_policies/UsernamePolicy.xml
(original)
+++ cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/java_first_policies/UsernamePolicy.xml
Fri Dec 20 13:19:33 2013
@@ -1,43 +1,3 @@
-<<<<<<< HEAD
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<wsp:Policy wsu:Id="UsernamePolicy" 
-	xmlns:wsp="http://www.w3.org/ns/ws-policy"
-	xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
-	xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-	<wsp:ExactlyOne>
-		<wsp:All>
-			<sp:TransportBinding>
-				<wsp:Policy>
-					<sp:TransportToken>
-						<wsp:Policy>
-							<sp:HttpsToken>
-								<wsp:Policy>
-									<sp:RequireClientCertificate />
-								</wsp:Policy>
-							</sp:HttpsToken>
-						</wsp:Policy>
-					</sp:TransportToken>
-					<sp:AlgorithmSuite>
-						<wsp:Policy>
-							<sp:Basic256 />
-						</wsp:Policy>
-					</sp:AlgorithmSuite>
-				</wsp:Policy>
-			</sp:TransportBinding>
-
-			<sp:SupportingTokens>
-				<wsp:Policy>
-					<sp:UsernameToken>
-						<wsp:Policy>
-							<sp:NoPassword />
-						</wsp:Policy>
-					</sp:UsernameToken>
-				</wsp:Policy>
-			</sp:SupportingTokens>
-		</wsp:All>
-	</wsp:ExactlyOne>
-=======
 <?xml version="1.0" encoding="UTF-8"?>
 <wsp:Policy xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702" wsu:Id="UsernamePolicy">
     <wsp:ExactlyOne>
@@ -71,5 +31,4 @@
             </sp:SupportingTokens>
         </wsp:All>
     </wsp:ExactlyOne>
->>>>>>> f90a533... Fixing policies to add a Inclusion Type
 </wsp:Policy>



Mime
View raw message