Author: veithen
Date: Sun Jul 11 20:57:25 2010
New Revision: 963148
URL: http://svn.apache.org/viewvc?rev=963148&view=rev
Log:
Merged r963147 to the 1.5 branch.
Modified:
axis/axis2/java/core/branches/java/1_5/ (props changed)
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/local/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
(props changed)
Propchange: axis/axis2/java/core/branches/java/1_5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 11 20:57:25 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk:944347,944915,951385,963081
+/axis/axis2/java/core/trunk:944347,944915,951385,963081,963147
/webservices/axis2/trunk/java:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,801630,803725,834058,904780
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 11 20:57:25 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:944347,944915,951385,963081
+/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:944347,944915,951385,963081,963147
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:761709,771051,801630,803725,834058,904780
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 11 20:57:25 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:944347,944915,951385,963081
+/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:944347,944915,951385,963081,963147
/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:761709,771051,801630,803725,834058,904780
Modified: axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml?rev=963148&r1=963147&r2=963148&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml Sun Jul 11
20:57:25 2010
@@ -103,7 +103,7 @@
<eclipse.plugins.version>1.4.0</eclipse.plugins.version>
<eclipse.version>3.2.0</eclipse.version>
<fi.version>1.1.8</fi.version>
-
<geronimo.spec.activation.version>1.0.1</geronimo.spec.activation.version>
+
<geronimo.spec.activation.version>1.0.2</geronimo.spec.activation.version>
<geronimo.spec.annotation.version>1.1</geronimo.spec.annotation.version>
<geronimo.spec.javamail.version>1.6</geronimo.spec.javamail.version>
<geronimo.spec.stax.version>1.0.1</geronimo.spec.stax.version>
@@ -137,7 +137,7 @@
<stax.api.version>1.0.1</stax.api.version>
<stax.impl.artifact>wstx-asl</stax.impl.artifact>
<stax.impl.groupid>org.codehaus.woodstox</stax.impl.groupid>
- <stax.impl.version>3.2.4</stax.impl.version>
+ <stax.impl.version>3.2.9</stax.impl.version>
<tomcat.version>6.0.16</tomcat.version>
<woden.version>1.0M8</woden.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 11 20:57:25 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:944347,944915,951385,963081
+/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:944347,944915,951385,963081,963147
/webservices/axis2/trunk/java/modules/transport/http/pom.xml:771051,801630,803725,834058,904780
Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 11 20:57:25 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/http/src:944347,944915,951385,963081
+/axis/axis2/java/core/trunk/modules/transport/http/src:944347,944915,951385,963081,963147
/webservices/axis2/trunk/java/modules/transport/http/src:771051,801630,803725,834058,904780
Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/local/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 11 20:57:25 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/local:944347,944915,951385,963081
+/axis/axis2/java/core/trunk/modules/transport/local:944347,944915,951385,963081,963147
/webservices/axis2/trunk/java/modules/transport/local:771051,801630,803725,834058,904780
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 11 20:57:25 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:944347,944915,951385,963081
+/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:944347,944915,951385,963081,963147
/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:761709,771051,801630,803725,834058,904780
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 11 20:57:25 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:944347,944915,951385,963081
+/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:944347,944915,951385,963081,963147
/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:761709,771051,801630,803725,834058,904780
