You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by th...@apache.org on 2011/03/01 08:02:27 UTC

svn commit: r1075684 - in /axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart: policy/sc-6.xml services-sc-6.xml

Author: thilinamb
Date: Tue Mar  1 07:02:27 2011
New Revision: 1075684

URL: http://svn.apache.org/viewvc?rev=1075684&view=rev
Log:
Fixing the policy file to be compliant with HttpsToken definition of WS-Security Policy 1.2

Modified:
    axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/policy/sc-6.xml
    axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/services-sc-6.xml

Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/policy/sc-6.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/policy/sc-6.xml?rev=1075684&r1=1075683&r2=1075684&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/policy/sc-6.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/policy/sc-6.xml Tue Mar  1 07:02:27 2011
@@ -13,10 +13,10 @@
 											<sp:TransportBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
 											  <wsp:Policy>
 												<sp:TransportToken>
-												  <wsp:Policy>
-													<sp:HttpsToken RequireClientCertificate="false"/>
-												  </wsp:Policy>
-												</sp:TransportToken>
+                                                    <wsp:Policy>
+                                                        <sp:HttpsToken/>
+                                                    </wsp:Policy>
+                                                </sp:TransportToken>
 												<sp:AlgorithmSuite>
 												  <wsp:Policy>
 													<sp:Basic128/>

Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/services-sc-6.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/services-sc-6.xml?rev=1075684&r1=1075683&r2=1075684&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/services-sc-6.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/services-sc-6.xml Tue Mar  1 07:02:27 2011
@@ -26,11 +26,11 @@
 											<sp:TransportBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
 											  <wsp:Policy>
 												<sp:TransportToken>
-												  <wsp:Policy>
-													<sp:HttpsToken RequireClientCertificate="false"/>
-												  </wsp:Policy>
-												</sp:TransportToken>
-												<sp:AlgorithmSuite>
+                                                    <wsp:Policy>
+                                                        <sp:HttpsToken/>
+                                                    </wsp:Policy>
+                                                </sp:TransportToken>
+                                                  <sp:AlgorithmSuite>
 												  <wsp:Policy>
 													<sp:Basic128/>
 												  </wsp:Policy>
@@ -87,11 +87,11 @@
 			<sp:EncryptedParts xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
 				<sp:Body/>
 			</sp:EncryptedParts>
-			<ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy"> 
+			<ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy">
 				<ramp:user>bob</ramp:user>
 				<ramp:encryptionUser>alice</ramp:encryptionUser>
 				<ramp:passwordCallbackClass>org.apache.rampart.PWCallback</ramp:passwordCallbackClass>
-				
+
 				<ramp:signatureCrypto>
 					<ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
 						<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
@@ -106,12 +106,12 @@
 						<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
 					</ramp:crypto>
 				</ramp:encryptionCypto>
-				
+
 			</ramp:RampartConfig>
 		</wsp:All>
 	</wsp:ExactlyOne>
 	</wsp:Policy>
-	
+
     <parameter name="sct-issuer-config">
 		<sct-issuer-config>
 			<cryptoProperties>
@@ -141,7 +141,7 @@
             <proofKeyType>BinarySecret</proofKeyType>
         </sct-issuer-config>
     </parameter>
-	
+
 	<parameter name="token-canceler-config">
 		<token-canceler-config>
 			<!--<proofToken>EncryptedKey</proofToken>-->
@@ -149,6 +149,6 @@
 			<!--<addRequestedAttachedRef />-->
 		</token-canceler-config>
     </parameter>
-	
-	
+
+
 </service>