Author: veithen
Date: Thu Mar 3 22:30:37 2011
New Revision: 1076849
URL: http://svn.apache.org/viewvc?rev=1076849&view=rev
Log:
Re-merged r1075684 using svn tools. Please don't do merges by hand. This will
introduce tiny differences that cause merge conflicts later.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/src/test/resources/rampart/services-sc-6.xml
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 3 22:30:37 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266,1075676
+/axis/axis2/java/rampart/trunk:1072266,1075676,1075684
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/src/test/resources/rampart/services-sc-6.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/src/test/resources/rampart/services-sc-6.xml?rev=1076849&r1=1076848&r2=1076849&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/src/test/resources/rampart/services-sc-6.xml
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/src/test/resources/rampart/services-sc-6.xml
Thu Mar 3 22:30:37 2011
@@ -30,7 +30,7 @@
<sp:HttpsToken/>
</wsp:Policy>
</sp:TransportToken>
-
<sp:AlgorithmSuite>
+ <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>
