svn commit: r1100583 - in /axis/axis2/java/core/branches/1_5: ./ modules/distribution/ modules/kernel/src/org/apache/axis2/engine/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kern

2011-05-07 Thread veithen 
Author: veithen
Date: Sat May  7 18:16:48 2011
New Revision: 1100583

URL: http://svn.apache.org/viewvc?rev=1100583&view=rev
Log:
AXIS2-4448: Merged r797969 to the 1.5 branch.

Modified:
axis/axis2/java/core/branches/1_5/   (props changed)
axis/axis2/java/core/branches/1_5/modules/distribution/   (props changed)

axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/engine/DefaultObjectSupplier.java

axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
   (props changed)

axis/axis2/java/core/branches/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
   (props changed)
axis/axis2/java/core/branches/1_5/modules/parent/   (props changed)

axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java
   (props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/   (props 
changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml   
(props changed)

axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
   (props changed)

axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
   (props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/   (props 
changed)

axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/
   (props changed)

axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/
   (props changed)
axis/axis2/java/core/branches/1_5/modules/tool/axis2-repo-maven-plugin/   
(props changed)
axis/axis2/java/core/branches/1_5/modules/transport/http/pom.xml   (props 
changed)
axis/axis2/java/core/branches/1_5/modules/transport/http/src/   (props 
changed)
axis/axis2/java/core/branches/1_5/modules/transport/local/   (props changed)

axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
   (props changed)

axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
   (props changed)

Propchange: axis/axis2/java/core/branches/1_5/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May  7 18:16:48 2011
@@ -1,2 +1,2 @@
 
/axis/axis2/java/core/trunk:922914,922941,922983,935122,935169,935174,935338,937004,937237,939924,944074,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,966536,979882-979883,979886,980242,981036,981038,981055-981056,981058,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,981992,982008,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,103
 
2694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1088239,1088249,1088251,1088268,1091191
-/webservices/axis2/trunk/java:728674,729037,731798,732539,732541,732873,732877,732924,732927,732939,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733776,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741873,741878,741881,748761,751958,752906,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761068,761709,761770,761952,763148,765102,771051,776555,776612,777648,777882,777897,777934,778060,780546,783479,783869,783873,787379,788202,795431,801630,802447,803725,804541,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823125,823960,834058,834175,889783,896320,902271,904660,904780,905783,905980,908318
+/webservices/axis2/trunk/java:728674,729037,731798,732539,732541,732873,732877,732924,732927,732939,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733776,733900,733910,734227,734237,734261,738057,738067,738071,

svn commit: r1100586 - /axis/axis2/java/core/branches/1_6/

2011-05-07 Thread veithen 
Author: veithen
Date: Sat May  7 18:35:40 2011
New Revision: 1100586

URL: http://svn.apache.org/viewvc?rev=1100586&view=rev
Log:
Added svn:mergeinfo missing in r1099397.

Modified:
axis/axis2/java/core/branches/1_6/   (props changed)

Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May  7 18:35:40 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1087073,1088239,1088248-1088249,1088251,1088268,1091178,1091191
+/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1087073,1088239,1088248-1088249,1088251,1088268,1091178,1091191,1099385,1099389

svn commit: r1100628 - in /axis/axis2/java/core/trunk/modules/saaj: src/org/apache/axis2/saaj/SOAPElementImpl.java test/org/apache/axis2/saaj/SOAPHeaderTest.java

2011-05-07 Thread veithen 
Author: veithen
Date: Sat May  7 21:24:10 2011
New Revision: 1100628

URL: http://svn.apache.org/viewvc?rev=1100628&view=rev
Log:
AXIS2-5006: Fixed an issue in SOAPElementImpl#copyContents that causes 
incorrect behavior when using appendChild to add a non SOAPHeaderElement to a 
SOAPHeader.

Modified:

axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java

axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/SOAPHeaderTest.java

Modified: 
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java?rev=1100628&r1=1100627&r2=1100628&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
 Sat May  7 21:24:10 2011
@@ -933,9 +933,8 @@ public class SOAPElementImpl extends Nod
 childEle.addAttribute(name, node.getValue());
 }
 
-NodeList children = child.getChildNodes();
-for (int i = 0; i < children.getLength(); i++) {
-Node node = children.item(i);
+Node node;
+while ((node = child.getFirstChild()) != null) {
 childEle.appendChild(node);
 }
 }

Modified: 
axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/SOAPHeaderTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/SOAPHeaderTest.java?rev=1100628&r1=1100627&r2=1100628&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/SOAPHeaderTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/SOAPHeaderTest.java
 Sat May  7 21:24:10 2011
@@ -423,4 +423,22 @@ public class SOAPHeaderTest extends Asse
 assertEquals("DEF", text.getData());
 assertFalse(iter.hasNext());   
 }
+
+@Validated @Test
+public void testAXIS2_5006() throws Exception {
+MessageFactory fact = MessageFactory.newInstance();
+SOAPMessage message = fact.createMessage();
+SOAPHeader header = message.getSOAPHeader();
+
+Document doc = message.getSOAPPart();
+Element orgElement = doc.createElementNS("urn:ns", "ns:test");
+orgElement.appendChild(doc.createElementNS(null, "child1"));
+orgElement.appendChild(doc.createElementNS(null, "child2"));
+orgElement.appendChild(doc.createElementNS(null, "child3"));
+header.appendChild(orgElement);
+
+SOAPElement element = (SOAPElement)header.getChildElements().next();
+assertTrue(element instanceof SOAPHeaderElement);
+assertEquals(3, element.getChildNodes().getLength());
+}
 }
