some tests on tomcat exec war generation: in a profile not activated by default

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

diff --git a/archiva-tomcat/pom.xml b/archiva-tomcat/pom.xml
new file mode 100644 (file)
index 0000000..bb9c767
--- /dev/null
+++ b/archiva-tomcat/pom.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.archiva</groupId>
+    <artifactId>archiva</artifactId>
+    <version>1.4-M1-SNAPSHOT</version>
+  </parent>
+  <artifactId>archiva-tomcat</artifactId>
+  <packaging>pom</packaging>
+  <!-- This is filtered into the scripts, so should be set to Apache Archiva -->
+  <name>Apache Archiva</name>
+  <dependencies>
+
+    <dependency>
+      <groupId>org.apache.archiva</groupId>
+      <artifactId>archiva-webapp</artifactId>
+      <type>war</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.archiva</groupId>
+      <artifactId>archiva-docs</artifactId>
+      <type>zip</type>
+      <classifier>docs</classifier>
+    </dependency>
+    <!-- Runtime dependencies that need to be included in the generated binaries -->
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.1.3.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+      <version>1.4</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.tomcat.maven</groupId>
+        <artifactId>tomcat7-maven-plugin</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <id>tomcat-run</id>
+            <goals>
+              <goal>exec-war-only</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <enableNaming>true</enableNaming>
+              <warRunDependencies>
+                <warRunDependency>
+                  <dependency>
+                    <groupId>org.apache.archiva</groupId>
+                    <artifactId>archiva-webapp</artifactId>
+                    <version>${project.version}</version>
+                    <type>war</type>
+                  </dependency>
+                  <contextXml>src/main/tomcatconf/archiva.xml</contextXml>
+                  <contextPath>/archiva</contextPath>
+                </warRunDependency>
+              </warRunDependencies>
+              <extraDependencies>
+                <extraDependency>
+                  <groupId>org.apache.derby</groupId>
+                  <artifactId>derby</artifactId>
+                  <version>10.1.3.1</version>
+                </extraDependency>
+                <extraDependency>
+                  <groupId>javax.mail</groupId>
+                  <artifactId>mail</artifactId>
+                  <version>1.4</version>
+                </extraDependency>
+              </extraDependencies>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

diff --git a/archiva-tomcat/src/main/tomcatconf/archiva.xml b/archiva-tomcat/src/main/tomcatconf/archiva.xml
new file mode 100644 (file)
index 0000000..4f7ce1d
--- /dev/null
+++ b/archiva-tomcat/src/main/tomcatconf/archiva.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<Context path="/archiva">
+  <Resource name="jdbc/users" auth="Container" type="javax.sql.DataSource"
+            username="sa"
+            password=""
+            driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
+            url="jdbc:derby:${appserver.base}/database/users;create=true"
+  />
+  <Resource name="mail/Session" auth="Container"
+          type="javax.mail.Session"
+          mail.smtp.host="localhost"/>
+                
+</Context>

diff --git a/pom.xml b/pom.xml
index 04926ecfa660ac0a0876efac710d2cc41d1467b3..3e06dba8c6c5bca2185349e9a37ca302326b4250 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1741,6 +1741,9 @@
     <profile>
       <!-- olamy profile to test tomcat plugin dev -->
       <id>tdev</id>
+      <modules>
+        <module>archiva-tomcat</module>
+      </modules>
       <build>
         <pluginManagement>
           <plugins>