You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2011/10/02 00:56:54 UTC
svn commit: r1178102 - in /axis/axis2/java/rampart/branches/1_5_x: ./
modules/documentation/src/site/xdoc/download/1.5.1/download.xml
modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
pom.xml
Author: veithen
Date: Sat Oct 1 22:56:53 2011
New Revision: 1178102
URL: http://svn.apache.org/viewvc?rev=1178102&view=rev
Log:
RAMPART-336: Merged r1177413 to the 1.5 branch and updated the dependencies.
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-core/src/main/java/org/apache/rampart/util/Axis2Util.java
axis/axis2/java/rampart/branches/1_5_x/pom.xml
Propchange: axis/axis2/java/rampart/branches/1_5_x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 1 22:56:53 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072178,1072180,1072182,1072187,1072313,1072316,1083686,1089599,1130570,1132548,1134683,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175324,1177260
+/axis/axis2/java/rampart/trunk:1072178,1072180,1072182,1072187,1072313,1072316,1083686,1089599,1130570,1132548,1134683,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175324,1177260,1177413
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 Sat Oct 1 22:56:53 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml:1072178,1072180,1072182,1072187,1072313,1072316,1083686,1089599,1130570,1131278,1132548,1134683,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175324,1177260
+/axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml:1072178,1072180,1072182,1072187,1072313,1072316,1083686,1089599,1130570,1131278,1132548,1134683,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175324,1177260,1177413
Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java?rev=1178102&r1=1178101&r2=1178102&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java (original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java Sat Oct 1 22:56:53 2011
@@ -194,10 +194,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()) {
@@ -210,17 +206,14 @@ public class Axis2Util {
header.declareNamespace(ns);
}
Iterator children = element.getChildElements();
-
- // 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_5_x/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/pom.xml?rev=1178102&r1=1178101&r2=1178102&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_5_x/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_5_x/pom.xml Sat Oct 1 22:56:53 2011
@@ -382,8 +382,8 @@
</modules>
<properties>
- <axis2.version>1.5.6</axis2.version>
- <axiom.version>1.2.12</axiom.version>
+ <axis2.version>1.5.7-SNAPSHOT</axis2.version>
+ <axiom.version>1.2.13-SNAPSHOT</axiom.version>
<wss4j.version>1.5.12</wss4j.version>
<opensaml.version>1.1</opensaml.version>