gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r896795 - in /gump/metadata: profile/gump.xml project/ant-1.5.xml project/ant-embed-proposal.xml project/ant-xdocs-proposal.xml project/ant.xml
Date Thu, 07 Jan 2010 08:25:19 GMT
Author: bodewig
Date: Thu Jan  7 08:24:45 2010
New Revision: 896795

URL: http://svn.apache.org/viewvc?rev=896795&view=rev
Log:
svn restructuring in Ant's trunk

Added:
    gump/metadata/project/ant-embed-proposal.xml   (contents, props changed)
      - copied, changed from r896770, gump/metadata/project/ant.xml
    gump/metadata/project/ant-xdocs-proposal.xml   (contents, props changed)
      - copied, changed from r896770, gump/metadata/project/ant.xml
Removed:
    gump/metadata/project/ant-1.5.xml
Modified:
    gump/metadata/profile/gump.xml
    gump/metadata/project/ant.xml

Modified: gump/metadata/profile/gump.xml
URL: http://svn.apache.org/viewvc/gump/metadata/profile/gump.xml?rev=896795&r1=896794&r2=896795&view=diff
==============================================================================
--- gump/metadata/profile/gump.xml (original)
+++ gump/metadata/profile/gump.xml Thu Jan  7 08:24:45 2010
@@ -28,7 +28,8 @@
   <module href="project/ant-antlibs.xml"/>
   <module href="project/ant-antlibs-sandbox.xml"/>
   <module href="project/ivy.xml"/>  
-  <!--module href="project/ant-1.5.xml"/-->
+  <module href="project/ant-embed-proposal.xml"/>
+  <module href="project/ant-xdocs-proposal.xml"/>
 
 <!-- Apache.Avalon (SVN) -->
   <module href="project/avalon-tools.xml"/> <!-- magic bootstrap -->

Copied: gump/metadata/project/ant-embed-proposal.xml (from r896770, gump/metadata/project/ant.xml)
URL: http://svn.apache.org/viewvc/gump/metadata/project/ant-embed-proposal.xml?p2=gump/metadata/project/ant-embed-proposal.xml&p1=gump/metadata/project/ant.xml&r1=896770&r2=896795&rev=896795&view=diff
==============================================================================
--- gump/metadata/project/ant.xml (original)
+++ gump/metadata/project/ant-embed-proposal.xml Thu Jan  7 08:24:45 2010
@@ -15,237 +15,19 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<module name="ant">
+<module name="ant-embed-proposal">
 
   <url  href="http://ant.apache.org/index.html"/>
   <description>
-    Java based build tool
+    Historical Embed Proposal for Ant
   </description>
 
