gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From billbar...@apache.org
Subject svn commit: r1509547 - /gump/metadata/project/tomcat-trunk.xml
Date Fri, 02 Aug 2013 05:16:04 GMT
Author: billbarker
Date: Fri Aug  2 05:16:04 2013
New Revision: 1509547

URL: http://svn.apache.org/r1509547
Log:
dbcp build is now integrated into the regular tomcat build

Modified:
    gump/metadata/project/tomcat-trunk.xml

Modified: gump/metadata/project/tomcat-trunk.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-trunk.xml?rev=1509547&r1=1509546&r2=1509547&view=diff
==============================================================================
--- gump/metadata/project/tomcat-trunk.xml (original)
+++ gump/metadata/project/tomcat-trunk.xml Fri Aug  2 05:16:04 2013
@@ -27,6 +27,7 @@
 
   <svn repository="asf" dir="tomcat/trunk"/>
 
+  <mkdir dir="tomcat-deps" />
   <project name="tomcat-trunk">
     <package>org.apache.catalina</package>
     <ant>
@@ -42,12 +43,12 @@
       <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="commons-pool.home" project="commons-pool2"
+         path="pool" />
+      <property name="commons-dbcp.home" project="commons-dbcp2"
+         path="dbcp" />
+      <property name="tomcat-dbcp.home" project="tomcat-trunk"
+         path="tomcat-deps" />
     </ant>
 
     <depend project="ant" inherit="runtime" />
@@ -83,31 +84,6 @@
          from="Bill Barker &lt;billbarker@apache.org&gt;" />
   </project>
 
-  <project name="tomcat-trunk-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-trunk-test">
    <package>org.apache.catalina</package>
    <ant target="test">
@@ -122,12 +98,12 @@
       <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="commons-pool.home" project="commons-pool2"
+                path="pool" />
+      <property name="commons-dbcp.home" project="commons-dbcp2"
+                path="dbco" />
+      <property name="tomcat-dbcp.home" project="tomcat-trunk"
+         path="tomcat-deps" />
       <property name="examples.sources.skip" value="true" />
       <property name="test.accesslog" value="true" />
     </ant>



Mime
View raw message