Author: veithen
Date: Wed Oct 19 19:13:50 2011
New Revision: 1186414
URL: http://svn.apache.org/viewvc?rev=1186414&view=rev
Log:
* RAMPART-324: Merged r1178193 to the 1.5 branch.
* Also merged r1075676 (addition of a test case) to avoid a merge conflict.
Added:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/policy/32.xml
- copied unchanged from r1075676,
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/policy/32.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/policy/33.xml
- copied unchanged from r1178193,
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/policy/33.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/services-32.xml
- copied unchanged from r1075676,
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/services-32.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/services-33.xml
- copied unchanged from r1178193,
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/services-33.xml
Modified:
axis/axis2/java/rampart/branches/1_5_x/ (props changed)
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
(props changed)
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/RequiredElementsBuilder.java
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ContentEncryptedElementsBuilder.java
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedElementsBuilder.java
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RequiredElementsBuilder.java
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedElementsBuilder.java
Propchange: axis/axis2/java/rampart/branches/1_5_x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 19:13:50 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1052172-1052173,1072178,1072180,1072182,1072187,1072313,1072316,1083686,1089599,1130570,1132548,1134683,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175324,1177260,1177413
+/axis/axis2/java/rampart/trunk:1052172-1052173,1072178,1072180,1072182,1072187,1072313,1072316,1075676,1083686,1089599,1130570,1132548,1134683,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175324,1177260,1177413,1178193
Propchange:
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 19:13:50 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml:1052172-1052173,1072178,1072180,1072182,1072187,1072313,1072316,1083686,1089599,1130570,1131278,1132548,1134683,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175324,1177260,1177413
+/axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml:1052172-1052173,1072178,1072180,1072182,1072187,1072313,1072316,1075676,1083686,1089599,1130570,1131278,1132548,1134683,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175324,1177260,1177413,1178193
Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml?rev=1186414&r1=1186413&r2=1186414&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
Wed Oct 19 19:13:50 2011
@@ -256,6 +256,14 @@
<jar
jarfile="target/test-resources/rampart_service_repo/services/SecureService31.aar"
basedir="target/temp-ramp"/>
+ <!-- Service 32 -->
+ <copy overwrite="yes"
file="src/test/resources/rampart/services-32.xml"
tofile="target/temp-ramp/META-INF/services.xml" />
+ <jar
jarfile="target/test-resources/rampart_service_repo/services/SecureService32.aar"
basedir="target/temp-ramp" />
+
+ <!-- Service 33 -->
+ <copy overwrite="yes"
file="src/test/resources/rampart/services-33.xml"
tofile="target/temp-ramp/META-INF/services.xml" />
+ <jar
jarfile="target/test-resources/rampart_service_repo/services/SecureService33.aar"
basedir="target/temp-ramp" />
+
<!-- Service SC-1 -->
<copy overwrite="yes"
file="src/test/resources/rampart/issuer.properties"
tofile="target/temp-ramp/issuer.properties" />
<copy overwrite="yes"
file="src/test/resources/rampart/services-sc-1.xml"
tofile="target/temp-ramp/META-INF/services.xml" />
Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java?rev=1186414&r1=1186413&r2=1186414&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
(original)
+++
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
Wed Oct 19 19:13:50 2011
@@ -16,6 +16,7 @@
package org.apache.rampart;
+import junit.framework.TestCase;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -23,21 +24,17 @@ import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.util.AXIOMUtil;
import org.apache.axiom.soap.SOAPHeaderBlock;
-import org.apache.axis2.Constants;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.context.MessageContext;
import org.apache.axis2.integration.UtilServer;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
-import org.apache.ws.security.handler.WSHandlerConstants;
-
-import junit.framework.TestCase;
public class RampartTest extends TestCase {
@@ -79,7 +76,7 @@ public class RampartTest extends TestCas
"Unlimited Strength Jurisdiction Policy !!!");
}
- for (int i = 1; i <= 31; 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;
Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java?rev=1186414&r1=1186413&r2=1186414&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java
(original)
+++
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java
Wed Oct 19 19:13:50 2011
@@ -64,7 +64,7 @@ public class EncryptedElementsBuilder im
private void processElement(OMElement element, SignedEncryptedElements
parent) {
if (SP11Constants.XPATH.equals(element.getQName())) {
parent.addXPathExpression(element.getText());
- Iterator namespaces = element.getAllDeclaredNamespaces();
+ Iterator namespaces = element.getNamespacesInScope();
while (namespaces.hasNext()) {
OMNamespace nm = (OMNamespace) namespaces.next();
parent.addDeclaredNamespaces(nm.getNamespaceURI(),
nm.getPrefix());
Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/RequiredElementsBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/RequiredElementsBuilder.java?rev=1186414&r1=1186413&r2=1186414&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/RequiredElementsBuilder.java
(original)
+++
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/RequiredElementsBuilder.java
Wed Oct 19 19:13:50 2011
@@ -56,7 +56,7 @@ public class RequiredElementsBuilder imp
QName name = element.getQName();
if (SP11Constants.XPATH.equals(name)) {
parent.addXPathExpression(element.getText());
- Iterator namespaces = element.getAllDeclaredNamespaces();
+ Iterator namespaces = element.getNamespacesInScope();
while (namespaces.hasNext()) {
OMNamespace nm = (OMNamespace) namespaces.next();
parent.addDeclaredNamespaces(nm.getNamespaceURI(),
nm.getPrefix());
Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java?rev=1186414&r1=1186413&r2=1186414&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java
(original)
+++
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java
Wed Oct 19 19:13:50 2011
@@ -62,7 +62,7 @@ public class SignedElementsBuilder imple
QName name = element.getQName();
if (SP11Constants.XPATH.equals(name)) {
parent.addXPathExpression(element.getText());
- Iterator namespaces = element.getAllDeclaredNamespaces();
+ Iterator namespaces = element.getNamespacesInScope();
while (namespaces.hasNext()) {
OMNamespace nm = (OMNamespace) namespaces.next();
parent.addDeclaredNamespaces(nm.getNamespaceURI(),
nm.getPrefix());
Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ContentEncryptedElementsBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ContentEncryptedElementsBuilder.java?rev=1186414&r1=1186413&r2=1186414&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ContentEncryptedElementsBuilder.java
(original)
+++
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ContentEncryptedElementsBuilder.java
Wed Oct 19 19:13:50 2011
@@ -56,7 +56,7 @@ public class ContentEncryptedElementsBui
QName name = element.getQName();
if (SP12Constants.XPATH.equals(name)) {
parent.addXPathExpression(element.getText());
- Iterator namespaces = element.getAllDeclaredNamespaces();
+ Iterator namespaces = element.getNamespacesInScope();
while (namespaces.hasNext()) {
OMNamespace nm = (OMNamespace) namespaces.next();
parent.addDeclaredNamespaces(nm.getNamespaceURI(),
nm.getPrefix());
Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedElementsBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedElementsBuilder.java?rev=1186414&r1=1186413&r2=1186414&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedElementsBuilder.java
(original)
+++
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedElementsBuilder.java
Wed Oct 19 19:13:50 2011
@@ -65,7 +65,7 @@ public class EncryptedElementsBuilder im
private void processElement(OMElement element, SignedEncryptedElements
parent) {
if (SP12Constants.XPATH.equals(element.getQName())) {
parent.addXPathExpression(element.getText());
- Iterator namespaces = element.getAllDeclaredNamespaces();
+ Iterator namespaces = element.getNamespacesInScope();
while (namespaces.hasNext()) {
OMNamespace nm = (OMNamespace) namespaces.next();
parent.addDeclaredNamespaces(nm.getNamespaceURI(),
nm.getPrefix());
Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RequiredElementsBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RequiredElementsBuilder.java?rev=1186414&r1=1186413&r2=1186414&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RequiredElementsBuilder.java
(original)
+++
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RequiredElementsBuilder.java
Wed Oct 19 19:13:50 2011
@@ -57,7 +57,7 @@ public class RequiredElementsBuilder imp
QName name = element.getQName();
if (SP12Constants.XPATH.equals(name)) {
parent.addXPathExpression(element.getText());
- Iterator namespaces = element.getAllDeclaredNamespaces();
+ Iterator namespaces = element.getNamespacesInScope();
while (namespaces.hasNext()) {
OMNamespace nm = (OMNamespace) namespaces.next();
parent.addDeclaredNamespaces(nm.getNamespaceURI(),
nm.getPrefix());
Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedElementsBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedElementsBuilder.java?rev=1186414&r1=1186413&r2=1186414&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedElementsBuilder.java
(original)
+++
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedElementsBuilder.java
Wed Oct 19 19:13:50 2011
@@ -63,7 +63,7 @@ public class SignedElementsBuilder imple
QName name = element.getQName();
if (SP12Constants.XPATH.equals(name)) {
parent.addXPathExpression(element.getText());
- Iterator namespaces = element.getAllDeclaredNamespaces();
+ Iterator namespaces = element.getNamespacesInScope();
while (namespaces.hasNext()) {
OMNamespace nm = (OMNamespace) namespaces.next();
parent.addDeclaredNamespaces(nm.getNamespaceURI(),
nm.getPrefix());