-  <svn repository="asf" dir="ant/core/trunk"/>
-
-  <project name="jakarta-ant">
-    <depend project="ant" inherit="jars"/>
-  </project>
-
-  <project name="ant">
-    <package>org.apache.tools.ant</package>
-
-    <ant target="dist-lite">
-      <property name="ant.home" reference="home" project="ant"/>
-      <property name="optional.jars.whenmanifestonly" value="create"/>
-    </ant>
-
-    <depend project="bootstrap-ant"/>
-    <depend project="xml-xerces"/>
-    <depend project="xml-apis"/>
-    <option project="xalan" ids="xalan"/>
-    <option project="junit3" runtime="true"/>
-
-    <!-- actually, we won't get here if resolver is not available
-    since Xerces won't build, so while this is an option, it will
-    always be satisfied -->
-    <option project="xml-resolver" runtime="true"/>
-
-    <home nested="dist"/>
-
-    <jar name="lib/ant.jar" id="ant"/>
-    <jar name="lib/ant-launcher.jar" id="ant-launcher"/>
-
-    <jar name="lib/ant-jmf.jar" id="ant-jmf"/>
-    <jar name="lib/ant-junit.jar" id="ant-junit"/>
-    <jar name="lib/ant-swing.jar" id="ant-swing"/>
-    <jar name="lib/ant-trax.jar" id="ant-trax"/>
-    <jar name="lib/ant-nodeps.jar" id="ant-nodeps"/>
-    <jar name="lib/ant-apache-resolver.jar" id="ant-apache-resolver"/>
-    <jar name="lib/ant-apache-xalan2.jar" id="ant-apache-xalan2"/>
-
-    <license name="LICENSE"/>
-
-    <nag from="Gump Integration Build &lt;bodewig@apache.org&gt;"
-         to="notifications@ant.apache.org"/>
-  </project>
-
-  <!-- Ant 1.7.x seems to be available under groupId org.apache.ant -->
-  <project name="org.apache.ant" groupId="org.apache.ant">
-    <depend project="ant"/>
-    <home nested="dist"/>
-    <jar name="lib/ant.jar" id="ant"/>
-    <jar name="lib/ant-launcher.jar" id="ant-launcher"/>
-
-    <jar name="lib/ant-jmf.jar" id="ant-jmf"/>
-    <jar name="lib/ant-junit.jar" id="ant-junit"/>
-    <jar name="lib/ant-swing.jar" id="ant-swing"/>
-    <jar name="lib/ant-trax.jar" id="ant-trax"/>
-    <jar name="lib/ant-nodeps.jar" id="ant-nodeps"/>
-    <jar name="lib/ant-apache-resolver.jar" id="ant-apache-resolver"/>
-    <jar name="lib/ant-apache-xalan2.jar" id="ant-apache-xalan2"/>
-  </project>
-
-  <project name="dist-ant">
-    <ant target="distribution">
-      <property name="chmod.fail" value="false"/>
-      <property name="optional.jars.whenmanifestonly" value="create"/>
-    </ant>
-
-    <depend project="ant" inherit="runtime"/>
-    <depend project="xml-xerces"/>
-    <depend project="xml-apis"/>
-    <option project="xalan" ids="xalan"/>
-
-    <option project="antlr" runtime="true"/>
-    <option project="commons-logging" runtime="true"/>
-    <option project="commons-net" runtime="true"/>
-    <option project="jaf" runtime="true"/>
-    <option project="bcel" runtime="true"/>
-    <option project="jakarta-bsf" runtime="true"/>
-    <option project="logging-log4j-12" runtime="true"/>
-    <option project="jakarta-oro" runtime="true"/>
-    <option project="jakarta-regexp" runtime="true"/>
-    <option project="jakarta-servletapi-4" runtime="true"/>
-    <option project="javamail" runtime="true"/>
-    <option project="jdepend" runtime="true"/>
-    <option project="jsch" runtime="true"/>
-    <option project="xml-stylebook2" runtime="true"/>
-    <option project="jai" runtime="true"/>
-
-    <home nested="build"/>
-    <!-- since we are now running the compile-tests target, the work element is necessary

