this module won't be used

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

diff --git a/archiva-tomcat/pom.xml b/archiva-tomcat/pom.xml
deleted file mode 100644 (file)
index 494189a..0000000
--- a/archiva-tomcat/pom.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?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-M3-SNAPSHOT</version>
-  </parent>
-  <artifactId>archiva-tomcat</artifactId>
-  <packaging>pom</packaging>
-  <name>Apache Archiva :: Embedded Tomcat</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>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.mail</groupId>
-      <artifactId>mail</artifactId>
-      <version>${javaxMailVersion}</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>${derbyVersion}</version>
-                </extraDependency>
-                <extraDependency>
-                  <groupId>javax.mail</groupId>
-                  <artifactId>mail</artifactId>
-                  <version>${javaxMailVersion}</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
deleted file mode 100644 (file)
index 32b71b0..0000000
--- a/archiva-tomcat/src/main/tomcatconf/archiva.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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:${catalina.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 99be1b59f7dd7b8dcee88929505faeaa63ca400e..efaa2c7e7382cf5a5a59a0c8780fd50cbe8b75d9 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1785,13 +1785,6 @@
       </modules>
     </profile>
 
-    <profile>
-      <!-- olamy profile to test tomcat plugin dev -->
-      <id>tdev</id>
-      <modules>
-        <module>archiva-tomcat</module>
-      </modules>
-    </profile>
   </profiles>
 
   <repositories>