You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2007/07/29 06:32:52 UTC
svn commit: r560675 - in /webservices/axis2/branches/java/1_3/modules:
distribution/src/main/assembly/bin-assembly.xml webapp/conf/modules.list
webapp/pom.xml
Author: dims
Date: Sat Jul 28 21:32:46 2007
New Revision: 560675
URL: http://svn.apache.org/viewvc?view=rev&rev=560675
Log:
- deploy the same set of mars in the bin/dist and the webapp/war
- Add a couple of more missing jars in both bin/dist and webapp/war
- update webapp's modules.list to reflect the all the mars
Modified:
webservices/axis2/branches/java/1_3/modules/distribution/src/main/assembly/bin-assembly.xml
webservices/axis2/branches/java/1_3/modules/webapp/conf/modules.list
webservices/axis2/branches/java/1_3/modules/webapp/pom.xml
Modified: webservices/axis2/branches/java/1_3/modules/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3/modules/distribution/src/main/assembly/bin-assembly.xml?view=diff&rev=560675&r1=560674&r2=560675
==============================================================================
--- webservices/axis2/branches/java/1_3/modules/distribution/src/main/assembly/bin-assembly.xml (original)
+++ webservices/axis2/branches/java/1_3/modules/distribution/src/main/assembly/bin-assembly.xml Sat Jul 28 21:32:46 2007
@@ -204,6 +204,13 @@
</includes>
</fileSet>
<fileSet>
+ <directory>../../modules/jws-api/target</directory>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>axis2-jws-api-${version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>../../modules/metadata/target</directory>
<outputDirectory>lib</outputDirectory>
<includes>
@@ -236,6 +243,13 @@
<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-impl-${version}.jar</include>
</includes>
</fileSet>
Modified: webservices/axis2/branches/java/1_3/modules/webapp/conf/modules.list
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3/modules/webapp/conf/modules.list?view=diff&rev=560675&r1=560674&r2=560675
==============================================================================
--- webservices/axis2/branches/java/1_3/modules/webapp/conf/modules.list (original)
+++ webservices/axis2/branches/java/1_3/modules/webapp/conf/modules.list Sat Jul 28 21:32:46 2007
@@ -1,2 +1,5 @@
addressing-@version@.mar
soapmonitor-@version@.mar
+ping-@version@.mar
+mex-@version@.mar
+axis2-scripting-@version@.mar
\ No newline at end of file
Modified: webservices/axis2/branches/java/1_3/modules/webapp/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3/modules/webapp/pom.xml?view=diff&rev=560675&r1=560674&r2=560675
==============================================================================
--- webservices/axis2/branches/java/1_3/modules/webapp/pom.xml (original)
+++ webservices/axis2/branches/java/1_3/modules/webapp/pom.xml Sat Jul 28 21:32:46 2007
@@ -49,6 +49,8 @@
<exclusion><groupId>org.springframework</groupId><artifactId>spring-core</artifactId></exclusion>
<exclusion><groupId>org.springframework</groupId><artifactId>spring-web</artifactId></exclusion>
<exclusion><groupId>xerces</groupId><artifactId>xmlParserAPIs</artifactId></exclusion>
+ <exclusion><groupId>rhino</groupId><artifactId>js</artifactId></exclusion>
+ <exclusion><groupId>bsf</groupId><artifactId>bsf</artifactId></exclusion>
</exclusions>
</dependency>
<dependency>
@@ -71,6 +73,8 @@
<exclusion><groupId>org.springframework</groupId><artifactId>spring-core</artifactId></exclusion>
<exclusion><groupId>org.springframework</groupId><artifactId>spring-web</artifactId></exclusion>
<exclusion><groupId>xerces</groupId><artifactId>xmlParserAPIs</artifactId></exclusion>
+ <exclusion><groupId>rhino</groupId><artifactId>js</artifactId></exclusion>
+ <exclusion><groupId>bsf</groupId><artifactId>bsf</artifactId></exclusion>
</exclusions>
</dependency>
<dependency>
@@ -93,6 +97,8 @@
<exclusion><groupId>org.springframework</groupId><artifactId>spring-core</artifactId></exclusion>
<exclusion><groupId>org.springframework</groupId><artifactId>spring-web</artifactId></exclusion>
<exclusion><groupId>xerces</groupId><artifactId>xmlParserAPIs</artifactId></exclusion>
+ <exclusion><groupId>rhino</groupId><artifactId>js</artifactId></exclusion>
+ <exclusion><groupId>bsf</groupId><artifactId>bsf</artifactId></exclusion>
</exclusions>
</dependency>
<dependency>
@@ -114,6 +120,8 @@
<exclusion><groupId>org.springframework</groupId><artifactId>spring-core</artifactId></exclusion>
<exclusion><groupId>org.springframework</groupId><artifactId>spring-web</artifactId></exclusion>
<exclusion><groupId>xerces</groupId><artifactId>xmlParserAPIs</artifactId></exclusion>
+ <exclusion><groupId>rhino</groupId><artifactId>js</artifactId></exclusion>
+ <exclusion><groupId>bsf</groupId><artifactId>bsf</artifactId></exclusion>
</exclusions>
</dependency>
<dependency>
@@ -136,6 +144,8 @@
<exclusion><groupId>org.springframework</groupId><artifactId>spring-core</artifactId></exclusion>
<exclusion><groupId>org.springframework</groupId><artifactId>spring-web</artifactId></exclusion>
<exclusion><groupId>xerces</groupId><artifactId>xmlParserAPIs</artifactId></exclusion>
+ <exclusion><groupId>rhino</groupId><artifactId>js</artifactId></exclusion>
+ <exclusion><groupId>bsf</groupId><artifactId>bsf</artifactId></exclusion>
</exclusions>
</dependency>
<dependency>
@@ -158,6 +168,8 @@
<exclusion><groupId>org.springframework</groupId><artifactId>spring-core</artifactId></exclusion>
<exclusion><groupId>org.springframework</groupId><artifactId>spring-web</artifactId></exclusion>
<exclusion><groupId>xerces</groupId><artifactId>xmlParserAPIs</artifactId></exclusion>
+ <exclusion><groupId>rhino</groupId><artifactId>js</artifactId></exclusion>
+ <exclusion><groupId>bsf</groupId><artifactId>bsf</artifactId></exclusion>
</exclusions>
</dependency>
<dependency>
@@ -180,6 +192,8 @@
<exclusion><groupId>org.springframework</groupId><artifactId>spring-core</artifactId></exclusion>
<exclusion><groupId>org.springframework</groupId><artifactId>spring-web</artifactId></exclusion>
<exclusion><groupId>xerces</groupId><artifactId>xmlParserAPIs</artifactId></exclusion>
+ <exclusion><groupId>rhino</groupId><artifactId>js</artifactId></exclusion>
+ <exclusion><groupId>bsf</groupId><artifactId>bsf</artifactId></exclusion>
</exclusions>
</dependency>
<dependency>
@@ -202,6 +216,8 @@
<exclusion><groupId>org.springframework</groupId><artifactId>spring-core</artifactId></exclusion>
<exclusion><groupId>org.springframework</groupId><artifactId>spring-web</artifactId></exclusion>
<exclusion><groupId>xerces</groupId><artifactId>xmlParserAPIs</artifactId></exclusion>
+ <exclusion><groupId>rhino</groupId><artifactId>js</artifactId></exclusion>
+ <exclusion><groupId>bsf</groupId><artifactId>bsf</artifactId></exclusion>
</exclusions>
</dependency>
<dependency>
@@ -224,6 +240,8 @@
<exclusion><groupId>org.springframework</groupId><artifactId>spring-core</artifactId></exclusion>
<exclusion><groupId>org.springframework</groupId><artifactId>spring-web</artifactId></exclusion>
<exclusion><groupId>xerces</groupId><artifactId>xmlParserAPIs</artifactId></exclusion>
+ <exclusion><groupId>rhino</groupId><artifactId>js</artifactId></exclusion>
+ <exclusion><groupId>bsf</groupId><artifactId>bsf</artifactId></exclusion>
</exclusions>
</dependency>
<dependency>
@@ -246,6 +264,8 @@
<exclusion><groupId>org.springframework</groupId><artifactId>spring-core</artifactId></exclusion>
<exclusion><groupId>org.springframework</groupId><artifactId>spring-web</artifactId></exclusion>
<exclusion><groupId>xerces</groupId><artifactId>xmlParserAPIs</artifactId></exclusion>
+ <exclusion><groupId>rhino</groupId><artifactId>js</artifactId></exclusion>
+ <exclusion><groupId>bsf</groupId><artifactId>bsf</artifactId></exclusion>
</exclusions>
</dependency>
<dependency>
@@ -269,6 +289,8 @@
<exclusion><groupId>org.springframework</groupId><artifactId>spring-core</artifactId></exclusion>
<exclusion><groupId>org.springframework</groupId><artifactId>spring-web</artifactId></exclusion>
<exclusion><groupId>xerces</groupId><artifactId>xmlParserAPIs</artifactId></exclusion>
+ <exclusion><groupId>rhino</groupId><artifactId>js</artifactId></exclusion>
+ <exclusion><groupId>bsf</groupId><artifactId>bsf</artifactId></exclusion>
</exclusions>
</dependency>
<dependency>
@@ -292,6 +314,83 @@
<exclusion><groupId>org.springframework</groupId><artifactId>spring-core</artifactId></exclusion>
<exclusion><groupId>org.springframework</groupId><artifactId>spring-web</artifactId></exclusion>
<exclusion><groupId>xerces</groupId><artifactId>xmlParserAPIs</artifactId></exclusion>
+ <exclusion><groupId>rhino</groupId><artifactId>js</artifactId></exclusion>
+ <exclusion><groupId>bsf</groupId><artifactId>bsf</artifactId></exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>ping</artifactId>
+ <version>${version}</version>
+ <type>mar</type>
+ <exclusions>
+ <exclusion><groupId>org.apache.ant</groupId><artifactId>ant</artifactId></exclusion>
+ <exclusion><groupId>org.apache.ant</groupId><artifactId>ant-launcher</artifactId></exclusion>
+ <exclusion><groupId>aopalliance</groupId><artifactId>aopalliance</artifactId></exclusion>
+ <exclusion><groupId>org.apache.bcel</groupId><artifactId>bcel</artifactId></exclusion>
+ <exclusion><groupId>com.sun.xml.fastinfoset</groupId><artifactId>FastInfoset</artifactId></exclusion>
+ <exclusion><groupId>org.apache.geronimo.specs</groupId><artifactId>geronimo-activation_1.1_spec</artifactId></exclusion>
+ <exclusion><groupId>org.apache.geronimo.specs</groupId><artifactId>geronimo-javamail_1.4_spec</artifactId></exclusion>
+ <exclusion><groupId>org.apache.geronimo.specs</groupId><artifactId>geronimo-jms_1.1_spec</artifactId></exclusion>
+ <exclusion><groupId>jakarta-regexp</groupId><artifactId>jakarta-regexp</artifactId></exclusion>
+ <exclusion><groupId>javax.xml.bind</groupId><artifactId>jsr173_api</artifactId></exclusion>
+ <exclusion><groupId>org.springframework</groupId><artifactId>spring-beans</artifactId></exclusion>
+ <exclusion><groupId>org.springframework</groupId><artifactId>spring-context</artifactId></exclusion>
+ <exclusion><groupId>org.springframework</groupId><artifactId>spring-core</artifactId></exclusion>
+ <exclusion><groupId>org.springframework</groupId><artifactId>spring-web</artifactId></exclusion>
+ <exclusion><groupId>xerces</groupId><artifactId>xmlParserAPIs</artifactId></exclusion>
+ <exclusion><groupId>rhino</groupId><artifactId>js</artifactId></exclusion>
+ <exclusion><groupId>bsf</groupId><artifactId>bsf</artifactId></exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>mex</artifactId>
+ <version>${version}</version>
+ <type>mar</type>
+ <exclusions>
+ <exclusion><groupId>org.apache.ant</groupId><artifactId>ant</artifactId></exclusion>
+ <exclusion><groupId>org.apache.ant</groupId><artifactId>ant-launcher</artifactId></exclusion>
+ <exclusion><groupId>aopalliance</groupId><artifactId>aopalliance</artifactId></exclusion>
+ <exclusion><groupId>org.apache.bcel</groupId><artifactId>bcel</artifactId></exclusion>
+ <exclusion><groupId>com.sun.xml.fastinfoset</groupId><artifactId>FastInfoset</artifactId></exclusion>
+ <exclusion><groupId>org.apache.geronimo.specs</groupId><artifactId>geronimo-activation_1.1_spec</artifactId></exclusion>
+ <exclusion><groupId>org.apache.geronimo.specs</groupId><artifactId>geronimo-javamail_1.4_spec</artifactId></exclusion>
+ <exclusion><groupId>org.apache.geronimo.specs</groupId><artifactId>geronimo-jms_1.1_spec</artifactId></exclusion>
+ <exclusion><groupId>jakarta-regexp</groupId><artifactId>jakarta-regexp</artifactId></exclusion>
+ <exclusion><groupId>javax.xml.bind</groupId><artifactId>jsr173_api</artifactId></exclusion>
+ <exclusion><groupId>org.springframework</groupId><artifactId>spring-beans</artifactId></exclusion>
+ <exclusion><groupId>org.springframework</groupId><artifactId>spring-context</artifactId></exclusion>
+ <exclusion><groupId>org.springframework</groupId><artifactId>spring-core</artifactId></exclusion>
+ <exclusion><groupId>org.springframework</groupId><artifactId>spring-web</artifactId></exclusion>
+ <exclusion><groupId>xerces</groupId><artifactId>xmlParserAPIs</artifactId></exclusion>
+ <exclusion><groupId>rhino</groupId><artifactId>js</artifactId></exclusion>
+ <exclusion><groupId>bsf</groupId><artifactId>bsf</artifactId></exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-scripting</artifactId>
+ <version>${version}</version>
+ <type>mar</type>
+ <exclusions>
+ <exclusion><groupId>org.apache.ant</groupId><artifactId>ant</artifactId></exclusion>
+ <exclusion><groupId>org.apache.ant</groupId><artifactId>ant-launcher</artifactId></exclusion>
+ <exclusion><groupId>aopalliance</groupId><artifactId>aopalliance</artifactId></exclusion>
+ <exclusion><groupId>org.apache.bcel</groupId><artifactId>bcel</artifactId></exclusion>
+ <exclusion><groupId>com.sun.xml.fastinfoset</groupId><artifactId>FastInfoset</artifactId></exclusion>
+ <exclusion><groupId>org.apache.geronimo.specs</groupId><artifactId>geronimo-activation_1.1_spec</artifactId></exclusion>
+ <exclusion><groupId>org.apache.geronimo.specs</groupId><artifactId>geronimo-javamail_1.4_spec</artifactId></exclusion>
+ <exclusion><groupId>org.apache.geronimo.specs</groupId><artifactId>geronimo-jms_1.1_spec</artifactId></exclusion>
+ <exclusion><groupId>jakarta-regexp</groupId><artifactId>jakarta-regexp</artifactId></exclusion>
+ <exclusion><groupId>javax.xml.bind</groupId><artifactId>jsr173_api</artifactId></exclusion>
+ <exclusion><groupId>org.springframework</groupId><artifactId>spring-beans</artifactId></exclusion>
+ <exclusion><groupId>org.springframework</groupId><artifactId>spring-context</artifactId></exclusion>
+ <exclusion><groupId>org.springframework</groupId><artifactId>spring-core</artifactId></exclusion>
+ <exclusion><groupId>org.springframework</groupId><artifactId>spring-web</artifactId></exclusion>
+ <exclusion><groupId>xerces</groupId><artifactId>xmlParserAPIs</artifactId></exclusion>
+ <exclusion><groupId>rhino</groupId><artifactId>js</artifactId></exclusion>
+ <exclusion><groupId>bsf</groupId><artifactId>bsf</artifactId></exclusion>
</exclusions>
</dependency>
<dependency>
@@ -315,6 +414,8 @@
<exclusion><groupId>org.springframework</groupId><artifactId>spring-core</artifactId></exclusion>
<exclusion><groupId>org.springframework</groupId><artifactId>spring-web</artifactId></exclusion>
<exclusion><groupId>xerces</groupId><artifactId>xmlParserAPIs</artifactId></exclusion>
+ <exclusion><groupId>rhino</groupId><artifactId>js</artifactId></exclusion>
+ <exclusion><groupId>bsf</groupId><artifactId>bsf</artifactId></exclusion>
</exclusions>
</dependency>
</dependencies>
@@ -344,6 +445,27 @@
<targetPath>WEB-INF/modules</targetPath>
<includes>
<include>soapmonitor*.mar</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/../mex-mar/target</directory>
+ <targetPath>WEB-INF/modules</targetPath>
+ <includes>
+ <include>mex*.mar</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/../ping/target</directory>
+ <targetPath>WEB-INF/modules</targetPath>
+ <includes>
+ <include>ping*.mar</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/../scripting/target</directory>
+ <targetPath>WEB-INF/modules</targetPath>
+ <includes>
+ <include>*scripting*.mar</include>
</includes>
</resource>
<resource>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org