-         so that the test classes which reference optional tasks compiled in this step  
-         can be built.
-         we have had problems with ssh, jakarta-oro, jakarta-regexp dependent classes -->
-    <work nested="build/classes"/>
-
-    <jar name="lib/ant.jar" id="ant"/>
-    <jar name="lib/ant-launcher.jar" id="ant-launcher"/>
-
-    <jar name="lib/ant-antlr.jar" id="ant-antlr"/>
-    <jar name="lib/ant-apache-bcel.jar" id="ant-apache-bcel"/>
-    <jar name="lib/ant-apache-bsf.jar" id="ant-apache-bsf"/>
-    <jar name="lib/ant-apache-log4j.jar" id="ant-apache-log4j"/>
-    <jar name="lib/ant-apache-oro.jar" id="ant-apache-oro"/>
-    <jar name="lib/ant-apache-regexp.jar" id="jakarta-regexp"/>
-    <jar name="lib/ant-apache-resolver.jar" id="ant-apache-resolver"/>
-    <jar name="lib/ant-apache-xalan2.jar" id="ant-apache-xalan2"/>
-    <jar name="lib/ant-commons-logging.jar" id="ant-commons-logging"/>
-    <jar name="lib/ant-commons-net.jar" id="ant-commons-net"/>
-    <jar name="lib/ant-jai.jar" id="ant-jai"/>
-    <jar name="lib/ant-javamail.jar" id="ant-javamail"/>
-    <jar name="lib/ant-jdepend.jar" id="ant-jdepend"/>
-    <jar name="lib/ant-jmf.jar" id="ant-jmf"/>
-    <jar name="lib/ant-jsch.jar" id="ant-jsch"/>
-    <jar name="lib/ant-junit.jar" id="ant-junit"/>
-    <jar name="lib/ant-nodeps.jar" id="ant-nodeps"/>
-    <jar name="lib/ant-stylebook.jar" id="ant-stylebook"/>
-    <jar name="lib/ant-swing.jar" id="ant-swing"/>
-    <jar name="lib/ant-trax.jar" id="ant-trax"/>
-
-    <javadoc nested="build/javadocs" project="ant"/>
-
-    <nag from="Gump Integration Build &lt;bodewig@apache.org&gt;"
-         to="notifications@ant.apache.org"/>
-  </project>
-
-  <project name="ant-testutil" groupId="org.apache.ant">
-    <ant target="test-jar"/>
-
-    <depend project="ant"/>
-    <depend project="junit"/>
-    <depend project="xml-xerces"/>
-    <depend project="xml-apis"/>
-
-    <home nested="build/lib"/>
-    <jar name="ant-testutil.jar" id="ant-testutil"/>
-
-    <nag from="Gump Integration Build &lt;bodewig@apache.org&gt;"
-         to="notifications@ant.apache.org"/>
-  </project>
-
-  <project name="test-ant">
-    <ant target="run-tests">
-      <property name="test.haltonfailure" value="false"/>
-      <property name="ant.home" reference="home" project="ant"/>
-    </ant>
-
-    <depend project="dist-ant" inherit="runtime"/>
-    <depend project="antunit"/>
-    <depend project="junit"/>
-    <depend project="xml-xerces"/>
-    <depend project="xml-apis"/>
-    <option project="xalan" ids="xalan serializer"/>
-    
-    <option project="jakarta-tomcat-4.0" ids="jasper-compiler jasper-runtime"/>
-    <option project="xml-commons-which"/>
-    <option project="rhino"/>
-    <option project="bsh"/>
-    <option project="commons-codec"/>
-
-    <work nested="build/testcases"/>
-    <work nested="src/tests/junit"/>
-    <work nested="src/etc/testcases"/>
-    <work nested="src/etc/testcases/taskdefs/optional/out"/>
-
-    <nag from="Gump Integration Build &lt;bodewig@apache.org&gt;"
-         to="notifications@ant.apache.org"
-         subject="Test Failure - Ant"/>
-  </project>
-
-  <!--
-       This project runs Ant's tests against whatever JAXP implementation
-       is present in the VM.  It means the tests will fail on JDK 1.3-
-       because there is no XML parser around.
-
-       The primary purpose is to find hidden Xerces/Xalan dependencies
-       in Ant.
-  -->
-  <project name="test-ant-no-xerces">
-    <ant target="run-tests">
-      <property name="test.haltonfailure" value="false"/>
-      <property name="ant.home" reference="home" project="ant"/>
-    </ant>
-
-    <depend project="dist-ant" inherit="runtime"/>
-    <depend project="antunit"/>
-    <depend project="junit"/>
-    
-    <option project="jakarta-tomcat-4.0" ids="jasper-compiler jasper-runtime"/>
-    <option project="xml-commons-which"/>
-    <option project="rhino"/>
-    <option project="bsh"/>
-    <option project="commons-codec"/>
-
-    <work nested="build/testcases"/>
-    <work nested="src/tests/junit"/>
-    <work nested="src/etc/testcases"/>
-    <work nested="src/etc/testcases/taskdefs/optional/out"/>
-
-    <nag from="Gump Integration Build &lt;bodewig@apache.org&gt;"
-         to="notifications@ant.apache.org"
-         subject="Test Failure - Ant"/>
-  </project>
-
-  <project name="bootstrap-ant">
-    <script name="bootstrap"/>
-
-    <option project="jaxp"/>
-
-    <home nested="bootstrap"/>
-    <jar name="lib/ant.jar"/>
-    <jar name="lib/ant-launcher.jar" id="ant-launcher"/>
-
-    <nag from="Gump Integration Build &lt;bodewig@apache.org&gt;"
-         to="notifications@ant.apache.org"
-         subject="Bootstrap Failure - Ant">
-      <regexp pattern="/error/"/>
-      <regexp pattern="/Failed/"/>
-      <regexp />
-    </nag>
-  </project>
+  <svn repository="asf" dir="ant/sandbox/historical/embed"/>
 
   <project name="ant-embed-optional">
     <package>org.apache.tools.ant</package>
 
-    <ant basedir="proposal/embed" target="embed-optional" >
+    <ant target="embed-optional" >
       <property name="ant.home" reference="home" project="ant"/>
       <depend id="commons-logging-api" project="commons-logging"
               property="commons-logging.jar"/>
@@ -258,35 +40,12 @@
 
     <depend project="ant" inherit="all"/>
 
-    <home nested="proposal/embed/build"/>
+    <home nested="build"/>
     <jar name="optional-dynprop.jar" id="embed-optional"/>
 
     <nag to="notifications@ant.apache.org"
          from="Gump Integration Build &lt;bodewig@apache.org&gt;"/>
   </project>
 
-  <project name="ant-xdocs-proposal">
-    <mkdir dir="proposal/xdocs/build/classes"/>
-    <ant basedir="proposal/xdocs" target="docs-from-scratch">
-      <jvmarg value="-Xmx512m"/>
-      <property name="ant.home" reference="home" project="ant"/>
-    </ant>
-    <depend project="dist-ant" inherit="all"/>
-    <depend project="xml-xerces"/>
-    <depend project="logging-log4j-12"/>
-    <depend project="commons-logging"/>
-    <depend project="commons-collections"/>
-    <depend project="xdoclet" inherit="runtime"/>
-    <depend project="xjavadoc"/>
-    <depend project="velocity-dvsl" inherit="runtime" ids="velocity-dvsl" />
-    <nag to="notifications@ant.apache.org"
-         from="Gump Integration Build &lt;bodewig@apache.org&gt;"/>
-    <work nested="proposal/xdocs/build/classes"/>
-    <javadoc nested="proposal/xdocs/build/docs/manual"
-             project="Ant xdocs proposal">
-      <description>Ant Task Documentation Generated from Sources</description>
-    </javadoc>
-  </project>
-
 </module>
 

Propchange: gump/metadata/project/ant-embed-proposal.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: gump/metadata/project/ant-embed-proposal.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: gump/metadata/project/ant-embed-proposal.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: gump/metadata/project/ant-xdocs-proposal.xml (from r896770, gump/metadata/project/ant.xml)
URL: http://svn.apache.org/viewvc/gump/metadata/project/ant-xdocs-proposal.xml?p2=gump/metadata/project/ant-xdocs-proposal.xml&p1=gump/metadata/project/ant.xml&r1=896770&r2=896795&rev=896795&view=diff
==============================================================================
--- gump/metadata/project/ant.xml (original)
+++ gump/metadata/project/ant-xdocs-proposal.xml Thu Jan  7 08:24:45 2010
@@ -15,259 +15,16 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<module name="ant">
+<module name="ant-xdocs-proposal">
 
   <url  href="http://ant.apache.org/index.html"/>
-  <description>
-    Java based build tool
-  </description>
+  <description>Ant Task Documentation Generated from Sources</description>
 
