use tomcat plugin from Apache only

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1240226 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/README.txt b/README.txt
index f3c8dbca0f48e058ac7d5e8f478d7400377a25a8..1ed9145ce28d647c88f924edf7ebe95d13f67a48 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -9,7 +9,7 @@ Running from Source Code
 With maven 3 and the tomcat-maven-plugin, you will be able to run the webapp from the top
 and include all the other modules in the webapp classloader.
 No more need to install everything to run the jetty plugin.
-So just use : mvn tomcat:run -Pdev
+So just use : mvn tomcat6:run -Pdev -Ptomcat or mvn tomcat7:run -Pdev -Ptomcat
 and hit in your browser : http://localhost:9091/archiva
 
 note with dev profile admin account is automatically created with password admin123
@@ -22,7 +22,9 @@ export MAVEN_OPTS="-Xmx768m -Xms768m -XX:MaxPermSize=256m"
 Running webapp full js
 ========================
 As webapp js is in dev and won't probably be released soon, the module is not activated by default and it's included only in a profile
-mvn tomcat:run -pl :archiva-webapp-js -Pjs -am -Pdev
+mvn tomcat7:run -pl :archiva-webapp-js -Pjs -am -Pdev
+or
+mvn tomcat6:run -pl :archiva-webapp-js -Pjs -am -Pdev
 
 Test Registration email
 ========================

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
index cf0132c06caf4475f797065cf6a1d4350ab2dfa6..0997d144fa04c944a38ca662b52816fc9b2fad61 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
@@ -528,40 +528,6 @@
 
     <plugins>
 
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>tomcat-maven-plugin</artifactId>
-        <configuration>
-          <port>${tomcatRunPort}</port>
-          <path>${tomcatRunPath}</path>
-          <contextFile>${tomcatContextXml}</contextFile>
-          <systemProperties>
-            <plexus.home>${project.build.directory}/appserver-base</plexus.home>
-            <appserver.base>${project.build.directory}/appserver-base</appserver.base>
-            <appserver.home>${project.build.directory}/appserver-home</appserver.home>
-            <derby.system.home>${project.build.directory}/appserver-base/logs</derby.system.home>
-            <redback.admin.creation.file>${basedir}/target/auto-admin-creation.properties</redback.admin.creation.file>
-            <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
-            <archiva.user.configFileName>${project.build.directory}/appserver-base/conf/archiva.xml</archiva.user.configFileName>
-            <archiva.devMode>${archiva.devMode}</archiva.devMode>
-            <archiva.javascriptLog>${archiva.javascriptLog}</archiva.javascriptLog>
-            <archiva.logMissingI18n>${archiva.logMissingI18n}</archiva.logMissingI18n>
-          </systemProperties>
-        </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>${derbyVersion}</version>
-          </dependency>
-          <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-            <version>${javaxMailVersion}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-
       <plugin>
         <groupId>org.apache.tomcat.maven</groupId>
         <artifactId>tomcat6-maven-plugin</artifactId>
@@ -582,6 +548,9 @@
             <archiva.javascriptLog>${archiva.javascriptLog}</archiva.javascriptLog>
             <archiva.logMissingI18n>${archiva.logMissingI18n}</archiva.logMissingI18n>
           </systemProperties>
+          <additionalClasspathDirs>
+            <additionalClasspathDir>${basedir}/src/test/tomcat</additionalClasspathDir>
+          </additionalClasspathDirs>
         </configuration>
         <dependencies>
           <dependency>
@@ -616,7 +585,7 @@
             <archiva.logMissingI18n>${archiva.logMissingI18n}</archiva.logMissingI18n>
           </systemProperties>
           <additionalClasspathDirs>
-            <additionalClasspathDir>src/test/tomcat</additionalClasspathDir>
+            <additionalClasspathDir>${basedir}/src/test/tomcat</additionalClasspathDir>
           </additionalClasspathDirs>
         </configuration>
         <dependencies>
@@ -671,8 +640,6 @@
                 </goals>
                 <configuration>
                   <tasks>
-                    <copy overwrite="true" file="${basedir}/src/test/tomcat/log4j.xml"
-                          todir="${basedir}/src/main/webapp/WEB-INF/classes"/>
                     <copy overwrite="true" file="${basedir}/src/test/tomcat/auto-admin-creation.properties"
                           todir="${basedir}/target/"/>
                   </tasks>

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 184c84648314a949df95bdad7884d11887e7252a..9079013095c2d60bec6e56c1670a873f16b13344 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -1032,35 +1032,7 @@
           </supportedProjectTypes>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>tomcat-maven-plugin</artifactId>
-        <configuration>
-          <port>9091</port>
-          <path>/archiva</path>
-          <contextFile>${tomcatContextXml}</contextFile>
-          <systemProperties>
-            <plexus.home>${project.build.directory}/appserver-base</plexus.home>
-            <appserver.base>${project.build.directory}/appserver-base</appserver.base>
-            <appserver.home>${project.build.directory}/appserver-home</appserver.home>
-            <derby.system.home>${project.build.directory}/appserver-base/logs</derby.system.home>
-            <redback.admin.creation.file>${basedir}/target/auto-admin-creation.properties</redback.admin.creation.file>
-            <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
-          </systemProperties>
-        </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>${derbyVersion}</version>
-          </dependency>
-          <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-            <version>${javaxMailVersion}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
+
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
@@ -1328,8 +1300,7 @@
     </profile>
 
     <profile>
-      <!-- olamy profile to test tomcat plugin dev -->
-      <id>tdev</id>
+      <id>tomcat</id>
       <build>
         <plugins>
           <plugin>