You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ba...@apache.org on 2007/07/22 13:02:18 UTC
svn commit: r558472 - in /myfaces/current12/test-webapp: pom.xml
src/main/java/org/apache/myfaces/blank/LabelTest.java
Author: baranda
Date: Sun Jul 22 04:02:15 2007
New Revision: 558472
URL: http://svn.apache.org/viewvc?view=rev&rev=558472
Log:
Added cargo support in the POM to start the application with tomcat by using "mvn clean package cargo:start"
Removed:
myfaces/current12/test-webapp/src/main/java/org/apache/myfaces/blank/LabelTest.java
Modified:
myfaces/current12/test-webapp/pom.xml
Modified: myfaces/current12/test-webapp/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/current12/test-webapp/pom.xml?view=diff&rev=558472&r1=558471&r2=558472
==============================================================================
--- myfaces/current12/test-webapp/pom.xml (original)
+++ myfaces/current12/test-webapp/pom.xml Sun Jul 22 04:02:15 2007
@@ -23,64 +23,66 @@
<target>1.5</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.2</version>
+ <!--<configuration>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ </configuration>-->
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+
+ <configuration>
+ <wait>true</wait>
+ <container>
+ <containerId>tomcat5x</containerId>
+ <home>${catalina.home}</home>
+ <zipUrlInstaller>
+ <url>http://mirrors.ibiblio.org/pub/mirrors/apache/tomcat/tomcat-6/v6.0.13/bin/apache-tomcat-6.0.13.zip</url>
+ <installDir>${project.build.directory}/tomcat-zip</installDir>
+ </zipUrlInstaller>
+ <log>target/tomcat5x.log</log>
+ <output>target/tomcat5x.out</output>
+ </container>
+ <configuration>
+ <home>target/tomcat5x</home>
+ <properties>
+ <cargo.servlet.port>8080</cargo.servlet.port>
+ </properties>
+ <deployables>
+ <deployable>
+ <location>target/${artifactId}</location>
+ <properties>
+ <context>${artifactId}</context>
+ </properties>
+ </deployable>
+ </deployables>
+ </configuration>
+
+ </configuration>
+ <!--<executions>-->
+ <!--<execution>-->
+ <!--<id>start-container</id>-->
+ <!--<phase>validate</phase>-->
+ <!--<goals>-->
+ <!--<goal>start</goal>-->
+ <!--</goals>-->
+ <!--</execution>-->
+ <!--<execution>-->
+ <!--<id>stop-container</id>-->
+ <!--<phase>post-integration-test</phase>-->
+ <!--<goals>-->
+ <!--<goal>stop</goal>-->
+ <!--</goals>-->
+ <!--</execution>-->
+ <!--</executions>-->
+ </plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>jettyConfig</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.2rc0</version>
- <!--<configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- </configuration>-->
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- <!--<dependencies>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler</artifactId>
- <version>5.5.9</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- <version>5.5.9</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler-jdt</artifactId>
- <version>5.5.9</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>el-api</artifactId>
- <version>6.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>jasper-el</artifactId>
- <version>6.0.1-SNAPSHOT</version>
- </dependency>
- </dependencies>-->
- </profile>
- </profiles>
-
+
<dependencies>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
@@ -103,11 +105,11 @@
</dependency>
-->
- <dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- <version>1.1.12</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>com.sun.facelets</groupId>-->
+ <!--<artifactId>jsf-facelets</artifactId>-->
+ <!--<version>1.1.12</version>-->
+ <!--</dependency>-->
<!-- depends on container -->
<!--<dependency>
@@ -182,13 +184,6 @@
<id>apache.snapshots</id>
<name>Apache Snapshot Repository</name>
<url>http://people.apache.org/repo/m2-snapshot-repository</url>
- </repository>
-
- <!-- temporary only (jaxb)-->
- <repository>
- <id>java.net</id>
- <url>http://maven1.glassfishwiki.org</url>
- <layout>legacy</layout>
</repository>
</repositories>