-  <svn repository="asf" dir="ant/core/trunk"/>
-
-  <project name="jakarta-ant">
-    <depend project="ant" inherit="jars"/>
-  </project>
-
-  <project name="ant">
-    <package>org.apache.tools.ant</package>
-
-    <ant target="dist-lite">
-      <property name="ant.home" reference="home" project="ant"/>
-      <property name="optional.jars.whenmanifestonly" value="create"/>
-    </ant>
-
-    <depend project="bootstrap-ant"/>
-    <depend project="xml-xerces"/>
-    <depend project="xml-apis"/>
-    <option project="xalan" ids="xalan"/>
-    <option project="junit3" runtime="true"/>
-
-    <!-- actually, we won't get here if resolver is not available
-    since Xerces won't build, so while this is an option, it will
-    always be satisfied -->
-    <option project="xml-resolver" runtime="true"/>
-
-    <home nested="dist"/>
-
-    <jar name="lib/ant.jar" id="ant"/>
-    <jar name="lib/ant-launcher.jar" id="ant-launcher"/>
-
-    <jar name="lib/ant-jmf.jar" id="ant-jmf"/>
-    <jar name="lib/ant-junit.jar" id="ant-junit"/>
-    <jar name="lib/ant-swing.jar" id="ant-swing"/>
-    <jar name="lib/ant-trax.jar" id="ant-trax"/>
-    <jar name="lib/ant-nodeps.jar" id="ant-nodeps"/>
-    <jar name="lib/ant-apache-resolver.jar" id="ant-apache-resolver"/>
-    <jar name="lib/ant-apache-xalan2.jar" id="ant-apache-xalan2"/>
-
-    <license name="LICENSE"/>
-
-    <nag from="Gump Integration Build &lt;bodewig@apache.org&gt;"
-         to="notifications@ant.apache.org"/>
-  </project>
-
-  <!-- Ant 1.7.x seems to be available under groupId org.apache.ant -->
-  <project name="org.apache.ant" groupId="org.apache.ant">
-    <depend project="ant"/>
-    <home nested="dist"/>
-    <jar name="lib/ant.jar" id="ant"/>
-    <jar name="lib/ant-launcher.jar" id="ant-launcher"/>
-
-    <jar name="lib/ant-jmf.jar" id="ant-jmf"/>
-    <jar name="lib/ant-junit.jar" id="ant-junit"/>
-    <jar name="lib/ant-swing.jar" id="ant-swing"/>
-    <jar name="lib/ant-trax.jar" id="ant-trax"/>
-    <jar name="lib/ant-nodeps.jar" id="ant-nodeps"/>
-    <jar name="lib/ant-apache-resolver.jar" id="ant-apache-resolver"/>
-    <jar name="lib/ant-apache-xalan2.jar" id="ant-apache-xalan2"/>
-  </project>
-
-  <project name="dist-ant">
-    <ant target="distribution">
-      <property name="chmod.fail" value="false"/>
-      <property name="optional.jars.whenmanifestonly" value="create"/>
-    </ant>
-
-    <depend project="ant" inherit="runtime"/>
-    <depend project="xml-xerces"/>
-    <depend project="xml-apis"/>
-    <option project="xalan" ids="xalan"/>
-
-    <option project="antlr" runtime="true"/>
-    <option project="commons-logging" runtime="true"/>
-    <option project="commons-net" runtime="true"/>
-    <option project="jaf" runtime="true"/>
-    <option project="bcel" runtime="true"/>
-    <option project="jakarta-bsf" runtime="true"/>
-    <option project="logging-log4j-12" runtime="true"/>
-    <option project="jakarta-oro" runtime="true"/>
-    <option project="jakarta-regexp" runtime="true"/>
-    <option project="jakarta-servletapi-4" runtime="true"/>
-    <option project="javamail" runtime="true"/>
-    <option project="jdepend" runtime="true"/>
-    <option project="jsch" runtime="true"/>
-    <option project="xml-stylebook2" runtime="true"/>
-    <option project="jai" runtime="true"/>
-
-    <home nested="build"/>
-    <!-- since we are now running the compile-tests target, the work element is necessary

