Author: veithen
Date: Sat Oct 1 22:48:18 2011
New Revision: 1178101
URL: http://svn.apache.org/viewvc?rev=1178101&view=rev
Log:
RAMPART-336: Merged r1177413 to the 1.6 branch and updated the dependencies.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
axis/axis2/java/rampart/branches/1_6/pom.xml
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 1 22:48:18 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java?rev=1178101&r1=1178100&r2=1178101&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
Sat Oct 1 22:48:18 2011
@@ -195,10 +195,6 @@ public class Axis2Util {
// it is a header we have added in rampart eg.
EncryptedHeader and should
// be converted to SOAPHeaderBlock for processing
} else {
- // First detach element from soap header
- element.detach();
-
- // add new element
header =
soapHeader.addHeaderBlock(element.getLocalName(), element.getNamespace());
Iterator attrIter = element.getAllAttributes();
while (attrIter.hasNext()) {
@@ -213,17 +209,14 @@ public class Axis2Util {
// retrieve all child nodes (including any text
nodes)
// and re-attach to header block
Iterator children = element.getChildren();
-
- // Element is a composite element, in which it has
many siblings.
- // All siblings will be added when we add a single
node.
- // See ParentNode.insertBefore(Node newChild, Node
refChild) for
- // more information.
- if (children.hasNext()) {
+ while (children.hasNext()) {
OMNode child = (OMNode)children.next();
children.remove();
header.addChild(child);
}
-
+
+ element.detach();
+
soapHeader.build();
header.setProcessed();
Modified: axis/axis2/java/rampart/branches/1_6/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/pom.xml?rev=1178101&r1=1178100&r2=1178101&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/pom.xml Sat Oct 1 22:48:18 2011
@@ -388,8 +388,8 @@
</modules>
<properties>
- <axis2.version>1.6.1</axis2.version>
- <axiom.version>1.2.12</axiom.version>
+ <axis2.version>1.6.2-SNAPSHOT</axis2.version>
+ <axiom.version>1.2.13-SNAPSHOT</axiom.version>
<wss4j.version>1.5.12</wss4j.version>
<opensaml.version>1.1</opensaml.version>
