svn commit: r1178193 - in /axis/axis2/java/rampart/trunk/modules: rampart-integration/ rampart-integration/src/test/java/org/apache/rampart/ rampart-integration/src/test/resources/rampart/ rampart-int

2011-10-02 Thread veithen 
Author: veithen
Date: Sun Oct  2 14:37:25 2011
New Revision: 1178193

URL: http://svn.apache.org/viewvc?rev=1178193&view=rev
Log:
RAMPART-324: Added the test case provided by Amila Jayasekara, but implemented 
a proper fix based on the feature added by AXIOM-388.

Added:

axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/policy/33.xml
   (with props)

axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/services-33.xml
   (with props)
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml

axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java

axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java

axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/RequiredElementsBuilder.java

axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java

axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ContentEncryptedElementsBuilder.java

axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedElementsBuilder.java

axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RequiredElementsBuilder.java

axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedElementsBuilder.java

Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml?rev=1178193&r1=1178192&r2=1178193&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml Sun Oct  
2 14:37:25 2011
@@ -257,6 +257,10 @@
 
 
 
+
+
+
+
 
 
 

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java?rev=1178193&r1=1178192&r2=1178193&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
 Sun Oct  2 14:37:25 2011
@@ -83,7 +83,7 @@ public class RampartTest extends TestCas
 "Unlimited Strength Jurisdiction Policy !!!");
 }
 
-for (int i = 1; i <= 32; i++) { //<-The number of tests we have
+for (int i = 1; i <= 33; i++) { //<-The number of tests we have
 if(!basic256Supported && (i == 3 || i == 4 || i == 5)) {
 //Skip the Basic256 tests
 continue;

Added: 
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/policy/33.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/policy/33.xml?rev=1178193&view=auto
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/policy/33.xml
 (added)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/policy/33.xml
 Sun Oct  2 14:37:25 2011
@@ -0,0 +1,103 @@
+http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
+xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
+
+
+
+http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+
+
+
+http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+
+
+
+
+
+
+
+
+
+http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+
+
+

svn commit: r1178257 - in /axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java: InterfaceImplementationTemplate.xsl MessageReceiverTemplate.xsl

2011-10-02 Thread veithen 
Author: veithen
Date: Sun Oct  2 21:19:44 2011
New Revision: 1178257

URL: http://svn.apache.org/viewvc?rev=1178257&view=rev
Log:
Correctly calculate the namespace context for the SOAP body.

Modified:

axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl

axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl

Modified: 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl?rev=1178257&r1=1178256&r2=1178257&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
 (original)
+++ 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
 Sun Oct  2 21:19:44 2011
@@ -1128,7 +1128,7 @@
 */
private java.util.Map 
getEnvelopeNamespaces(org.apache.axiom.soap.SOAPEnvelope env){
 java.util.Map returnMap = new java.util.HashMap();
-java.util.Iterator namespaceIterator = env.getAllDeclaredNamespaces();
+java.util.Iterator namespaceIterator = 
env.getBody().getNamespacesInScope();
 while (namespaceIterator.hasNext()) {
 org.apache.axiom.om.OMNamespace ns = 
(org.apache.axiom.om.OMNamespace) namespaceIterator.next();
 returnMap.put(ns.getPrefix(),ns.getNamespaceURI());

Modified: 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl?rev=1178257&r1=1178256&r2=1178257&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
 (original)
+++ 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
 Sun Oct  2 21:19:44 2011
@@ -301,7 +301,7 @@
 */
 private java.util.Map 
getEnvelopeNamespaces(org.apache.axiom.soap.SOAPEnvelope env){
 java.util.Map returnMap = new java.util.HashMap();
-java.util.Iterator namespaceIterator = env.getAllDeclaredNamespaces();
+java.util.Iterator namespaceIterator = 
env.getBody().getNamespacesInScope();
 while (namespaceIterator.hasNext()) {
 org.apache.axiom.om.OMNamespace ns = (org.apache.axiom.om.OMNamespace) 
namespaceIterator.next();
 returnMap.put(ns.getPrefix(),ns.getNamespaceURI());
@@ -445,7 +445,7 @@
 */
 private java.util.Map 
getEnvelopeNamespaces(org.apache.axiom.soap.SOAPEnvelope env){
 java.util.Map returnMap = new java.util.HashMap();
-java.util.Iterator namespaceIterator = env.getAllDeclaredNamespaces();
+java.util.Iterator namespaceIterator = 
env.getBody().getNamespacesInScope();
 while (namespaceIterator.hasNext()) {
 org.apache.axiom.om.OMNamespace ns = (org.apache.axiom.om.OMNamespace) 
namespaceIterator.next();
 returnMap.put(ns.getPrefix(),ns.getNamespaceURI());
@@ -627,7 +627,7 @@
 */
 private java.util.Map 
getEnvelopeNamespaces(org.apache.axiom.soap.SOAPEnvelope env){
 java.util.Map returnMap = new java.util.HashMap();
-java.util.Iterator namespaceIterator = env.getAllDeclaredNamespaces();
+java.util.Iterator namespaceIterator = 
env.getBody().getNamespacesInScope();
 while (namespaceIterator.hasNext()) {
 org.apache.axiom.om.OMNamespace ns = (org.apache.axiom.om.OMNamespace) 
namespaceIterator.next();
 returnMap.put(ns.getPrefix(),ns.getNamespaceURI());