From: Olivier Lamy Date: Mon, 9 Jan 2012 21:46:39 +0000 (+0000) Subject: use tomcat maven plugin rather than cargo in webapp-test-js faster than running an... X-Git-Tag: archiva-1.4-M3~1611 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=37a16032486065304a3f94a81ba7f23cfcc4ad45;p=archiva.git use tomcat maven plugin rather than cargo in webapp-test-js faster than running an external tomcat git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1229370 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml index 3fbf0ace5..717f7979f 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml @@ -257,7 +257,7 @@ unzip-archiva-webapp - generate-resources + compile unpack @@ -270,25 +270,24 @@ war - ${project.build.directory}/${container.name}conf/webapps/archiva + ${project.build.directory}/tomcat6x/webapps/archiva true - + org.apache.derby,javax.mail,javax.activation false true false - ${project.build.directory}/providedDependencies + ${project.build.directory}/tomcat6x/webapps/archiva/WEB-INF/lib - + @@ -320,35 +319,11 @@ - - - - - copy-container-conf - package - - - - - - - - - - - - - - - + + - - run - check-archiva-loaded @@ -365,6 +340,7 @@ + + + org.apache.tomcat.maven + tomcat6-maven-plugin + + + org.apache.derby + derby + ${derbyVersion} + + + javax.mail + mail + ${javaxMailVersion} + + + + + tomcat-run + + run-war-only + + pre-integration-test + + ${project.build.directory}/tomcat6x/conf + ${project.build.directory}/tomcat6x + /archiva + ${container.test.port} + UTF-8 + ${project.build.directory}/tomcat6x/webapps/archiva + true + true + + ${project.build.directory}/appserver-base + ${project.build.directory}/appserver-base + ${project.build.directory} + + src/test/${container.name}/Catalina/localhost/archiva.xml + true + ${project.build.directory}/tomcat6x/conf/server.xml + + + + tomcat-shutdown + + shutdown + + post-integration-test + + + diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat6x/conf/Catalina/localhost/host-manager.xml b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat6x/conf/Catalina/localhost/host-manager.xml deleted file mode 100644 index 1e31ca5d4..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat6x/conf/Catalina/localhost/host-manager.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat6x/conf/Catalina/localhost/manager.xml b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat6x/conf/Catalina/localhost/manager.xml deleted file mode 100644 index 7229a88cf..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat6x/conf/Catalina/localhost/manager.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat6x/conf/tomcat-users.xml b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat6x/conf/tomcat-users.xml deleted file mode 100644 index 34e268d84..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/tomcat6x/conf/tomcat-users.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - -