Author: veithen
Date: Sat Jul 17 12:44:03 2010
New Revision: 965066
URL: http://svn.apache.org/viewvc?rev=965066&view=rev
Log:
Merged r777897 (as well as parts of r936434) to the 1.5 branch in order to
simplify the build of the distribution. This also allows us to get rid of the
*.mar.version properties which prevent us from automating the release process.
Added:
axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/repository.xml
- copied unchanged from r777897,
webservices/axis2/trunk/java/modules/distribution/src/main/assembly/repository.xml
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/distribution/src/main/assembly/bin-assembly.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 Sat Jul 17 12:44:03 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,777934,801630,803725,834058,904780
+/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
Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Jul 17 12:44:03 2010
@@ -0,0 +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
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=965066&r1=965065&r2=965066&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 Sat Jul
17 12:44:03 2010
@@ -41,186 +41,141 @@
<dependencies>
<dependency>
- <groupId>com.sun.xml.fastinfoset</groupId>
- <artifactId>FastInfoset</artifactId>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-java2wsdl</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tribes</artifactId>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>juli</artifactId>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-adb</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-codegen</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-adb-codegen</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-xmlbeans</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jibx</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-json</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-spring</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-fastinfoset</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jaxbri</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jaxws</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.jibx</groupId>
- <artifactId>jibx-bind</artifactId>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-metadata</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.jibx</groupId>
- <artifactId>jibx-run</artifactId>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-clustering</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-launcher</artifactId>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-saaj</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-ant-plugin</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>mex</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-corba</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.bcel</groupId>
- <artifactId>bcel</artifactId>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-mtompolicy</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-http</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-local</artifactId>
+ <version>${pom.version}</version>
</dependency>
+
<dependency>
- <groupId>${stax.impl.groupid}</groupId>
- <artifactId>${stax.impl.artifact}</artifactId>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>soapmonitor</artifactId>
+ <version>${pom.version}</version>
+ <type>mar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>addressing</artifactId>
+ <version>${pom.version}</version>
+ <type>mar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>ping</artifactId>
+ <version>${pom.version}</version>
+ <type>mar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-scripting</artifactId>
+ <version>${pom.version}</version>
+ <type>mar</type>
</dependency>
+
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-saaj_1.3_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- </dependency>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.woden</groupId>
- <artifactId>woden-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.woden</groupId>
- <artifactId>woden-impl-dom</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>rhino</groupId>
- <artifactId>js</artifactId>
- </dependency>
- <dependency>
- <groupId>bsf</groupId>
- <artifactId>bsf</artifactId>
- </dependency>
- <dependency>
- <groupId>jalopy</groupId>
- <artifactId>jalopy</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>xml-resolver</groupId>
- <artifactId>xml-resolver</artifactId>
- </dependency>
- <!-- Smack Jabber client libraries to be included -->
- <dependency>
- <groupId>org.igniterealtime</groupId>
- <artifactId>smack</artifactId>
- </dependency>
- <dependency>
- <groupId>org.igniterealtime</groupId>
- <artifactId>smackx</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>version</artifactId>
+ <version>${pom.version}</version>
+ <type>aar</type>
</dependency>
</dependencies>
<distributionManagement>
@@ -241,11 +196,67 @@
<build>
<plugins>
<plugin>
+ <!-- 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>
+ <goals>
+ <goal>directory-single</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.build.directory}</outputDirectory>
+ <finalName>tmp-repository</finalName>
+
<ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+
<descriptor>src/main/assembly/repository.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <!-- This generates the modules.list and services.list files
-->
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>
+ def modulesdir = new
File(project.build.directory, "tmp-repository/modules");
+ def moduleslist = new File(modulesdir,
"modules.list");
+ moduleslist.delete();
+ modulesdir.eachFile({
+ if (it.name.endsWith(".mar")) {
+ moduleslist.append("$it.name\n");
+ }
+ })
+
+ def servicesdir = new
File(project.build.directory, "tmp-repository/services");
+ def serviceslist = new File(servicesdir,
"services.list");
+ serviceslist.delete();
+ servicesdir.eachFile({
+ if (it.name.endsWith(".aar")) {
+ serviceslist.append("$it.name\n");
+ }
+ })
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
<id>distribution-package</id>
<phase>package</phase>
<goals>
@@ -333,85 +344,6 @@
</goals>
</execution>
<execution>
- <id>service-module-list-generation</id>
- <phase>process-resources</phase>
- <configuration>
- <tasks>
- <mkdir dir="target/tmp-repository"/>
- <mkdir dir="target/tmp-repository/modules"/>
- <mkdir dir="target/tmp-repository/services"/>
-
- <copy
file="../../modules/soapmonitor/target/soapmonitor-${project.version}.mar"
-
tofile="target/tmp-repository/modules/soapmonitor-${soapmonitor.mar.version}.mar"/>
- <copy
file="../../modules/addressing/target/addressing-${project.version}.mar"
-
tofile="target/tmp-repository/modules/addressing-${addressing.mar.version}.mar"/>
- <copy
file="../../modules/ping/target/ping-${project.version}.mar"
-
tofile="target/tmp-repository/modules/ping-${ping.mar.version}.mar"/>
- <copy
file="../../modules/mex/target/mex-${project.version}.mar"
-
tofile="target/tmp-repository/modules/mex-${mex.mar.version}.mar"/>
- <copy
file="../../modules/scripting/target/axis2-scripting-${project.version}.mar"
-
tofile="target/tmp-repository/modules/scripting-${scripting.mar.version}.mar"/>
- <copy
file="../../modules/mtompolicy-mar/target/mtompolicy-${project.version}.mar"
-
tofile="target/tmp-repository/modules/mtompolicy-${mtompolicy.mar.version}.mar"/>
-
- <!-- generate modules.list -->
- <echo
file="target/tmp-repository/modules/modules.list" append="false">
- #
- # Licensed to the Apache Software
Foundation (ASF) under one
- # or more contributor license agreements.
See the NOTICE file
- # distributed with this work for
additional information
- # regarding copyright ownership. The ASF
licenses this file
- # to you under the Apache License, Version
2.0 (the
- # "License"); you may not use this file
except in compliance
- # with the License. You may obtain a copy
of the License at
- #
- #
http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or
agreed to in writing,
- # software distributed under the License
is distributed on an
- # "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS OF ANY
- # KIND, either express or implied. See the
License for the
- # specific language governing permissions
and limitations
- # under the License.
- #
- soapmonitor-${soapmonitor.mar.version}.mar
- addressing-${addressing.mar.version}.mar
- ping-${ping.mar.version}.mar
- mex-${mex.mar.version}.mar
- scripting-${scripting.mar.version}.mar
- </echo>
-
- <copy
file="../../modules/samples/target/toWar/services/version.aar"
- todir="target/tmp-repository/services"/>
- <!-- generate services.list -->
- <echo
file="target/tmp-repository/services/services.list" append="false">
- #
- # Licensed to the Apache Software
Foundation (ASF) under one
- # or more contributor license agreements.
See the NOTICE file
- # distributed with this work for
additional information
- # regarding copyright ownership. The ASF
licenses this file
- # to you under the Apache License, Version
2.0 (the
- # "License"); you may not use this file
except in compliance
- # with the License. You may obtain a copy
of the License at
- #
- #
http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or
agreed to in writing,
- # software distributed under the License
is distributed on an
- # "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS OF ANY
- # KIND, either express or implied. See the
License for the
- # specific language governing permissions
and limitations
- # under the License.
- #
- version.aar
- </echo>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
<id>delete-temporary-files</id>
<phase>install</phase>
<configuration>
Modified:
axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/bin-assembly.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/bin-assembly.xml?rev=965066&r1=965065&r2=965066&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/bin-assembly.xml
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/bin-assembly.xml
Sat Jul 17 12:44:03 2010
@@ -119,170 +119,6 @@
</excludes>
</fileSet>
-
- <fileSet>
- <directory>../../modules/java2wsdl/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>axis2-java2wsdl-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../modules/kernel/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>axis2-kernel-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../modules/adb/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>axis2-adb-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../modules/codegen/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>axis2-codegen-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../modules/adb-codegen/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>axis2-adb-codegen-${version}.jar</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../../modules/xmlbeans/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>axis2-xmlbeans-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../modules/jibx/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>axis2-jibx-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../modules/json/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>axis2-json-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../modules/tool/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>axis2-tools-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../modules/spring/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>axis2-spring-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../modules/soapmonitor/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>soapmonitor-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../modules/fastinfoset/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>axis2-fastinfoset-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../modules/jaxbri/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>axis2-jaxbri-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../modules/jaxws/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>axis2-jaxws-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../modules/metadata/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>axis2-metadata-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../modules/clustering/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>axis2-clustering-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../modules/saaj/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>axis2-saaj-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../modules/tool/axis2-ant-plugin/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>axis2-ant-plugin-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../modules/mex/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>mex-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../modules/corba/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>axis2-corba-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../modules/mtompolicy/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>axis2-mtompolicy-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../modules/transport/http/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>axis2-transport-http-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../modules/transport/local/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>axis2-transport-local-${version}.jar</include>
- </includes>
- </fileSet>
-
<fileSet>
<directory>../../legal</directory>
<outputDirectory>lib</outputDirectory>
@@ -359,7 +195,10 @@
<dependencySets>
<dependencySet>
- <outputDirectory>lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>*:*:jar</include>
+ </includes>
<excludes>
<exclude>mx4j:mx4j-jmx:jar</exclude>
<exclude>mx4j:mx4j-impl:jar</exclude>
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 12:44:03 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,777934,801630,803725,834058,904780
+/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:761709,771051,777897,777934,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 Sat Jul 17 12:44:03 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,777934,801630,803725,834058,904780
+/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:761709,771051,777897,777934,801630,803725,834058,904780
Propchange: axis/axis2/java/core/branches/java/1_5/modules/parent/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Jul 17 12:44:03 2010
@@ -0,0 +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
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=965066&r1=965065&r2=965066&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
12:44:03 2010
@@ -72,14 +72,6 @@
<url>http://issues.apache.org/jira/browse/AXIS2</url>
</issueManagement>
<properties>
- <!-- Version #'s for the mars that we generate -->
- <addressing.mar.version>1.5.2-SNAPSHOT</addressing.mar.version>
- <soapmonitor.mar.version>1.5.2-SNAPSHOT</soapmonitor.mar.version>
- <mex.mar.version>1.5.2-SNAPSHOT</mex.mar.version>
- <ping.mar.version>1.5.2-SNAPSHOT</ping.mar.version>
- <scripting.mar.version>1.5.2-SNAPSHOT</scripting.mar.version>
- <mtompolicy.mar.version>1.5.2-SNAPSHOT</mtompolicy.mar.version>
-
<ant.version>1.7.0</ant.version>
<antlr.version>2.7.7</antlr.version>
<axiom.version>1.2.9</axiom.version>
@@ -1228,7 +1220,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
+ <version>2.2-beta-3</version>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
@@ -1302,6 +1294,11 @@
<artifactId>maven-remote-resources-plugin</artifactId>
<version>1.0</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.2</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 17 12:44:03 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,777934,801630,803725,834058,904780
+/webservices/axis2/trunk/java/modules/transport/http/pom.xml:771051,777897,777934,801630,803725,834058,904780
Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 17 12:44:03 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,777934,801630,803725,834058,904780
+/webservices/axis2/trunk/java/modules/transport/http/src:771051,777897,777934,801630,803725,834058,904780
Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/local/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 17 12:44:03 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,777934,801630,803725,834058,904780
+/webservices/axis2/trunk/java/modules/transport/local:771051,777897,777934,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 Sat Jul 17 12:44:03 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,777934,801630,803725,834058,904780
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:761709,771051,777897,777934,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 Sat Jul 17 12:44:03 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,777934,801630,803725,834058,904780
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:761709,771051,777897,777934,801630,803725,834058,904780
