Author: wsmoak
Date: Sun Jun 3 17:56:05 2007
New Revision: 544022
URL: http://svn.apache.org/viewvc?view=rev&rev=544022
Log:
Remove Cargo config from the webapp, see archiva-webapp-test.
Introduce a profile for the webapp tests, and fix version numbers.
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp-test/pom.xml
maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml
maven/archiva/trunk/archiva-web/pom.xml
Modified: maven/archiva/trunk/archiva-web/archiva-webapp-test/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp-test/pom.xml?view=diff&rev=544022&r1=544021&r2=544022
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp-test/pom.xml (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp-test/pom.xml Sun Jun 3
17:56:05 2007
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.maven.archiva</groupId>
<artifactId>archiva-web</artifactId>
- <version>1.0-alpha-1-SNAPSHOT</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
</parent>
<artifactId>archiva-webapp-test</artifactId>
<packaging>pom</packaging>
@@ -42,6 +42,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-web-ui-tests</artifactId>
+ <version>1.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml?view=diff&rev=544022&r1=544021&r2=544022
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml Sun Jun 3 17:56:05
2007
@@ -397,26 +397,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <!-- TODO: configure data sources -->
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <version>0.3.1</version>
- <configuration>
- <container>
- <containerId>tomcat5x</containerId>
- <home>${cargo.tomcat5x.home}</home>
- <log>${project.build.directory}/tomcat5x.log</log>
- <output>${project.build.directory}/tomcat5x.out</output>
- </container>
- <configuration>
- <home>${project.build.directory}/tomcat5x</home>
- <properties>
- <cargo.jvmargs> -Xdebug
-Xrunjdwp:server=y,transport=dt_socket,address=8000,suspend=n </cargo.jvmargs>
- </properties>
- </configuration>
- </configuration>
- </plugin>
</plugins>
</build>
<profiles>
Modified: maven/archiva/trunk/archiva-web/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/pom.xml?view=diff&rev=544022&r1=544021&r2=544022
==============================================================================
--- maven/archiva/trunk/archiva-web/pom.xml (original)
+++ maven/archiva/trunk/archiva-web/pom.xml Sun Jun 3 17:56:05 2007
@@ -34,4 +34,13 @@
<module>archiva-webapp</module>
<module>archiva-standalone</module>
</modules>
+
+ <profiles>
+ <profile>
+ <id>webapp-test</id>
+ <modules>
+ <module>archiva-webapp-test</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