-         so that the test classes which reference optional tasks compiled in this step  
-         can be built.
-         we have had problems with ssh, jakarta-oro, jakarta-regexp dependent classes -->
-    <work nested="build/classes"/>
-
-    <jar name="lib/ant.jar" id="ant"/>
-    <jar name="lib/ant-launcher.jar" id="ant-launcher"/>
-
-    <jar name="lib/ant-antlr.jar" id="ant-antlr"/>
-    <jar name="lib/ant-apache-bcel.jar" id="ant-apache-bcel"/>
-    <jar name="lib/ant-apache-bsf.jar" id="ant-apache-bsf"/>
-    <jar name="lib/ant-apache-log4j.jar" id="ant-apache-log4j"/>
-    <jar name="lib/ant-apache-oro.jar" id="ant-apache-oro"/>
-    <jar name="lib/ant-apache-regexp.jar" id="jakarta-regexp"/>
-    <jar name="lib/ant-apache-resolver.jar" id="ant-apache-resolver"/>
-    <jar name="lib/ant-apache-xalan2.jar" id="ant-apache-xalan2"/>
-    <jar name="lib/ant-commons-logging.jar" id="ant-commons-logging"/>
-    <jar name="lib/ant-commons-net.jar" id="ant-commons-net"/>
-    <jar name="lib/ant-jai.jar" id="ant-jai"/>
-    <jar name="lib/ant-javamail.jar" id="ant-javamail"/>
-    <jar name="lib/ant-jdepend.jar" id="ant-jdepend"/>
-    <jar name="lib/ant-jmf.jar" id="ant-jmf"/>
-    <jar name="lib/ant-jsch.jar" id="ant-jsch"/>
-    <jar name="lib/ant-junit.jar" id="ant-junit"/>
-    <jar name="lib/ant-nodeps.jar" id="ant-nodeps"/>
-    <jar name="lib/ant-stylebook.jar" id="ant-stylebook"/>
-    <jar name="lib/ant-swing.jar" id="ant-swing"/>
-    <jar name="lib/ant-trax.jar" id="ant-trax"/>
-
-    <javadoc nested="build/javadocs" project="ant"/>
-
-    <nag from="Gump Integration Build &lt;bodewig@apache.org&gt;"
-         to="notifications@ant.apache.org"/>
-  </project>
-
-  <project name="ant-testutil" groupId="org.apache.ant">
-    <ant target="test-jar"/>
-
-    <depend project="ant"/>
-    <depend project="junit"/>
-    <depend project="xml-xerces"/>
-    <depend project="xml-apis"/>
-
-    <home nested="build/lib"/>
-    <jar name="ant-testutil.jar" id="ant-testutil"/>
-
-    <nag from="Gump Integration Build &lt;bodewig@apache.org&gt;"
-         to="notifications@ant.apache.org"/>
-  </project>
-
-  <project name="test-ant">
-    <ant target="run-tests">
-      <property name="test.haltonfailure" value="false"/>
-      <property name="ant.home" reference="home" project="ant"/>
-    </ant>
-
-    <depend project="dist-ant" inherit="runtime"/>
-    <depend project="antunit"/>
-    <depend project="junit"/>
-    <depend project="xml-xerces"/>
-    <depend project="xml-apis"/>
-    <option project="xalan" ids="xalan serializer"/>
-    
-    <option project="jakarta-tomcat-4.0" ids="jasper-compiler jasper-runtime"/>
-    <option project="xml-commons-which"/>
-    <option project="rhino"/>
-    <option project="bsh"/>
-    <option project="commons-codec"/>
-
-    <work nested="build/testcases"/>
-    <work nested="src/tests/junit"/>
-    <work nested="src/etc/testcases"/>
-    <work nested="src/etc/testcases/taskdefs/optional/out"/>
-
-    <nag from="Gump Integration Build &lt;bodewig@apache.org&gt;"
-         to="notifications@ant.apache.org"
-         subject="Test Failure - Ant"/>
-  </project>
-
-  <!--
-       This project runs Ant's tests against whatever JAXP implementation
-       is present in the VM.  It means the tests will fail on JDK 1.3-
-       because there is no XML parser around.
-
-       The primary purpose is to find hidden Xerces/Xalan dependencies
-       in Ant.
-  -->
-  <project name="test-ant-no-xerces">
-    <ant target="run-tests">
-      <property name="test.haltonfailure" value="false"/>
-      <property name="ant.home" reference="home" project="ant"/>
-    </ant>
-
-    <depend project="dist-ant" inherit="runtime"/>
-    <depend project="antunit"/>
-    <depend project="junit"/>
-    
-    <option project="jakarta-tomcat-4.0" ids="jasper-compiler jasper-runtime"/>
-    <option project="xml-commons-which"/>
-    <option project="rhino"/>
-    <option project="bsh"/>
-    <option project="commons-codec"/>
-
-    <work nested="build/testcases"/>
-    <work nested="src/tests/junit"/>
-    <work nested="src/etc/testcases"/>
-    <work nested="src/etc/testcases/taskdefs/optional/out"/>
-
-    <nag from="Gump Integration Build &lt;bodewig@apache.org&gt;"
-         to="notifications@ant.apache.org"
-         subject="Test Failure - Ant"/>
-  </project>
-
-  <project name="bootstrap-ant">
-    <script name="bootstrap"/>
-
-    <option project="jaxp"/>
-
-    <home nested="bootstrap"/>
-    <jar name="lib/ant.jar"/>
-    <jar name="lib/ant-launcher.jar" id="ant-launcher"/>
-
-    <nag from="Gump Integration Build &lt;bodewig@apache.org&gt;"
-         to="notifications@ant.apache.org"
-         subject="Bootstrap Failure - Ant">
-      <regexp pattern="/error/"/>
-      <regexp pattern="/Failed/"/>
-      <regexp />
-    </nag>
-  </project>
-
-  <project name="ant-embed-optional">
-    <package>org.apache.tools.ant</package>
-
-    <ant basedir="proposal/embed" target="embed-optional" >
-      <property name="ant.home" reference="home" project="ant"/>
-      <depend id="commons-logging-api" project="commons-logging"
-              property="commons-logging.jar"/>
-      <depend property="jxpath.jar" project="commons-jxpath"/>
-      <depend property="velocity.jar" project="velocity-engine" id="velocity"/>
-      <depend property="velocity-dep.jar" project="velocity-engine" id="velocity-dep"/>
-      <depend property="jexl.jar" project="commons-jexl-1.x"/>
-      <depend property="commons-discovery.jar" project="commons-discovery"/>
-    </ant>
-
-    <depend project="ant" inherit="all"/>
-
-    <home nested="proposal/embed/build"/>
-    <jar name="optional-dynprop.jar" id="embed-optional"/>
-
-    <nag to="notifications@ant.apache.org"
-         from="Gump Integration Build &lt;bodewig@apache.org&gt;"/>
-  </project>
+  <svn repository="asf" dir="ant/sandbox/historical/xdocs"/>
 
   <project name="ant-xdocs-proposal">
