You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by bi...@apache.org on 2011/09/10 04:30:38 UTC

svn commit: r1167439 - in /gump/metadata: profile/gump.xml project/tomcat-tc7.xml project/tomcat-trunk.xml

Author: billbarker
Date: Sat Sep 10 02:30:38 2011
New Revision: 1167439

URL: http://svn.apache.org/viewvc?rev=1167439&view=rev
Log:
Adding Tomcat 7 to the mix

Added:
    gump/metadata/project/tomcat-tc7.xml   (with props)
Modified:
    gump/metadata/profile/gump.xml
    gump/metadata/project/tomcat-trunk.xml

Modified: gump/metadata/profile/gump.xml
URL: http://svn.apache.org/viewvc/gump/metadata/profile/gump.xml?rev=1167439&r1=1167438&r2=1167439&view=diff
==============================================================================
--- gump/metadata/profile/gump.xml (original)
+++ gump/metadata/profile/gump.xml Sat Sep 10 02:30:38 2011
@@ -131,6 +131,7 @@
   <module href="project/tomcat-jasper_tc6.xml" />
   <module href="project/tomcat-taglibs.xml"/>
   <module href="project/tomcat-tc6.xml" />
+  <module href="project/tomcat-tc7.xml" />
   <module href="project/tomcat-trunk.xml" />
 
   <!-- Apache.Logging -->