\ No newline at end of file

svn commit: r1100630 - in /axis/axis2/java/core/branches/1_6: ./ modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java modules/saaj/test/org/apache/axis2/saaj/SOAPHeaderTest.java

2011-05-07 Thread veithen 
Author: veithen
Date: Sat May  7 21:28:03 2011
New Revision: 1100630

URL: http://svn.apache.org/viewvc?rev=1100630&view=rev
Log:
AXIS2-5006: Merged r1100628 to the 1.6 branch.

Modified:
axis/axis2/java/core/branches/1_6/   (props changed)

axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java

axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/SOAPHeaderTest.java

Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May  7 21:28:03 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1087073,1088239,1088248-1088249,1088251,1088268,1091178,1091191,1099385,1099389
+/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1087073,1088239,1088248-1088249,1088251,1088268,1091178,1091191,1099385,1099389,1100628

Modified: 
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java?rev=1100630&r1=1100629&r2=1100630&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
 Sat May  7 21:28:03 2011
@@ -933,9 +933,8 @@ public class SOAPElementImpl extends Nod
 childEle.addAttribute(name, node.getValue());
 }
 
-NodeList children = child.getChildNodes();
-for (int i = 0; i < children.getLength(); i++) {
-Node node = children.item(i);
+Node node;
+while ((node = child.getFirstChild()) != null) {
 childEle.appendChild(node);
 }
 }

Modified: 
axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/SOAPHeaderTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/SOAPHeaderTest.java?rev=1100630&r1=1100629&r2=1100630&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/SOAPHeaderTest.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/saaj/test/org/apache/axis2/saaj/SOAPHeaderTest.java
 Sat May  7 21:28:03 2011
@@ -423,4 +423,22 @@ public class SOAPHeaderTest extends Asse
 assertEquals("DEF", text.getData());
 assertFalse(iter.hasNext());   
 }
+
+@Validated @Test
+public void testAXIS2_5006() throws Exception {
+MessageFactory fact = MessageFactory.newInstance();
+SOAPMessage message = fact.createMessage();
+SOAPHeader header = message.getSOAPHeader();
+
+Document doc = message.getSOAPPart();
+Element orgElement = doc.createElementNS("urn:ns", "ns:test");
+orgElement.appendChild(doc.createElementNS(null, "child1"));
+orgElement.appendChild(doc.createElementNS(null, "child2"));
+orgElement.appendChild(doc.createElementNS(null, "child3"));
+header.appendChild(orgElement);
+
+SOAPElement element = (SOAPElement)header.getChildElements().next();
+assertTrue(element instanceof SOAPHeaderElement);
+assertEquals(3, element.getChildNodes().getLength());
+}
 }
\ No newline at end of file