You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by su...@apache.org on 2007/07/05 10:48:23 UTC
svn commit: r553420 - in /webservices/axis2/trunk/java: ./
modules/distribution/ modules/distribution/src/main/assembly/ modules/parent/
Author: sumedha
Date: Thu Jul 5 01:48:22 2007
New Revision: 553420
URL: http://svn.apache.org/viewvc?view=rev&rev=553420
Log:
Added several missing libraries required for war distribution
Modified:
webservices/axis2/trunk/java/modules/distribution/pom.xml
webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml
webservices/axis2/trunk/java/modules/distribution/src/main/assembly/src-assembly.xml
webservices/axis2/trunk/java/modules/distribution/src/main/assembly/war-assembly.xml
webservices/axis2/trunk/java/modules/parent/pom.xml
webservices/axis2/trunk/java/pom.xml
Modified: webservices/axis2/trunk/java/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/pom.xml?view=diff&rev=553420&r1=553419&r2=553420
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/distribution/pom.xml Thu Jul 5 01:48:22 2007
@@ -51,7 +51,7 @@
<descriptor>src/main/assembly/src-assembly.xml</descriptor>
<descriptor>src/main/assembly/war-assembly.xml</descriptor>
</descriptors>
- <finalName>axis2-bin-${version}</finalName>
+ <finalName>axis2-${version}</finalName>
</configuration>
</execution>
</executions>
@@ -62,15 +62,14 @@
<version>2.0-alpha-1-SNAPSHOT</version>
<inherited>false</inherited>
<executions>
- <execution>
+ <execution>
<id>package-copy</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
- </goals>
+ </goals>
<configuration>
<artifactItems>
-
<artifactItem>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
@@ -127,16 +126,6 @@
<overWrite>true</overWrite>
<outputDirectory>target/bin/external-dependencies</outputDirectory>
</artifactItem>
-<!--
- <artifactItem>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>jakarta-httpcore</artifactId>
- <version>${jakarta.httpcore.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <outputDirectory>target/bin/external-dependencies</outputDirectory>
- </artifactItem>
--->
<artifactItem>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
@@ -265,6 +254,7 @@
<overWrite>true</overWrite>
<outputDirectory>target/bin/external-dependencies</outputDirectory>
</artifactItem>
+
<artifactItem>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
@@ -353,17 +343,122 @@
<overWrite>true</overWrite>
<outputDirectory>target/bin/external-dependencies</outputDirectory>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>${httpcore.version}</version>
+ <artifactId>httpcore</artifactId>
+ <version>4.0-alpha5</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+
+
+ <artifactItem>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+
+
+ <artifactItem>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>annogen</groupId>
+ <artifactId>annogen</artifactId>
+ <version>${annogen.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>target/bin/external-dependencies</outputDirectory>
</artifactItem>
- <dependency>
- </dependency>
+ <artifactItem>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>${axiom.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>${axiom.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-dom</artifactId>
+ <version>${axiom.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>${stax.impl.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/bin/external-dependencies</outputDirectory>
+ </artifactItem>
Modified: webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml?view=diff&rev=553420&r1=553419&r2=553420
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml (original)
+++ webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml Thu Jul 5 01:48:22 2007
@@ -285,6 +285,7 @@
</fileSet>
</fileSets>
<!--
+ Following is not working for dependencies in modules
<moduleSets>
<moduleSet>
<includes>
Modified: webservices/axis2/trunk/java/modules/distribution/src/main/assembly/src-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/src/main/assembly/src-assembly.xml?view=diff&rev=553420&r1=553419&r2=553420
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/src/main/assembly/src-assembly.xml (original)
+++ webservices/axis2/trunk/java/modules/distribution/src/main/assembly/src-assembly.xml Thu Jul 5 01:48:22 2007
@@ -2,7 +2,7 @@
<id>src</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
- <!-- <format>tar.gz</format> -->
+ <format>tar.gz</format>
<format>zip</format>
</formats>
Modified: webservices/axis2/trunk/java/modules/distribution/src/main/assembly/war-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/src/main/assembly/war-assembly.xml?view=diff&rev=553420&r1=553419&r2=553420
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/src/main/assembly/war-assembly.xml (original)
+++ webservices/axis2/trunk/java/modules/distribution/src/main/assembly/war-assembly.xml Thu Jul 5 01:48:22 2007
@@ -1,5 +1,5 @@
<assembly>
- <id>bin</id>
+ <id>war</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>war</format>
@@ -37,7 +37,7 @@
<directory>../../modules/adb-codegen/target</directory>
<outputDirectory>WEB-INF/lib</outputDirectory>
<includes>
- <include>axis2-adb-codegenkernel-${version}.jar</include>
+ <include>axis2-adb-codegen-${version}.jar</include>
</includes>
</fileSet>
Modified: webservices/axis2/trunk/java/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/parent/pom.xml?view=diff&rev=553420&r1=553419&r2=553420
==============================================================================
--- webservices/axis2/trunk/java/modules/parent/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/parent/pom.xml Thu Jul 5 01:48:22 2007
@@ -78,15 +78,17 @@
as the maven-release-plugin will not update this value.
-->
<version>SNAPSHOT</version>
+ <javaxmail.version>1.4</javaxmail.version>
+ <activation.version>1.1</activation.version>
<annogen.version>0.1.0</annogen.version>
<ant.version>1.7.0</ant.version>
<antlr.version>2.7.4</antlr.version>
- <activemq.version>4.1.1</activemq.version>
- <axiom.version>SNAPSHOT</axiom.version>
+ <activemq.version>4.1.1</activemq.version>
+ <axiom.version>SNAPSHOT</axiom.version>
<backport.util.concurrent.version>2.2</backport.util.concurrent.version>
<bcel.version>5.2</bcel.version>
- <bsf.version>2.4.0</bsf.version>
- <commons.codec.version>1.3</commons.codec.version>
+ <bsf.version>2.4.0</bsf.version>
+ <commons.codec.version>1.3</commons.codec.version>
<commons.fileupload.version>1.1.1</commons.fileupload.version>
<commons.httpclient.version>3.0.1</commons.httpclient.version>
<commons.io.version>1.2</commons.io.version>
@@ -96,7 +98,7 @@
<geronimo.spec.activation.version>1.0-M1</geronimo.spec.activation.version>
<geronimo.spec.javamail.version>1.0-M1</geronimo.spec.javamail.version>
<geronimo.spec.jms.version>1.1</geronimo.spec.jms.version>
- <geronimo.spec.annotation.version>1.1</geronimo.spec.annotation.version>
+ <geronimo.spec.annotation.version>1.1</geronimo.spec.annotation.version>
<groovy.all.version>1.0-jsr-06</groovy.all.version>
<intellij.version>5.0</intellij.version>
<httpcore.version>4.0-alpha5</httpcore.version>
@@ -115,7 +117,7 @@
<maven.version>2.0.6</maven.version>
<neethi.version>SNAPSHOT</neethi.version>
<plexus.utils.version>1.1</plexus.utils.version>
- <rhino.version>1.6R5</rhino.version>
+ <rhino.version>1.6R5</rhino.version>
<servlet.api.version>2.3</servlet.api.version>
<spring.version>2.0.4</spring.version>
<stax.api.version>1.0.1</stax.api.version>
@@ -800,6 +802,11 @@
<artifactId>apache-activemq</artifactId>
<version>${activemq.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>${javaxmail.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<distributionManagement>
Modified: webservices/axis2/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/pom.xml?view=diff&rev=553420&r1=553419&r2=553420
==============================================================================
--- webservices/axis2/trunk/java/pom.xml (original)
+++ webservices/axis2/trunk/java/pom.xml Thu Jul 5 01:48:22 2007
@@ -29,7 +29,7 @@
<version>SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Axis 2.0 - Root</name>
- <modules>
+ <modules>
<module>modules/adb</module>
<module>modules/adb-codegen</module>
<module>modules/addressing</module>
@@ -65,7 +65,7 @@
<id>java15</id>
<activation>
<jdk>1.5</jdk>
- </activation>
+ </activation>
<modules>
<module>modules/scripting</module>
<module>modules/jaxbri</module>
@@ -76,7 +76,7 @@
<module>modules/jaxws-api</module>
<module>modules/jaxws</module>
<module>modules/clustering</module>
- </modules>
+ </modules>
</profile>
<profile>
<id>java16</id>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org