Author: veithen
Date: Wed Jul 21 20:51:24 2010
New Revision: 966415
URL: http://svn.apache.org/viewvc?rev=966415&view=rev
Log:
Merged r807160, r960693, r960976, r961964, r962844 and r966401 to the 1.5
branch. This avoids local repository corruption caused by usage of previous
versions of the AAR/MAR plugins.
Modified:
axis/axis2/java/core/branches/java/1_5/ (props changed)
axis/axis2/java/core/branches/java/1_5/modules/addressing/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/distribution/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/jaxws-mar/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/mex/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/mtompolicy-mar/pom.xml
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/ping/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/samples/version/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/scripting/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/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 Wed Jul 21 20:51:24 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk:922914,922983,944347,944915,951385,960978,960984,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371
-/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,834058,834175,904780,905980
+/axis/axis2/java/core/trunk:922914,922983,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
+/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
Modified: axis/axis2/java/core/branches/java/1_5/modules/addressing/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/addressing/pom.xml?rev=966415&r1=966414&r2=966415&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/addressing/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/addressing/pom.xml Wed Jul
21 20:51:24 2010
@@ -84,7 +84,6 @@
<plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mar-maven-plugin</artifactId>
- <version>1.5.1</version>
<extensions>true</extensions>
<configuration>
<includeDependencies>false</includeDependencies>
Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 21 20:51:24 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/distribution:922914,922983,936434,944347,944915,951385,960978,960984,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371
-/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,834058,834175,904780,905980
+/axis/axis2/java/core/trunk/modules/distribution:922914,922983,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
+/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
Modified: axis/axis2/java/core/branches/java/1_5/modules/jaxws-mar/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/jaxws-mar/pom.xml?rev=966415&r1=966414&r2=966415&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/jaxws-mar/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/jaxws-mar/pom.xml Wed Jul 21
20:51:24 2010
@@ -99,7 +99,6 @@
<plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mar-maven-plugin</artifactId>
- <version>1.5.1</version>
<extensions>true</extensions>
<configuration>
<includeDependencies>false</includeDependencies>
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 Wed Jul 21 20:51:24 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:922914,922983,944347,944915,951385,960978,960984,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371
-/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:733539,761709,771051,777897,777934,801630,803725,805999,834058,834175,904780,905980
+/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:922914,922983,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
+/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
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 Wed Jul 21 20:51:24 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:922914,922983,944347,944915,951385,960978,960984,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371
-/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:733539,761709,771051,777897,777934,801630,803725,805999,834058,834175,904780,905980
+/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:922914,922983,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
+/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
Modified: axis/axis2/java/core/branches/java/1_5/modules/mex/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/mex/pom.xml?rev=966415&r1=966414&r2=966415&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/mex/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/mex/pom.xml Wed Jul 21
20:51:24 2010
@@ -85,7 +85,6 @@
<plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mar-maven-plugin</artifactId>
- <version>1.5.1</version>
<extensions>true</extensions>
<executions>
<execution>
Modified: axis/axis2/java/core/branches/java/1_5/modules/mtompolicy-mar/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/mtompolicy-mar/pom.xml?rev=966415&r1=966414&r2=966415&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/mtompolicy-mar/pom.xml
(original)
+++ axis/axis2/java/core/branches/java/1_5/modules/mtompolicy-mar/pom.xml Wed
Jul 21 20:51:24 2010
@@ -83,7 +83,6 @@
<plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mar-maven-plugin</artifactId>
- <version>1.5.1</version>
<extensions>true</extensions>
<configuration>
<includeDependencies>false</includeDependencies>
Propchange: axis/axis2/java/core/branches/java/1_5/modules/parent/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 21 20:51:24 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/parent:922914,922983,936434,944347,944915,951385,960978,960984,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371
-/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,834058,834175,904780,905980
+/axis/axis2/java/core/trunk/modules/parent:922914,922983,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
+/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
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=966415&r1=966414&r2=966415&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 Wed Jul 21
20:51:24 2010
@@ -519,6 +519,18 @@
</releases>
</pluginRepository>
<pluginRepository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>daily</updatePolicy>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
+ <pluginRepository>
<id>ws-zones</id>
<name>Apache WS Zones Repository</name>
<url>http://ws.zones.apache.org/repository2</url>
@@ -1248,6 +1260,25 @@
<artifactId>maven-bundle-plugin</artifactId>
<version>2.1.0</version>
</plugin>
+
+ <!-- Unfortunately we can't use the 1.5.1 versions here
because this would result
+ in corruption of the local Maven repository. The reason
is that
+ the POMs of the 1.5.1 plugins refer to an incorrect
java.net
+ repository. When Maven loads one of these plugins, it will
+ load dependencies using this repository and these
artifacts
+ are corrupted (they are replaced by an HTML page). Note
that we may
+ later use 1.5.2 (once that version is released) here to
avoid
+ the chicken and egg problem. -->
+ <plugin>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-aar-maven-plugin</artifactId>
+ <version>1.5.2-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-mar-maven-plugin</artifactId>
+ <version>1.5.2-SNAPSHOT</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
Modified: axis/axis2/java/core/branches/java/1_5/modules/ping/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/ping/pom.xml?rev=966415&r1=966414&r2=966415&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/ping/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/ping/pom.xml Wed Jul 21
20:51:24 2010
@@ -85,7 +85,6 @@
<plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mar-maven-plugin</artifactId>
- <version>1.5.1</version>
<extensions>true</extensions>
<configuration>
<includeDependencies>false</includeDependencies>
Modified: axis/axis2/java/core/branches/java/1_5/modules/samples/version/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/samples/version/pom.xml?rev=966415&r1=966414&r2=966415&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/samples/version/pom.xml
(original)
+++ axis/axis2/java/core/branches/java/1_5/modules/samples/version/pom.xml Wed
Jul 21 20:51:24 2010
@@ -58,7 +58,6 @@
<plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-aar-maven-plugin</artifactId>
- <version>1.5.1</version>
<extensions>true</extensions>
<configuration>
<servicesXmlFile>${basedir}/src/sample/axisversion/META-INF/services.xml</servicesXmlFile>
Modified: axis/axis2/java/core/branches/java/1_5/modules/scripting/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/scripting/pom.xml?rev=966415&r1=966414&r2=966415&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/scripting/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/scripting/pom.xml Wed Jul 21
20:51:24 2010
@@ -110,7 +110,6 @@
<plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mar-maven-plugin</artifactId>
- <version>1.5.1</version>
<extensions>true</extensions>
<configuration>
<includeDependencies>false</includeDependencies>
Modified: axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/pom.xml?rev=966415&r1=966414&r2=966415&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/pom.xml
(original)
+++ axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/pom.xml Wed Jul
21 20:51:24 2010
@@ -108,7 +108,6 @@
<plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mar-maven-plugin</artifactId>
- <version>1.5.1</version>
<extensions>true</extensions>
<configuration>
<includeDependencies>false</includeDependencies>
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 21 20:51:24 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:922914,922983,944347,944915,951385,960978,960984,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371
-/webservices/axis2/trunk/java/modules/transport/http/pom.xml:733539,771051,777897,777934,801630,803725,805999,834058,834175,904780,905980
+/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:922914,922983,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
+/webservices/axis2/trunk/java/modules/transport/http/pom.xml:733539,771051,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 Wed Jul 21 20:51:24 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/http/src:922914,922983,944347,944915,951385,960978,960984,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371
-/webservices/axis2/trunk/java/modules/transport/http/src:733539,771051,777897,777934,801630,803725,805999,834058,834175,904780,905980
+/axis/axis2/java/core/trunk/modules/transport/http/src:922914,922983,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
+/webservices/axis2/trunk/java/modules/transport/http/src:733539,771051,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 Wed Jul 21 20:51:24 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/local:922914,922983,944347,944915,951385,960978,960984,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371
-/webservices/axis2/trunk/java/modules/transport/local:733539,771051,777897,777934,801630,803725,805999,834058,834175,904780,905980
+/axis/axis2/java/core/trunk/modules/transport/local:922914,922983,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
+/webservices/axis2/trunk/java/modules/transport/local:733539,771051,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 Wed Jul 21 20:51:24 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:922914,922983,944347,944915,951385,960978,960984,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371
-/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:733539,761709,771051,777897,777934,801630,803725,805999,834058,834175,904780,905980
+/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:922914,922983,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
+/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
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 Wed Jul 21 20:51:24 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:922914,922983,944347,944915,951385,960978,960984,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371
-/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:733539,761709,771051,777897,777934,801630,803725,805999,834058,834175,904780,905980
+/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:922914,922983,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
+/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
