geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlaskow...@apache.org
Subject svn commit: r383631 - in /geronimo/trunk: modules/tomcat/pom.xml pom.xml
Date Mon, 06 Mar 2006 19:30:44 GMT
Author: jlaskowski
Date: Mon Mar  6 11:30:41 2006
New Revision: 383631

URL: http://svn.apache.org/viewcvs?rev=383631&view=rev
Log:
GERONIMO-1645 tomcat module migration to Maven2

Thanks Anita!

Added:
    geronimo/trunk/modules/tomcat/pom.xml   (with props)
Modified:
    geronimo/trunk/pom.xml

Added: geronimo/trunk/modules/tomcat/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/pom.xml?rev=383631&view=auto
==============================================================================
--- geronimo/trunk/modules/tomcat/pom.xml (added)
+++ geronimo/trunk/modules/tomcat/pom.xml Mon Mar  6 11:30:41 2006
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+    Copyright 2006 The Apache Software Foundation
+    
+    Licensed 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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.geronimo</groupId>
+    <artifactId>geronimo</artifactId>
+    <version>1.2-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apache.geronimo</groupId>
+  <artifactId>geronimo-tomcat</artifactId>
+  <version>${geronimoVersion}</version>
+  <packaging>jar</packaging>
+  <name>Geronimo :: Tomcat</name>
+  <!-- TODO: Find a way to get rid of that -->
+  <properties>
+    <endorsedDir>target/endorsed</endorsedDir>
+    <localRepoDir>${user.home}/.m2/repository</localRepoDir>
+  </properties>
+  <build>
+    <resources>
+      <resource>
+        <directory>src/resources</directory>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>process-test-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <tstamp />
+                <!-- add this to parent -->
+                <copy todir="target/var/catalina/conf" file="src/resources/META-INF/geronimo-tomcat/var/catalina/conf/web.xml"
/>
+                <copy todir="target/var/catalina/webapps">
+                  <fileset dir="src/test-resources/deployables">
+                    <include name="war1/**" />
+                    <include name="war3/**" />
+                  </fileset>
+                </copy>
+                <!-- TODO Extract localRepoDir from localRepository -->
+                <copy todir="${endorsedDir}" flatten="true">
+                  <fileset dir="${localRepoDir}">
+                    <include name="xerces/xercesImpl/${xercesVersion}/*.jar" />
+                    <include name="xml-apis/xml-apis/${xmlApisVersion}/*.jar" />
+                  </fileset>
+                </copy>
+              </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jsp_2.0_spec</artifactId>
+      <version>${geronimoSpecJspVersion}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+      <version>${geronimoSpecJ2eeJaccVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+      <version>${geronimoSpecJ2eeConnectorVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+      <version>${geronimoSpecJtaVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+      <version>${geronimoSpecJ2eeManagementVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo</groupId>
+      <artifactId>geronimo-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo</groupId>
+      <artifactId>geronimo-connector</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.geronimo</groupId>
+      <artifactId>geronimo-kernel</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo</groupId>
+      <artifactId>geronimo-naming</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.geronimo</groupId>
+      <artifactId>geronimo-security</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo</groupId>
+      <artifactId>geronimo-system</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo</groupId>
+      <artifactId>geronimo-transaction</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo</groupId>
+      <artifactId>geronimo-webservices</artifactId>
+      <!-- ws uses dependencies.dependency.version -->
+      <version>${geronimoVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo</groupId>
+      <artifactId>geronimo-security-builder</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>mx4j</groupId>
+      <artifactId>mx4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>catalina</artifactId>
+      <version>${tomcatVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>tomcat-ajp</artifactId>
+      <version>${tomcatAjpVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>catalina-cluster</artifactId>
+      <version>${tomcatVersion}</version>
+    </dependency>
+    <!--
+       - Required until any realm is provided to Tomcat
+       - See StandardEngine::getRealm() 
+       -->
+    <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>catalina-optional</artifactId>
+      <version>${tomcatVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>tomcat-coyote</artifactId>
+      <version>${tomcatVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>tomcat-http</artifactId>
+      <version>${tomcatVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>jasper-compiler</artifactId>
+      <version>${tomcatVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>jasper-compiler-jdt</artifactId>
+      <version>${tomcatVersion}</version>
+    </dependency>
+    <dependency>
+
+      <groupId>tomcat</groupId>
+      <artifactId>jasper-runtime</artifactId>
+      <version>${tomcatVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>tomcat-util</artifactId>
+      <version>${tomcatVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>naming-resources</artifactId>
+      <version>${tomcatVersion}</version>
+    </dependency>
+    <dependency>
+
+      <groupId>tomcat</groupId>
+      <artifactId>servlets-default</artifactId>
+      <version>${tomcatVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>servlets-invoker</artifactId>
+      <version>${tomcatVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>${xercesVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+      <version>${xmlApisVersion}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <version>${commonsBeanutilsVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>${commonsCollectionsVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-digester</groupId>
+      <artifactId>commons-digester</artifactId>
+      <version>${commonsDigesterVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-el</groupId>
+      <artifactId>commons-el</artifactId>
+      <version>${commonsElVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>${commonsLoggingVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-modeler</groupId>
+      <artifactId>commons-modeler</artifactId>
+      <version>${commonsModelerVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>regexp</groupId>
+      <artifactId>regexp</artifactId>
+      <version>${regexpVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>wadi</groupId>
+      <artifactId>wadi-core</artifactId>
+      <version>${wadiVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>wadi</groupId>
+      <artifactId>wadi-tomcat55</artifactId>
+      <version>${wadiVersion}</version>
+    </dependency>
+  </dependencies>
+</project>

Propchange: geronimo/trunk/modules/tomcat/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/modules/tomcat/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/pom.xml?rev=383631&r1=383630&r2=383631&view=diff
==============================================================================
--- geronimo/trunk/pom.xml (original)
+++ geronimo/trunk/pom.xml Mon Mar  6 11:30:41 2006
@@ -194,6 +194,7 @@
     <tranqlVendorsVersion>1.0</tranqlVendorsVersion>
     <tranqlVersion>1.2.2</tranqlVersion>
     <velocityVersion>1.4</velocityVersion>
+    <wadiVersion>2.0M1</wadiVersion>
     <wsdl4jVersion>1.5.2</wsdl4jVersion>
     <xercesVersion>2.6.2</xercesVersion>
     <xfireVersion>20050202</xfireVersion>



Mime
View raw message