svn commit: r1135075 - /axis/axis2/java/core/trunk/etc/doap_Axis2.rdf
Author: veithen Date: Mon Jun 13 10:15:14 2011 New Revision: 1135075 URL: http://svn.apache.org/viewvc?rev=1135075&view=rev Log: Added an entry for 1.5.5 to the DOAP file and corrected the date for 1.6.0. Modified: axis/axis2/java/core/trunk/etc/doap_Axis2.rdf Modified: axis/axis2/java/core/trunk/etc/doap_Axis2.rdf URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/etc/doap_Axis2.rdf?rev=1135075&r1=1135074&r2=1135075&view=diff == --- axis/axis2/java/core/trunk/etc/doap_Axis2.rdf (original) +++ axis/axis2/java/core/trunk/etc/doap_Axis2.rdf Mon Jun 13 10:15:14 2011 @@ -57,7 +57,8 @@ Apache Axis22010-09-061.5.2 Apache Axis22010-11-121.5.3 Apache Axis22010-12-191.5.4 -Apache Axis22010-05-171.6.0 +Apache Axis22011-05-291.5.5 +Apache Axis22011-05-171.6.0
svn commit: r1135078 - in /axis/axis2/java/rampart/branches/1_6: ./ modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
Author: veithen
Date: Mon Jun 13 10:28:18 2011
New Revision: 1135078
URL: http://svn.apache.org/viewvc?rev=1135078&view=rev
Log:
Merged r1134683 to the 1.6 branch to make sure that 1.6.1 will be compatible
with Axiom 1.2.12 and to fix a potential issue related to a slightly modified
iterator behavior in Axiom 1.2.11.
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
Propchange: axis/axis2/java/rampart/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 13 10:28:18 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1129515,1129552,1130570,1131278,1132548,1132564,1134446
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683
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=1135078&r1=1135077&r2=1135078&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
Mon Jun 13 10:28:18 2011
@@ -210,7 +210,7 @@ public class Axis2Util {
Iterator children = element.getChildren();
while (children.hasNext()) {
OMNode child = (OMNode)children.next();
- child.detach();
+ children.remove();
header.addChild(child);
}
svn commit: r1135080 - in /axis/axis2/java/rampart/branches/1_5_x: ./ modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
Author: veithen
Date: Mon Jun 13 10:36:30 2011
New Revision: 1135080
URL: http://svn.apache.org/viewvc?rev=1135080&view=rev
Log:
Merged r1134683 to the 1.5 branch to ensure compatibility with Axiom 1.2.12 and
to fix a potential issue related to a slightly modified iterator behavior when
using Axiom 1.2.11.
Modified:
axis/axis2/java/rampart/branches/1_5_x/ (props changed)
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
Propchange: axis/axis2/java/rampart/branches/1_5_x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 13 10:36:30 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072187,1083686
+/axis/axis2/java/rampart/trunk:1072187,1083686,1134683
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=1135080&r1=1135079&r2=1135080&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
Mon Jun 13 10:36:30 2011
@@ -208,7 +208,7 @@ public class Axis2Util {
Iterator children = element.getChildElements();
while (children.hasNext()) {
OMNode child = (OMNode)children.next();
- child.detach();
+ children.remove();
header.addChild(child);
}
svn commit: r1135093 - in /axis/axis2/java/rampart/branches/1_5_x: ./ legal/bcprov-LICENSE.txt legal/commons-lang-LICENSE.txt
Author: veithen Date: Mon Jun 13 11:26:14 2011 New Revision: 1135093 URL: http://svn.apache.org/viewvc?rev=1135093&view=rev Log: Added the missing license files also to the 1.5 branch to keep it in a releasable state. Added: axis/axis2/java/rampart/branches/1_5_x/legal/bcprov-LICENSE.txt - copied unchanged from r1132548, axis/axis2/java/rampart/trunk/legal/bcprov-LICENSE.txt axis/axis2/java/rampart/branches/1_5_x/legal/commons-lang-LICENSE.txt - copied unchanged from r1132548, axis/axis2/java/rampart/trunk/legal/commons-lang-LICENSE.txt Modified: axis/axis2/java/rampart/branches/1_5_x/ (props changed) Propchange: axis/axis2/java/rampart/branches/1_5_x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 13 11:26:14 2011 @@ -1 +1 @@ -/axis/axis2/java/rampart/trunk:1072187,1083686,1134683 +/axis/axis2/java/rampart/trunk:1072187,1083686,1132548,1134683
