Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove Cargo config from the webapp, see archiva-webapp-test. 

Introduce a profile for the webapp tests, and fix version numbers.


git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@544022 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Wendy Smoak 2007-06-04 00:56:05 +00:00
parent 6eb1173bb7
commit fe86f88baf
3 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
archiva-web/archiva-webapp-test/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.apache.maven.archiva</groupId> <groupId>org.apache.maven.archiva</groupId>
<artifactId>archiva-web</artifactId> <artifactId>archiva-web</artifactId>
<version>1.0-alpha-1-SNAPSHOT</version> <version>1.0-alpha-2-SNAPSHOT</version>
</parent> </parent>
<artifactId>archiva-webapp-test</artifactId> <artifactId>archiva-webapp-test</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
@ -42,6 +42,7 @@
<dependency> <dependency>
<groupId>org.apache.maven.shared</groupId> <groupId>org.apache.maven.shared</groupId>
<artifactId>maven-web-ui-tests</artifactId> <artifactId>maven-web-ui-tests</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

20
archiva-web/archiva-webapp/pom.xml
View File

@ -397,26 +397,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </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> </plugins>
</build> </build>
<profiles> <profiles>

9
archiva-web/pom.xml
View File

@ -34,4 +34,13 @@
<module>archiva-webapp</module> <module>archiva-webapp</module>
<module>archiva-standalone</module> <module>archiva-standalone</module>
</modules> </modules>
<profiles>
<profile>
<id>webapp-test</id>
<modules>
<module>archiva-webapp-test</module>
</modules>
</profile>
</profiles>
</project> </project>