]> source.dussan.org Git - archiva.git/commitdiff
add configurarion to test tomcat7 plugin
authorOlivier Lamy <olamy@apache.org>
Sat, 8 Oct 2011 19:41:37 +0000 (19:41 +0000)
committerOlivier Lamy <olamy@apache.org>
Sat, 8 Oct 2011 19:41:37 +0000 (19:41 +0000)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1180473 13f79535-47bb-0310-9956-ffa450edef68

archiva-modules/archiva-web/archiva-webapp/pom.xml
pom.xml

index 4926e87314667796bdd4874d575719a17cf38e9f..2bea3a5d0cc7631083d466fe71768792917dd2a9 100644 (file)
               </dependency>
             </dependencies>
           </plugin>
+          <plugin>
+            <groupId>org.apache.tomcat.maven</groupId>
+            <artifactId>tomcat7-maven-plugin</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <configuration>
+              <port>9091</port>
+              <path>/archiva</path>
+              <contextFile>${basedir}/src/test/tomcat/tomcat-context-archiva.xml</contextFile>
+              <systemProperties>
+                <plexus.home>${basedir}/appserver-base</plexus.home>
+                <appserver.base>${basedir}/appserver-base</appserver.base>
+                <appserver.home>${project.build.directory}/appserver-home</appserver.home>
+                <derby.system.home>${basedir}/appserver-base/logs</derby.system.home>
+                <redback.admin.creation.file>${basedir}/target/auto-admin-creation.properties</redback.admin.creation.file>
+              </systemProperties>
+            </configuration>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derby</artifactId>
+                <version>10.1.3.1</version>
+              </dependency>
+              <dependency>
+                <groupId>javax.mail</groupId>
+                <artifactId>mail</artifactId>
+                <version>1.4</version>
+              </dependency>
+            </dependencies>
+          </plugin>
         </plugins>
       </build>
     </profile>
diff --git a/pom.xml b/pom.xml
index 93d243465ff9724a1c31f0493ce06100ce5406bf..0ed07db0af28d3bc591012296606aac803e3c105 100644 (file)
--- a/pom.xml
+++ b/pom.xml
               <artifactId>tomcat6-maven-plugin</artifactId>
               <version>2.0-SNAPSHOT</version>
             </plugin>
+            <plugin>
+              <groupId>org.apache.tomcat.maven</groupId>
+              <artifactId>tomcat7-maven-plugin</artifactId>
+              <version>2.0-SNAPSHOT</version>
+            </plugin>
           </plugins>
         </pluginManagement>
         <plugins>
             <groupId>org.apache.tomcat.maven</groupId>
             <artifactId>tomcat6-maven-plugin</artifactId>
            </plugin>
+          <plugin>
+            <groupId>org.apache.tomcat.maven</groupId>
+            <artifactId>tomcat7-maven-plugin</artifactId>
+           </plugin>
         </plugins>
       </build>
     </profile>