You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/10/17 22:01:13 UTC
svn commit: r1185349 - in /archiva/trunk: archiva-tomcat/
archiva-tomcat/pom.xml archiva-tomcat/src/ archiva-tomcat/src/main/
archiva-tomcat/src/main/tomcatconf/
archiva-tomcat/src/main/tomcatconf/archiva.xml pom.xml
Author: olamy
Date: Mon Oct 17 20:01:13 2011
New Revision: 1185349
URL: http://svn.apache.org/viewvc?rev=1185349&view=rev
Log:
some tests on tomcat exec war generation: in a profile not activated by default
Added:
archiva/trunk/archiva-tomcat/
archiva/trunk/archiva-tomcat/pom.xml (with props)
archiva/trunk/archiva-tomcat/src/
archiva/trunk/archiva-tomcat/src/main/
archiva/trunk/archiva-tomcat/src/main/tomcatconf/
archiva/trunk/archiva-tomcat/src/main/tomcatconf/archiva.xml (with props)
Modified:
archiva/trunk/pom.xml
Added: archiva/trunk/archiva-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-tomcat/pom.xml?rev=1185349&view=auto
==============================================================================
--- archiva/trunk/archiva-tomcat/pom.xml (added)
+++ archiva/trunk/archiva-tomcat/pom.xml Mon Oct 17 20:01:13 2011
@@ -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>
Propchange: archiva/trunk/archiva-tomcat/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-tomcat/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: archiva/trunk/archiva-tomcat/src/main/tomcatconf/archiva.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-tomcat/src/main/tomcatconf/archiva.xml?rev=1185349&view=auto
==============================================================================
--- archiva/trunk/archiva-tomcat/src/main/tomcatconf/archiva.xml (added)
+++ archiva/trunk/archiva-tomcat/src/main/tomcatconf/archiva.xml Mon Oct 17 20:01:13 2011
@@ -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>
Propchange: archiva/trunk/archiva-tomcat/src/main/tomcatconf/archiva.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-tomcat/src/main/tomcatconf/archiva.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1185349&r1=1185348&r2=1185349&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Mon Oct 17 20:01:13 2011
@@ -1741,6 +1741,9 @@
<profile>
<!-- olamy profile to test tomcat plugin dev -->
<id>tdev</id>
+ <modules>
+ <module>archiva-tomcat</module>
+ </modules>
<build>
<pluginManagement>
<plugins>