Added: gump/metadata/project/tomcat-tc7.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-tc7.xml?rev=1167439&view=auto
==============================================================================
--- gump/metadata/project/tomcat-tc7.xml (added)
+++ gump/metadata/project/tomcat-tc7.xml Sat Sep 10 02:30:38 2011
@@ -0,0 +1,172 @@
+<?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.
+-->
+
+
+<module name="tomcat-trunk">
+
+  <description>
+    Tomcat 7.x, a web server implementing Java Servlet 3.0,
+    Java Server Pages 2.2 &amp; Expression Language 2.2 specifications
+  </description>
+  <url href="http://tomcat.apache.org/index.html"/>
+
+  <svn repository="asf" dir="tomcat/tc7.0x/trunk"/>
+
+  <project name="tomcat-tc7.0">
+    <package name="org.apache.catalina" />
+    <ant>
+      <depend property="jdt.jar" project="eclipse" id="jdtcore" />
+      <depend property="tomcat-dbcp.jar" project="tomcat-trunk-dbcp" id="tomcat-dbcp" />
+      <property name="tomcat-dbcp-src.jar" project="tomcat-trunk-dbcp"
+              id="tomcat-dbcp-src" reference="jarpath" />
+      <depend property="commons-daemon.jar" project="commons-daemon" 
+              id="commons-daemon" />
+      <property name="commons-daemon.native.src.tgz" project="commons-daemon"
+              id="native-distro" reference="outputpath" />
+      <property name="tomcat-native.tar.gz" project="commons-daemon"
+              id="native-distro" reference="outputpath" />
+      <property name="junit.jar" project="junit" reference="jarpath" id="junit" />
+      <property name="commons-pool.home" project="commons-pool"
+         path="." />
+      <property name="commons-dbcp.home" project="commons-dbcp"
+         path="." />
+      <property name="tomcat-dbcp.home" project="tomcat-trunk-dbcp"
+         reference="home" />
+      <property name="checkstyle.jar" project="checkstyle"
+         reference="jarpath" />
+    </ant>
+
+    <depend project="ant" inherit="runtime" />
+    <option project="javamail" />
+    <option project="jaf" />
+    <option project="junit" />
+    <option project="tomcat-trunk-validate" />
+    <work nested="output/classes" />
+
+    <license name="LICENSE" />
+    <home nested="output/build" />
+    <jar name="bin/bootstrap.jar" id="bootstrap" />
+    <jar name="bin/tomcat-juli.jar" id="tomcat-juli" />
+    <jar name="lib/annotations-api.jar" id="annotations-api" />
+    <jar name="lib/servlet-api.jar" id="servlet-api" />
+    <jar name="lib/jsp-api.jar"  id="jsp-api" />
+    <jar name="lib/el-api.jar" id="el-api" />
+    <jar name="lib/catalina.jar" id="catalina" />
+    <jar name="lib/catalina-ant.jar" id="catalina-ant" />
+    <jar name="lib/tomcat-coyote.jar" id="tomcat-coyote" />
+    <jar name="lib/jasper.jar" id="jasper" />
+    <jar name="lib/jasper-el.jar" id="jasper-el" />
+    <jar name="lib/catalina-tribes.jar" id="catalina-tribes" />
+    <jar name="lib/catalina-ha.jar" id="catalina-ha" />
+    <jar name="lib/tomcat-api.jar" id="tomcat-api" />
+    <jar name="lib/tomcat-util.jar" id="tomcat-util" />
+    <nag to="dev@tomcat.apache.org"
+         from="Bill Barker &lt;billbarker@apache.org&gt;" />
+  </project>
+
+  <project name="tomcat-tc7.0x-dbcp">
+    <package>org.apache.tomcat.dbcp</package>
+    <mkdir dir="tomcat-deps" />
+    <ant target="build-tomcat-dbcp" >
+      <property name="commons-pool.home" project="commons-pool"
+         path="." />
+      <property name="commons-dbcp.home" project="commons-dbcp"
+         path="." />
+      <property name="tomcat-dbcp.home" project="tomcat-trunk-dbcp"
+         reference="home" />
+      <property name="tomcat-dbcp.jar" project="tomcat-trunk-dbcp"
+         id="tomcat-dbcp" reference="jarpath"  />
+    </ant>
+
+    <depend project="ant" inherit="runtime"/>
+    <depend project="jta" />
+    <home nested="tomcat-deps" />
+    <jar name="tomcat-dbcp-@@DATE@@.jar" id="tomcat-dbcp"/>
+    <jar name="tomcat-dbcp-src.jar"  id="tomcat-dbcp-src" />
+    <license name="LICENSE" />
+
+    <nag to="dev@tomcat.apache.org"
+         from="Bill Barker &lt;billbarker@apache.org&gt;" />
+  </project>
+
+ <project name="tomcat-tc7.0x-test">
+   <package>org.apache.catalina</package>
+   <ant target="test">
+      <depend property="jdt.jar" project="eclipse" id="jdtcore" />
+      <depend property="tomcat-dbcp.jar" project="tomcat-trunk-dbcp" id="tomcat-dbcp" />
+      <property name="tomcat-dbcp-src.jar" project="tomcat-trunk-dbcp"
+            id="tomcat-dbcp-src" reference="jarpath" />
+      <depend property="commons-daemon.jar" project="commons-daemon" 
+              id="commons-daemon" />
+      <property name="commons-daemon.native.src.tgz" project="commons-daemon"
+              id="native-distro" reference="outputpath" />
+      <property name="tomcat-native.tar.gz" project="commons-daemon"
+              id="native-distro" reference="outputpath" />
+      <depend property="junit.jar" project="junit" id="junit"/>
+      <property name="commons-pool.home" project="commons-pool"
+                path="." />
+      <property name="commons-dbcp.home" project="commons-dbcp"
+                path="." />
+      <property name="tomcat-dbcp.home" project="tomcat-trunk-dbcp"
+         reference="home" />
+      <property name="examples.sources.skip" value="true" />
+      <property name="checkstyle.jar" project="checkstyle"
+         reference="jarpath" />
+    </ant>
+
+   <depend project="ant" inherit="runtime" />
+   <depend project="tomcat-trunk"/>
+   <option project="javamail" />
+   <option project="jaf" />
+
+   <work nested="output/build/webapps/examples/WEB-INF/classes"/>
+   <work nested="output/testclasses" />
+
+   <license name="LICENSE" />
+
+   <report nested="output/build/logs" />
+
+   <nag to="dev@tomcat.apache.org"
+         from="Bill Barker &lt;billbarker@apache.org&gt;" />
+ </project>
+ <project name="tomcat-tc7.0x-validate">
+   <package>org.apache.catalina</package>
+   <ant target="validate">
+      <!-- depend property="checkstyle.jar" project="checkstyle"/ -->
+      <property name="checkstyle.jar" project="checkstyle"
+            path="target/checkstyle-5.5-SNAPSHOT.jar" />
+      <property name="execute.validate" value="true" />
+   </ant>
+
+   <depend project="ant" inherit="runtime" />
+   <depend project="checkstyle" runtime="true" inherit="hard"/>
+   <depend project="commons-logging" />
+   <depend project="commons-collections" />
+   <depend project="antlr" />
+   <!-- depend project="emma" / -->
+   <depend project="jdom" />
+   <depend project="org.apache.velocity.velocity-engine"  />
+   <option project="javamail" />
+   <option project="jaf" />
+
+   <license name="LICENSE" />
+
+   <nag to="dev@tomcat.apache.org"
+         from="Bill Barker &lt;billbarker@apache.org&gt;" />
+ </project>
+</module>

Propchange: gump/metadata/project/tomcat-tc7.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: gump/metadata/project/tomcat-trunk.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-trunk.xml?rev=1167439&r1=1167438&r2=1167439&view=diff
==============================================================================
--- gump/metadata/project/tomcat-trunk.xml (original)
+++ gump/metadata/project/tomcat-trunk.xml Sat Sep 10 02:30:38 2011
@@ -20,7 +20,7 @@
 <module name="tomcat-trunk">
 
   <description>
-    Tomcat 7.x, a web server implementing Java Servlet 3.0,
+    Tomcat 7.x, a web server implementing Java Servlet 3.1,
     Java Server Pages 2.2 &amp; Expression Language 2.2 specifications
   </description>
   <url href="http://tomcat.apache.org/index.html"/>