-    <mkdir dir="proposal/xdocs/build/classes"/>
-    <ant basedir="proposal/xdocs" target="docs-from-scratch">
+    <mkdir dir="build/classes"/>
+    <ant target="docs-from-scratch">
       <jvmarg value="-Xmx512m"/>
       <property name="ant.home" reference="home" project="ant"/>
     </ant>
@@ -281,11 +38,7 @@
     <depend project="velocity-dvsl" inherit="runtime" ids="velocity-dvsl" />
     <nag to="notifications@ant.apache.org"
          from="Gump Integration Build &lt;bodewig@apache.org&gt;"/>
-    <work nested="proposal/xdocs/build/classes"/>
-    <javadoc nested="proposal/xdocs/build/docs/manual"
-             project="Ant xdocs proposal">
-      <description>Ant Task Documentation Generated from Sources</description>
-    </javadoc>
+    <work nested="build/classes"/>
   </project>
 
 </module>

Propchange: gump/metadata/project/ant-xdocs-proposal.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: gump/metadata/project/ant-xdocs-proposal.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: gump/metadata/project/ant-xdocs-proposal.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: gump/metadata/project/ant.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/ant.xml?rev=896795&r1=896794&r2=896795&view=diff
==============================================================================
--- gump/metadata/project/ant.xml (original)
+++ gump/metadata/project/ant.xml Thu Jan  7 08:24:45 2010
@@ -242,51 +242,5 @@
     </nag>
   </project>
 
-  <project name="ant-embed-optional">
-    <package>org.apache.tools.ant</package>
-
-    <ant basedir="proposal/embed" target="embed-optional" >
-      <property name="ant.home" reference="home" project="ant"/>
-      <depend id="commons-logging-api" project="commons-logging"
-              property="commons-logging.jar"/>
-      <depend property="jxpath.jar" project="commons-jxpath"/>
-      <depend property="velocity.jar" project="velocity-engine" id="velocity"/>
-      <depend property="velocity-dep.jar" project="velocity-engine" id="velocity-dep"/>
-      <depend property="jexl.jar" project="commons-jexl-1.x"/>
-      <depend property="commons-discovery.jar" project="commons-discovery"/>
-    </ant>
-
-    <depend project="ant" inherit="all"/>
-
-    <home nested="proposal/embed/build"/>
-    <jar name="optional-dynprop.jar" id="embed-optional"/>
-
-    <nag to="notifications@ant.apache.org"
-         from="Gump Integration Build &lt;bodewig@apache.org&gt;"/>
-  </project>
-
-  <project name="ant-xdocs-proposal">
-    <mkdir dir="proposal/xdocs/build/classes"/>
-    <ant basedir="proposal/xdocs" target="docs-from-scratch">
-      <jvmarg value="-Xmx512m"/>
-      <property name="ant.home" reference="home" project="ant"/>
-    </ant>
-    <depend project="dist-ant" inherit="all"/>
-    <depend project="xml-xerces"/>
-    <depend project="logging-log4j-12"/>
-    <depend project="commons-logging"/>
-    <depend project="commons-collections"/>
-    <depend project="xdoclet" inherit="runtime"/>
-    <depend project="xjavadoc"/>
-    <depend project="velocity-dvsl" inherit="runtime" ids="velocity-dvsl" />
-    <nag to="notifications@ant.apache.org"
-         from="Gump Integration Build &lt;bodewig@apache.org&gt;"/>
-    <work nested="proposal/xdocs/build/classes"/>
-    <javadoc nested="proposal/xdocs/build/docs/manual"
-             project="Ant xdocs proposal">
-      <description>Ant Task Documentation Generated from Sources</description>
-    </javadoc>
-  </project>
-
 </module>
 



Mime
View raw message