Author: veithen
Date: Sat Jul 9 10:28:19 2011
New Revision: 1144630
URL: http://svn.apache.org/viewvc?rev=1144630&view=rev
Log:
Merged r1144616 to the 1.5 branch to fix some invalid test cases.
Modified:
axis/axis2/java/rampart/branches/1_5_x/ (props changed)
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/policy/16.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/policy/30.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/services-16.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/services-30.xml
Propchange: axis/axis2/java/rampart/branches/1_5_x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 9 10:28:19 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072182,1072187,1072313,1072316,1083686,1130570,1132548,1134683
+/axis/axis2/java/rampart/trunk:1072182,1072187,1072313,1072316,1083686,1130570,1132548,1134683,1144616
Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/policy/16.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/policy/16.xml?rev=1144630&r1=1144629&r2=1144630&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/policy/16.xml
(original)
+++
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/policy/16.xml
Sat Jul 9 10:28:19 2011
@@ -37,10 +37,10 @@
</wsp:Policy>
</sp:AsymmetricBinding>
<sp:Wss10
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
- <sp:Policy>
+ <wsp:Policy>
<sp:MustSupportRefKeyIdentifier/>
<sp:MustSupportRefIssuerSerial/>
- </sp:Policy>
+ </wsp:Policy>
</sp:Wss10>
<sp:SignedSupportingTokens
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
<wsp:Policy/>
Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/policy/30.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/policy/30.xml?rev=1144630&r1=1144629&r2=1144630&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/policy/30.xml
(original)
+++
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/policy/30.xml
Sat Jul 9 10:28:19 2011
@@ -40,10 +40,10 @@
</wsp:Policy>
</sp:AsymmetricBinding>
<sp:Wss10>
- <sp:Policy>
+ <wsp:Policy>
<sp:MustSupportRefKeyIdentifier/>
<sp:MustSupportRefIssuerSerial/>
- </sp:Policy>
+ </wsp:Policy>
</sp:Wss10>
<sp:EncryptedElements>
<sp:XPath
xmlns:example1="http://example1.org/example1";>//example1:Text</sp:XPath>
Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/services-16.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/services-16.xml?rev=1144630&r1=1144629&r2=1144630&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/services-16.xml
(original)
+++
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/services-16.xml
Sat Jul 9 10:28:19 2011
@@ -54,10 +54,10 @@
</wsp:Policy>
</sp:AsymmetricBinding>
<sp:Wss10
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
- <sp:Policy>
+ <wsp:Policy>
<sp:MustSupportRefKeyIdentifier/>
<sp:MustSupportRefIssuerSerial/>
- </sp:Policy>
+ </wsp:Policy>
</sp:Wss10>
<sp:SignedSupportingTokens
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
<wsp:Policy/>
Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/services-30.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/services-30.xml?rev=1144630&r1=1144629&r2=1144630&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/services-30.xml
(original)
+++
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/services-30.xml
Sat Jul 9 10:28:19 2011
@@ -52,10 +52,10 @@
</wsp:Policy>
</sp:AsymmetricBinding>
<sp:Wss10>
- <sp:Policy>
+ <wsp:Policy>
<sp:MustSupportRefKeyIdentifier/>
<sp:MustSupportRefIssuerSerial/>
- </sp:Policy>
+ </wsp:Policy>
</sp:Wss10>
<sp:EncryptedElements>
<sp:XPath
xmlns:example1="http://example1.org/example1";>//example1:Text</sp:XPath>
