Author: veithen
Date: Sat Jul 17 13:17:10 2010
New Revision: 965070
URL: http://svn.apache.org/viewvc?rev=965070&view=rev
Log:
Merged r834175, r960995 and r965068 to the 1.5 branch. This updates the build
to org.apache:apache:7 and fixes some issues in the POM files.
Reverted r958361 which is no longer necessary.
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/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/samples/java_first_jaxws/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/samples/jaxws-samples/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-ant-plugin/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-service-plugin/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-idea-plugin/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)
axis/axis2/java/core/branches/java/1_5/pom.xml
Propchange: axis/axis2/java/core/branches/java/1_5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 17 13:17:10 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk:922914,922983,944347,944915,951385,963081,963147,965032,965036,965056
-/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,777897,777934,801630,803725,834058,904780
+/axis/axis2/java/core/trunk:922914,922983,944347,944915,951385,960995,963081,963147,965032,965036,965056,965068
+/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,777897,777934,801630,803725,834058,834175,904780
Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 17 13:17:10 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/distribution:922914,922983,936434,944347,944915,951385,963081,963147,965032,965036,965056
-/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,834058,904780
+/axis/axis2/java/core/trunk/modules/distribution:922914,922983,936434,944347,944915,951385,960995,963081,963147,965032,965036,965056,965068
+/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,834058,834175,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 Sat Jul 17 13:17:10 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,963081,963147,965032,965036,965056
-/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:761709,771051,777897,777934,801630,803725,834058,904780
+/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:922914,922983,944347,944915,951385,960995,963081,963147,965032,965036,965056,965068
+/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:761709,771051,777897,777934,801630,803725,834058,834175,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 Sat Jul 17 13:17:10 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,963081,963147,965032,965036,965056
-/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:761709,771051,777897,777934,801630,803725,834058,904780
+/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:922914,922983,944347,944915,951385,960995,963081,963147,965032,965036,965056,965068
+/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:761709,771051,777897,777934,801630,803725,834058,834175,904780
Propchange: axis/axis2/java/core/branches/java/1_5/modules/parent/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 17 13:17:10 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/parent:922914,922983,936434,944347,944915,951385,963081,963147,965032,965036,965056
-/webservices/axis2/trunk/java/modules/parent:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,834058,904780
+/axis/axis2/java/core/trunk/modules/parent:922914,922983,936434,944347,944915,951385,960995,963081,963147,965032,965036,965056,965068
+/webservices/axis2/trunk/java/modules/parent:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,834058,834175,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=965070&r1=965069&r2=965070&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 Sat Jul 17
13:17:10 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>3</version>
+ <version>7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.axis2</groupId>
@@ -107,7 +107,7 @@
<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.3</maven.plugin.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>
<maven.war.version>2.0.2</maven.war.version>
@@ -457,19 +457,6 @@
Checksum policy when not specified always defaults to 'warn'
which is what we want.
-->
- <!-- Override the Apache snapshot repository defined in
- org.apache:apache:3 with the new Nexus snapshot
- repository. Note: the 1.5 is not ready to use a more
- recent version of org.apache:apache but needs snapshots
- from the new snapshot repository (e.g. Axiom). -->
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
<repository>
<releases>
<enabled>true</enabled>
@@ -1260,7 +1247,7 @@
</plugin>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
- <version>2.3</version>
+ <version>2.5</version>
</plugin>
<plugin>
<artifactId>maven-rar-plugin</artifactId>
Modified:
axis/axis2/java/core/branches/java/1_5/modules/samples/java_first_jaxws/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/samples/java_first_jaxws/pom.xml?rev=965070&r1=965069&r2=965070&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/samples/java_first_jaxws/pom.xml
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/samples/java_first_jaxws/pom.xml
Sat Jul 17 13:17:10 2010
@@ -254,8 +254,8 @@
</repository>
<repository>
<id>java.net</id>
- <url>https://maven-repository.dev.java.net/nonav/repository/</url>
- <layout>legacy</layout>
+ <url>http://download.java.net/maven/2/</url>
+ <layout>default</layout>
<snapshots>
<enabled>false</enabled>
</snapshots>
Modified:
axis/axis2/java/core/branches/java/1_5/modules/samples/jaxws-samples/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/samples/jaxws-samples/pom.xml?rev=965070&r1=965069&r2=965070&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/samples/jaxws-samples/pom.xml
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/samples/jaxws-samples/pom.xml
Sat Jul 17 13:17:10 2010
@@ -271,17 +271,17 @@
<url>http://www.apache.org/dist/java-repository/</url>
<layout>legacy</layout>
</repository>
- <repository>
- <id>java.net</id>
- <url>https://maven-repository.dev.java.net/nonav/repository/</url>
- <layout>legacy</layout>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
+ <repository>
+ <id>java.net</id>
+ <url>http://download.java.net/maven/2/</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
</repositories>
</project>
Modified:
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-ant-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-ant-plugin/pom.xml?rev=965070&r1=965069&r2=965070&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-ant-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-ant-plugin/pom.xml
Sat Jul 17 13:17:10 2010
@@ -30,7 +30,6 @@
</parent>
<artifactId>axis2-ant-plugin</artifactId>
<name>Apache Axis2 - tool - Ant Plugin</name>
- <packaging>maven-plugin</packaging>
<description>The Axis 2 Plugin for Ant Tasks.</description>
<dependencies>
<dependency>
Modified:
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?rev=965070&r1=965069&r2=965070&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
Sat Jul 17 13:17:10 2010
@@ -30,7 +30,6 @@
</parent>
<artifactId>axis2.eclipse.codegen.plugin</artifactId>
<name>Apache Axis2 - tool - Eclipse Codegen Plugin</name>
- <packaging>maven-plugin</packaging>
<description>The Axis 2 Eclipse Codegen Plugin for wsdl2java and
java2wsdl</description>
<dependencies>
<dependency>
Modified:
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-service-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-service-plugin/pom.xml?rev=965070&r1=965069&r2=965070&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-service-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-service-plugin/pom.xml
Sat Jul 17 13:17:10 2010
@@ -30,7 +30,6 @@
</parent>
<artifactId>axis2.eclipse.service.plugin</artifactId>
<name>Apache Axis2 - tool - Eclipse service Plugin</name>
- <packaging>maven-plugin</packaging>
<description>The Axis 2 Eclipse Service Plugin for Service archive
creation</description>
<dependencies>
<dependency>
Modified:
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-idea-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-idea-plugin/pom.xml?rev=965070&r1=965069&r2=965070&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-idea-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-idea-plugin/pom.xml
Sat Jul 17 13:17:10 2010
@@ -29,7 +29,6 @@
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<artifactId>axis2-idea-plugin</artifactId>
- <packaging>maven-plugin</packaging>
<name>Apache Axis2 - tool - Intellij IDEA Plugin</name>
<description>
A Intellij IDEA plugin for Service Archive creation and Code Generation
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 17 13:17:10 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:922914,922983,944347,944915,951385,963081,963147,965032,965036,965056
-/webservices/axis2/trunk/java/modules/transport/http/pom.xml:771051,777897,777934,801630,803725,834058,904780
+/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:922914,922983,944347,944915,951385,960995,963081,963147,965032,965036,965056,965068
+/webservices/axis2/trunk/java/modules/transport/http/pom.xml:771051,777897,777934,801630,803725,834058,834175,904780
Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 17 13:17:10 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/http/src:922914,922983,944347,944915,951385,963081,963147,965032,965036,965056
-/webservices/axis2/trunk/java/modules/transport/http/src:771051,777897,777934,801630,803725,834058,904780
+/axis/axis2/java/core/trunk/modules/transport/http/src:922914,922983,944347,944915,951385,960995,963081,963147,965032,965036,965056,965068
+/webservices/axis2/trunk/java/modules/transport/http/src:771051,777897,777934,801630,803725,834058,834175,904780
Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/local/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 17 13:17:10 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/local:922914,922983,944347,944915,951385,963081,963147,965032,965036,965056
-/webservices/axis2/trunk/java/modules/transport/local:771051,777897,777934,801630,803725,834058,904780
+/axis/axis2/java/core/trunk/modules/transport/local:922914,922983,944347,944915,951385,960995,963081,963147,965032,965036,965056,965068
+/webservices/axis2/trunk/java/modules/transport/local:771051,777897,777934,801630,803725,834058,834175,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 Sat Jul 17 13:17:10 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,963081,963147,965032,965036,965056
-/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:761709,771051,777897,777934,801630,803725,834058,904780
+/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:922914,922983,944347,944915,951385,960995,963081,963147,965032,965036,965056,965068
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:761709,771051,777897,777934,801630,803725,834058,834175,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 Sat Jul 17 13:17:10 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,963081,963147,965032,965036,965056
-/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:761709,771051,777897,777934,801630,803725,834058,904780
+/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:922914,922983,944347,944915,951385,960995,963081,963147,965032,965036,965056,965068
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:761709,771051,777897,777934,801630,803725,834058,834175,904780
Modified: axis/axis2/java/core/branches/java/1_5/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/pom.xml?rev=965070&r1=965069&r2=965070&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/pom.xml Sat Jul 17 13:17:10 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>3</version>
+ <version>7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.axis2</groupId>
