Author: veithen
Date: Sun Aug 1 21:21:38 2010
New Revision: 981320
URL: http://svn.apache.org/viewvc?rev=981320&view=rev
Log:
Merged r777882 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/distribution/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml
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/ (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 Aug 1 21:21:38 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981221,981262,981278
-/webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
+/webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 21:21:38 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,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,979882-979883,979886,981036,981038,981095,981188,981221,981262,981278
-/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
+/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
Modified: axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml?rev=981320&r1=981319&r2=981320&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml
(original)
+++ axis/axis2/java/core/branches/java/1_5/modules/distribution/pom.xml Sun Aug
1 21:21:38 2010
@@ -190,7 +190,6 @@
<!-- This builds the Axis2 repository with the modules and
services -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven.assembly.version}</version>
<executions>
<execution>
<phase>generate-resources</phase>
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 Aug 1 21:21:38 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981221,981262,981278
-/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:733539,761709,771051,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
+/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:733539,761709,771051,777882,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
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 Aug 1 21:21:38 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981221,981262,981278
-/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:733539,761709,771051,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
+/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:733539,761709,771051,777882,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
Propchange: axis/axis2/java/core/branches/java/1_5/modules/parent/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 21:21:38 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/parent:922914,922983,935169,935174,935338,936434,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,979882-979883,979886,981036,981038,981095,981188,981221,981262,981278
-/webservices/axis2/trunk/java/modules/parent:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
+/webservices/axis2/trunk/java/modules/parent:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
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=981320&r1=981319&r2=981320&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 Aug 1
21:21:38 2010
@@ -103,7 +103,6 @@
<maven.antrun.version>1.1</maven.antrun.version>
<maven.archiver.version>2.2</maven.archiver.version>
<maven.artifact.version>2.0.8</maven.artifact.version>
- <maven.assembly.version>2.2-beta-2</maven.assembly.version>
<maven.plugin.version>2.5</maven.plugin.version>
<maven.plugin.testing.version>1.1</maven.plugin.testing.version>
<maven.version>2.0.7</maven.version>
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 21:21:38 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981221,981262,981278
-/webservices/axis2/trunk/java/modules/transport/http/pom.xml:733539,771051,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
+/webservices/axis2/trunk/java/modules/transport/http/pom.xml:733539,771051,777882,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 21:21:38 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/transport/http/src:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981221,981262,981278
-/webservices/axis2/trunk/java/modules/transport/http/src:733539,771051,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
+/webservices/axis2/trunk/java/modules/transport/http/src:733539,771051,777882,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/local/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 1 21:21:38 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/transport/local:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981221,981262,981278
-/webservices/axis2/trunk/java/modules/transport/local:733539,771051,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
+/webservices/axis2/trunk/java/modules/transport/local:733539,771051,777882,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
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 Aug 1 21:21:38 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981221,981262,981278
-/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:733539,761709,771051,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:733539,761709,771051,777882,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
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 Aug 1 21:21:38 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981221,981262,981278
-/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:733539,761709,771051,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:733539,761709,771051,777882,777897,777934,801630,803725,805999,807160,834058,834175,904780,905980
