Author: rfeng
Date: Mon Feb 4 12:04:42 2008
New Revision: 618410
URL: http://svn.apache.org/viewvc?rev=618410&view=rev
Log:
Generate the web.xml and geronimo-web.xml automatically from the build
Removed:
incubator/tuscany/java/sca/itest/services/src/main/webapp/WEB-INF/geronimo-web.xml
incubator/tuscany/java/sca/itest/services/src/main/webapp/WEB-INF/web.xml
Modified:
incubator/tuscany/java/sca/itest/services/pom.xml
incubator/tuscany/java/sca/itest/services/src/main/webapp/WEB-INF/ (props
changed)
Modified: incubator/tuscany/java/sca/itest/services/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/services/pom.xml?rev=618410&r1=618409&r2=618410&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/services/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/services/pom.xml Mon Feb 4 12:04:42 2008
@@ -115,13 +115,32 @@
</execution>
</executions>
</plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>jetty</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
<plugin>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-maven-web-junit</artifactId>
<version>1.2-incubating-SNAPSHOT</version>
<executions>
<execution>
+ <id>generate-web-xml</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>web-junit-test</id>
<configuration>
<url>http://localhost:8085/${project.build.finalName}/junit</url>
</configuration>
@@ -132,18 +151,6 @@
</execution>
</executions>
</plugin>
- </plugins>
- </build>
- </profile>
-
-
- <profile>
- <id>jetty</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
@@ -205,6 +212,33 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-web-junit</artifactId>
+ <version>1.2-incubating-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>generate-web-xml</id>
+ <configuration>
+ <geronimo>true</geronimo>
+ </configuration>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>web-junit-test</id>
+ <configuration>
+
<url>http://localhost:8080/${project.build.finalName}/junit</url>
+ </configuration>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>geronimo-maven-plugin</artifactId>
Propchange: incubator/tuscany/java/sca/itest/services/src/main/webapp/WEB-INF/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Feb 4 12:04:42 2008
@@ -0,0 +1,2 @@
+web.xml
+geronim-web.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
