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 di...@apache.org on 2007/05/01 19:54:56 UTC
svn commit: r534173 - in /webservices/axis2/trunk/java: ./ modules/webapp/
modules/webapp/Error/ modules/webapp/css/ modules/webapp/images/
modules/webapp/include/ modules/webapp/src/ modules/webapp/src/main/
modules/webapp/src/main/webapp/ modules/web...
Author: dims
Date: Tue May 1 10:54:53 2007
New Revision: 534173
URL: http://svn.apache.org/viewvc?view=rev&rev=534173
Log:
add support in m2 build to generate an axis2.war (by running mvn war:war in webapp directory). Make sure m1 built war still works as well
Added:
webservices/axis2/trunk/java/modules/webapp/pom.xml
webservices/axis2/trunk/java/modules/webapp/src/
webservices/axis2/trunk/java/modules/webapp/src/main/
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/ActivateService.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/ActivateService.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/EngageToServiceGroup.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/EngageToServiceGroup.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/Error/
- copied from r534099, webservices/axis2/trunk/java/modules/webapp/Error/
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/HappyAxis.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/HappyAxis.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/InActivateService.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/InActivateService.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/LeftFrame.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/LeftFrame.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/ListServiceGroup.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/ListServiceGroup.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/Login.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/Login.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/MainFrame.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/MainFrame.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/SelectService.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/SelectService.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/ServiceParaEdit.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/ServiceParaEdit.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/TopFrame.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/TopFrame.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/ViewContexts.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/ViewContexts.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/ViewGlobalHandlers.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/ViewGlobalHandlers.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/ViewServiceHandlers.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/ViewServiceHandlers.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/admin.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/admin.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/css/
- copied from r534099, webservices/axis2/trunk/java/modules/webapp/css/
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/disengage.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/disengage.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/engagingglobally.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/engagingglobally.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/engagingtoanoperation.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/engagingtoanoperation.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/engagingtoaservice.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/engagingtoaservice.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/error.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/error.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/errorModule.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/errorModule.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/globalModules.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/globalModules.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/images/
- copied from r534099, webservices/axis2/trunk/java/modules/webapp/images/
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/include/
- copied from r534099, webservices/axis2/trunk/java/modules/webapp/include/
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/index.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/index.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/listFaultyService.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/listFaultyService.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/listGroupService.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/listGroupService.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/listModules.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/listModules.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/listService.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/listService.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/listServices.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/listServices.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/listSingleService.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/listSingleService.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/upload.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/upload.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/viewServiceContext.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/viewServiceContext.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/viewServiceGroupContext.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/viewServiceGroupContext.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/viewphases.jsp
- copied unchanged from r534099, webservices/axis2/trunk/java/modules/webapp/viewphases.jsp
Removed:
webservices/axis2/trunk/java/modules/webapp/ActivateService.jsp
webservices/axis2/trunk/java/modules/webapp/EngageToServiceGroup.jsp
webservices/axis2/trunk/java/modules/webapp/Error/
webservices/axis2/trunk/java/modules/webapp/HappyAxis.jsp
webservices/axis2/trunk/java/modules/webapp/InActivateService.jsp
webservices/axis2/trunk/java/modules/webapp/LeftFrame.jsp
webservices/axis2/trunk/java/modules/webapp/ListServiceGroup.jsp
webservices/axis2/trunk/java/modules/webapp/Login.jsp
webservices/axis2/trunk/java/modules/webapp/MainFrame.jsp
webservices/axis2/trunk/java/modules/webapp/SelectService.jsp
webservices/axis2/trunk/java/modules/webapp/ServiceParaEdit.jsp
webservices/axis2/trunk/java/modules/webapp/TopFrame.jsp
webservices/axis2/trunk/java/modules/webapp/ViewContexts.jsp
webservices/axis2/trunk/java/modules/webapp/ViewGlobalHandlers.jsp
webservices/axis2/trunk/java/modules/webapp/ViewServiceHandlers.jsp
webservices/axis2/trunk/java/modules/webapp/admin.jsp
webservices/axis2/trunk/java/modules/webapp/css/
webservices/axis2/trunk/java/modules/webapp/disengage.jsp
webservices/axis2/trunk/java/modules/webapp/engagingglobally.jsp
webservices/axis2/trunk/java/modules/webapp/engagingtoanoperation.jsp
webservices/axis2/trunk/java/modules/webapp/engagingtoaservice.jsp
webservices/axis2/trunk/java/modules/webapp/error.jsp
webservices/axis2/trunk/java/modules/webapp/errorModule.jsp
webservices/axis2/trunk/java/modules/webapp/globalModules.jsp
webservices/axis2/trunk/java/modules/webapp/images/
webservices/axis2/trunk/java/modules/webapp/include/
webservices/axis2/trunk/java/modules/webapp/index.jsp
webservices/axis2/trunk/java/modules/webapp/listFaultyService.jsp
webservices/axis2/trunk/java/modules/webapp/listGroupService.jsp
webservices/axis2/trunk/java/modules/webapp/listModules.jsp
webservices/axis2/trunk/java/modules/webapp/listService.jsp
webservices/axis2/trunk/java/modules/webapp/listServices.jsp
webservices/axis2/trunk/java/modules/webapp/listSingleService.jsp
webservices/axis2/trunk/java/modules/webapp/upload.jsp
webservices/axis2/trunk/java/modules/webapp/viewServiceContext.jsp
webservices/axis2/trunk/java/modules/webapp/viewServiceGroupContext.jsp
webservices/axis2/trunk/java/modules/webapp/viewphases.jsp
Modified:
webservices/axis2/trunk/java/maven.xml
webservices/axis2/trunk/java/release-docs/maven-scripts/maven-std.xml
Modified: webservices/axis2/trunk/java/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/maven.xml?view=diff&rev=534173&r1=534172&r2=534173
==============================================================================
--- webservices/axis2/trunk/java/maven.xml (original)
+++ webservices/axis2/trunk/java/maven.xml Tue May 1 10:54:53 2007
@@ -528,8 +528,8 @@
<ant:copy toDir="target/temp/war/toWEB-INF/conf">
<ant:fileset file="modules/kernel/conf/axis2.xml"/>
</ant:copy>
- <ant:copy toDir="target/temp/war/axis2-web">
- <ant:fileset dir="modules/webapp">
+ <ant:copy toDir="target/temp/war">
+ <ant:fileset dir="modules/webapp/src/main/webapp">
<ant:exclude name="project.xml"/>
<ant:exclude name="**/*.iml"/>
<ant:exclude name="**/.*"/>
@@ -675,9 +675,9 @@
</ant:fileset>
</ant:copy>
- <!-- copy contents of the webapp module to webapp/axis2-web directory -->
- <ant:copy toDir="${std.bin.temp.dir}/webapp/axis2-web">
- <ant:fileset dir="modules/webapp">
+ <!-- copy contents of the webapp module -->
+ <ant:copy toDir="${std.bin.temp.dir}/webapp">
+ <ant:fileset dir="modules/webapp/src/main/webapp">
<ant:exclude name="project.xml"/>
<ant:exclude name="**/*.iml"/>
<ant:exclude name="**/.*"/>
Added: webservices/axis2/trunk/java/modules/webapp/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/pom.xml?view=auto&rev=534173
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/pom.xml (added)
+++ webservices/axis2/trunk/java/modules/webapp/pom.xml Tue May 1 10:54:53 2007
@@ -0,0 +1,85 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-parent</artifactId>
+ <version>SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+ <artifactId>axis2-webapp</artifactId>
+ <packaging>war</packaging>
+ <name>Axis2 Web Application module</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jaxws</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jaxbri</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-xmlbeans</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-spring</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-json</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <finalName>axis2</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ <webResources>
+ <!-- Need a better war to add the MAR -->
+ <resource>
+ <directory>../addressing/target</directory>
+ <targetPath>WEB-INF/modules</targetPath>
+ <includes>
+ <include>addressing*.mar</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>../kernel/conf</directory>
+ <targetPath>WEB-INF/conf</targetPath>
+ <includes>
+ <include>axis2.xml</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>../kernel/conf</directory>
+ <targetPath>WEB-INF/classes</targetPath>
+ <includes>
+ <include>*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>conf</directory>
+ <targetPath>WEB-INF</targetPath>
+ <includes>
+ <include>web.xml</include>
+ </includes>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: webservices/axis2/trunk/java/release-docs/maven-scripts/maven-std.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/release-docs/maven-scripts/maven-std.xml?view=diff&rev=534173&r1=534172&r2=534173
==============================================================================
--- webservices/axis2/trunk/java/release-docs/maven-scripts/maven-std.xml (original)
+++ webservices/axis2/trunk/java/release-docs/maven-scripts/maven-std.xml Tue May 1 10:54:53 2007
@@ -626,9 +626,9 @@
</ant:fileset>
</ant:copy>
- <!-- copy contents of the webapp module to webapp/axis2-web directory -->
- <ant:copy toDir="${std.bin.temp.dir}/webapp/axis2-web">
- <ant:fileset dir="modules/webapp">
+ <!-- copy contents of the webapp module -->
+ <ant:copy toDir="${std.bin.temp.dir}/webapp">
+ <ant:fileset dir="modules/webapp/src/main/webapp">
<ant:exclude name="project.xml"/>
<ant:exclude name="**/*.iml"/>
<ant:exclude name="**/.*"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org