gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@apache.org
Subject svn commit: r1290846 - in /gump/metadata/project: tomcat-tc7.xml tomcat-trunk.xml
Date Sat, 18 Feb 2012 19:11:58 GMT
Author: kkolinko
Date: Sat Feb 18 19:11:58 2012
New Revision: 1290846

URL: http://svn.apache.org/viewvc?rev=1290846&view=rev
Log:
Rearrange tomcat-tc7.0.x-validate-eoln project

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

Modified: gump/metadata/project/tomcat-tc7.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-tc7.xml?rev=1290846&r1=1290845&r2=1290846&view=diff
==============================================================================
--- gump/metadata/project/tomcat-tc7.xml (original)
+++ gump/metadata/project/tomcat-tc7.xml Sat Feb 18 19:11:58 2012
@@ -53,7 +53,11 @@
     <option project="javamail" />
     <option project="jaf" />
     <option project="junit" />
-    <option project="tomcat-tc7.0.x-validate" />
+    <!-- These option elements make both *-validate projects to run before
+      this project. Their result is not used here, so noclasspath.
+      The *-dbcp project is also built before this one, see above. -->
+    <option project="tomcat-tc7.0.x-validate"><noclasspath/></option>
+    <option project="tomcat-tc7.0.x-validate-eoln"><noclasspath/></option>
     <work nested="output/classes" />
 
     <license name="LICENSE" />
@@ -160,41 +164,17 @@
    <option project="javamail" />
    <option project="jaf" />
 
-   <license name="LICENSE" />
-
    <nag to="dev@tomcat.apache.org"
          from="Bill Barker &lt;billbarker@apache.org&gt;" />
  </project>
 
   <project name="tomcat-tc7.0.x-validate-eoln">
     <package>org.apache.catalina</package>
-    <ant target="validate-eoln">
-      <depend property="jdt.jar" project="eclipse" id="jdtcore" />
-      <depend property="tomcat-dbcp.jar" project="tomcat-tc7.0.x-dbcp" id="tomcat-dbcp"
/>
-      <property name="tomcat-dbcp-src.jar" project="tomcat-tc7.0.x-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-tc7.0.x-dbcp"
-         reference="home" />
-    </ant>
-
+    <ant target="validate-eoln" />
     <depend project="ant" inherit="runtime" />
-    <!-- Both this project and tomcat-tc7.0.x perform compilation
-      of the same files, but only tomcat-tc7.0.x should fail
-      if compilation fails. Thus this dependency is added. -->
-    <depend project="tomcat-tc7.0.x"><noclasspath /></depend>
+    <!-- classes have to be on the classpath so that taskdef
+      in build.xml finds the class -->
+    <work nested="output/classes" />
     <nag to="dev@tomcat.apache.org"
          from="Bill Barker &lt;billbarker@apache.org&gt;" />
   </project>

Modified: gump/metadata/project/tomcat-trunk.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-trunk.xml?rev=1290846&r1=1290845&r2=1290846&view=diff
==============================================================================
--- gump/metadata/project/tomcat-trunk.xml (original)
+++ gump/metadata/project/tomcat-trunk.xml Sat Feb 18 19:11:58 2012
@@ -172,6 +172,8 @@
     <package>org.apache.catalina</package>
     <ant target="validate-eoln" />
     <depend project="ant" inherit="runtime" />
+    <!-- classes have to be on the classpath so that taskdef
+      in build.xml finds the class -->
     <work nested="output/classes" />
     <nag to="dev@tomcat.apache.org"
          from="Bill Barker &lt;billbarker@apache.org&gt;" />



Mime
View raw message