Author: bayard
Date: Thu Apr 23 07:18:24 2009
New Revision: 767827
URL: http://svn.apache.org/viewvc?rev=767827&view=rev
Log:
Getting rid of truly commented out parts and putting in place the commented out
parts that are intended to work. Currently blocked on Cargo throwing an
IllegalStateException
Modified:
jakarta/taglibs/proper/standard/trunk/standard-test/pom.xml
Modified: jakarta/taglibs/proper/standard/trunk/standard-test/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/standard-test/pom.xml?rev=767827&r1=767826&r2=767827&view=diff
==============================================================================
--- jakarta/taglibs/proper/standard/trunk/standard-test/pom.xml (original)
+++ jakarta/taglibs/proper/standard/trunk/standard-test/pom.xml Thu Apr 23
07:18:24 2009
@@ -118,58 +118,13 @@
</execution>
</executions>
</plugin>
- <!--
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <version>1.0-beta-2</version>
- <executions>
- <execution>
- <id>start-container</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start</goal>
- </goals>
- </execution>
- <execution>
- <id>stop-container</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <wait>false</wait>
- <timeout>20000</timeout>
- <container>
- <containerId>tomcat5x</containerId>
- <zipUrlInstaller>
-
<url>http://apache.speedbone.de/tomcat/tomcat-5/v5.5.25/bin/apache-tomcat-5.5.25.zip</url>
- <installDir>${basedir}/install</installDir>
- </zipUrlInstaller>
- </container>
- <configuration>
- <deployables>
- <deployable>
- <location>cactifiedByMaven2.war</location>
- <pingURL>http://localhost:8080/jstl_test/</pingURL>
- <properties>
- <context>/jstl_test</context>
- </properties>
- </deployable>
- </deployables>
- </configuration>
- </configuration>
- </plugin>
- -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
- <!--
<executions>
<execution>
<id>surefire-it</id>
@@ -188,10 +143,8 @@
</configuration>
</execution>
</executions>
- -->
</plugin>
- <!--
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
@@ -209,11 +162,12 @@
<id>start-jetty</id>
<phase>pre-integration-test</phase>
<goals>
- <goal>run</goal>
+ <goal>run-war</goal>
</goals>
<configuration>
<scanIntervalSeconds>0</scanIntervalSeconds>
<daemon>true</daemon>
+ <webApp>cactifiedByMaven2.war</webApp>
</configuration>
</execution>
<execution>
@@ -225,7 +179,6 @@
</execution>
</executions>
</plugin>
- -->
</plugins>
</build>
---------------------------------------------------------------------
To unsubscribe, e-mail: taglibs-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: taglibs-dev-h...@jakarta.apache.org
