You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by st...@apache.org on 2004/10/10 07:06:39 UTC
cvs commit: gump/project ant-contrib-cpptasks.xml ant-contrib.xml domts.xml findbugs.xml jakarta-cactus.xml jakarta-hivemind.xml jakarta-tomcat-catalina.xml jakarta-turbine-2.xml jakarta-turbine-3.xml jrefactory.xml smartfrog.xml wss4j.xml jgenerator.xml
stefano 2004/10/09 22:06:39
Modified: project jakarta-cactus.xml jakarta-hivemind.xml
jakarta-tomcat-catalina.xml jakarta-turbine-2.xml
jakarta-turbine-3.xml jrefactory.xml smartfrog.xml
wss4j.xml
Added: project ant-contrib-cpptasks.xml ant-contrib.xml domts.xml
findbugs.xml
Removed: project jgenerator.xml
Log:
fixing a bunch of problems and moving the non-ASF descriptors back in the house
Revision Changes Path
1.48 +0 -5 gump/project/jakarta-cactus.xml
Index: jakarta-cactus.xml
===================================================================
RCS file: /home/cvs/gump/project/jakarta-cactus.xml,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- jakarta-cactus.xml 8 Oct 2004 17:07:50 -0000 1.47
+++ jakarta-cactus.xml 10 Oct 2004 05:06:39 -0000 1.48
@@ -31,11 +31,6 @@
<cvs repository="jakarta"/>
- <!-- Dummy for projects that depend on the obsolete 'anttasks' project -->
- <project name="jakarta-cactus-anttasks">
- <depend project="jakarta-cactus-integration-ant-13" inherit="jars"/>
- </project>
-
<!--
========================================================================
Build the Cactus Framework for J2EE 1.2
1.6 +2 -2 gump/project/jakarta-hivemind.xml
Index: jakarta-hivemind.xml
===================================================================
RCS file: /home/cvs/gump/project/jakarta-hivemind.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jakarta-hivemind.xml 6 Oct 2004 19:58:07 -0000 1.5
+++ jakarta-hivemind.xml 10 Oct 2004 05:06:39 -0000 1.6
@@ -21,8 +21,6 @@
<cvs repository="jakarta"/>
- <nag from="hlship@apache.org" to="hivemind-dev@jakarta.apache.org"/>
-
<project name="jakarta-hivemind-compile">
<package>org.apache.hivemind</package>
@@ -46,6 +44,7 @@
<work nested="hivebuild/target/classes"/>
<work nested="framework/target/classes"/>
+ <nag from="hlship@apache.org" to="hivemind-dev@jakarta.apache.org"/>
</project>
<project name="jakarta-hivemind">
@@ -75,5 +74,6 @@
<jar name="target/hivemind-@@DATE@@.jar"/>
<license name="LICENSE-2.0.txt"/>
+ <nag from="hlship@apache.org" to="hivemind-dev@jakarta.apache.org"/>
</project>
</module>
1.21 +10 -24 gump/project/jakarta-tomcat-catalina.xml
Index: jakarta-tomcat-catalina.xml
===================================================================
RCS file: /home/cvs/gump/project/jakarta-tomcat-catalina.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jakarta-tomcat-catalina.xml 9 Oct 2004 02:19:44 -0000 1.20
+++ jakarta-tomcat-catalina.xml 10 Oct 2004 05:06:39 -0000 1.21
@@ -27,6 +27,9 @@
<package>org.apache.catalina</package>
<ant target="deploy-catalina">
+ <property name="tomcat33.home" value="--UnSet--"/>
+ <property name="compile.source" value="1.4" />
+
<property name="jtc.home" project="jakarta-tomcat-connectors"
reference="home"/>
<property name="catalina.home" project="jakarta-tomcat-catalina"
@@ -37,39 +40,25 @@
reference="home"/>
<property name="tomcat.build" project="jakarta-tomcat-catalina"
reference="home"/>
- <property name="tomcat33.home" value="--UnSet--"/>
<property name="ant.home" reference="home" project="ant"/>
<property name="jsse.home" reference="home" project="jsse"/>
<property name="jmx.home" reference="home" project="jmx"/>
- <property name="jmxtools.jar" reference="jarpath"
- project="jmx" id="jmxtools"/>
<property name="jndi.home" reference="home" project="jndi"/>
<property name="site2.home" reference="home" project="jakarta-site2"/>
<property name="regexp.home"
reference="home" project="jakarta-regexp"/>
- <property name="regexp.jar"
- reference="jarpath" id="regexp" project="jakarta-regexp"/>
- <property name="mail.home" reference="home" project="javamail"/>
<property name="jasper.home" reference="home"
project="jakarta-tomcat-jasper_tc5"/>
- <depend property="mail.jar" project="javamail"/>
<property name="activation.home" reference="home" project="jaf"/>
+ <property name="tomcat-coyote.home" reference="home"
+ project="jakarta-tomcat-coyote"/>
+
<depend property="tomcat-dbcp.jar" project="jakarta-tomcat-dbcp" />
- <depend property="activation.jar" project="jaf"/>
<depend property="jdbc20ext.jar" project="jdbc"/>
<depend property="jndi.jar" project="jndi"/>
<depend property="jaas.jar" project="jaas"/>
- <depend property="jmx.jar" project="jmx" reference="jarpath" id="jmxri"/>
<depend property="jta.jar" project="jta"/>
<depend property="ldap.jar" project="ldap"/>
- <depend property="servlet-api.jar"
- project="jakarta-servletapi-5-servlet"/>
- <depend property="jsp-api.jar" project="jakarta-servletapi-5-jsp"/>
- <depend property="xml-apis.jar" project="xml-xerces" id="xml-apis"/>
- <depend property="xercesImpl.jar" project="xml-xerces" id="xml-parser"/>
- <depend property="tomcat-util.jar" project="jakarta-tomcat-util"/>
- <property name="tomcat-coyote.home" reference="home"
- project="jakarta-tomcat-coyote"/>
<depend property="commons-beanutils.jar" project="commons-beanutils-core"
runtime="true"/>
<depend property="commons-collections.jar" project="commons-collections"
@@ -82,10 +71,7 @@
<depend property="commons-pool.jar" project="commons-pool"/>
<depend property="commons-logging.jar" project="commons-logging"
runtime="true" id="commons-logging"/>
- <depend property="commons-logging-api.jar" project="commons-logging"
- runtime="true" id="commons-logging-api"/>
<depend property="commons-launcher.jar" project="commons-launcher"/>
- <property name="compile.source" value="1.4" />
</ant>
<depend project="ant"/>
@@ -104,19 +90,19 @@
<depend project="javagroups" />
<work nested="build/server/classes"/>
+
<home nested="build"/>
+
<jar name="bin/bootstrap.jar"/>
<jar name="server/lib/catalina.jar"/>
- <jar name="server/lib/servlets-common.jar"/>
+ <jar name="server/lib/catalina-optional.jar"/>
<jar name="server/lib/servlets-default.jar"/>
<jar name="server/lib/servlets-invoker.jar"/>
- <jar name="common/lib/naming-common.jar"/>
<jar name="common/lib/naming-resources.jar"/>
<license name="LICENSE"/>
- <nag to="tomcat-dev@jakarta.apache.org"
- from="bobh@apache.org" />
+ <nag to="tomcat-dev@jakarta.apache.org" from="bobh@apache.org" />
</project>
</module>
1.33 +1 -1 gump/project/jakarta-turbine-2.xml
Index: jakarta-turbine-2.xml
===================================================================
RCS file: /home/cvs/gump/project/jakarta-turbine-2.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- jakarta-turbine-2.xml 22 Aug 2004 12:03:25 -0000 1.32
+++ jakarta-turbine-2.xml 10 Oct 2004 05:06:39 -0000 1.33
@@ -75,7 +75,7 @@
<depend project="commons-httpclient"/>
<depend project="httpunit"/>
<depend project="jakarta-cactus-framework-12"/>
- <depend project="jakarta-cactus-anttasks"/>
+ <depend project="jakarta-cactus-integration-ant-12"/>
<depend project="jtidy"/>
<depend project="junit"/>
<depend project="jython"/>
1.27 +1 -1 gump/project/jakarta-turbine-3.xml
Index: jakarta-turbine-3.xml
===================================================================
RCS file: /home/cvs/gump/project/jakarta-turbine-3.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jakarta-turbine-3.xml 24 May 2004 20:28:47 -0000 1.26
+++ jakarta-turbine-3.xml 10 Oct 2004 05:06:39 -0000 1.27
@@ -40,7 +40,7 @@
<depend project="jaf"/>
<depend project="jakarta-cactus-framework-12"/>
- <depend project="jakarta-cactus-anttasks"/>
+ <depend project="jakarta-cactus-integration-ant-12"/>
<depend project="commons-beanutils-core"/>
<depend project="commons-collections"/>
<depend project="commons-configuration"/>
1.19 +3 -2 gump/project/jrefactory.xml
Index: jrefactory.xml
===================================================================
RCS file: /home/cvs/gump/project/jrefactory.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jrefactory.xml 6 May 2004 16:03:40 -0000 1.18
+++ jrefactory.xml 10 Oct 2004 05:06:39 -0000 1.19
@@ -41,6 +41,7 @@
<depend project="jakarta-bcel"/>
<depend project="javacc"/>
<depend project="saxpath"/>
+ <depend project="findbugs"/>
<option project="jrefactory-pretty"><noclasspath/></option>
<work nested="ant.build/classes"/>
<work nested="test/classes"/>
@@ -49,8 +50,8 @@
<work nested="jar/collect.jar"/>
<work nested="jar/core.jar"/>
<work nested="jar/coreplugin.jar"/>
- <work nested="jar/findbugs.jar"/>
- <work nested="jar/findbugsGUI.jar"/>
+ <!--work nested="jar/findbugs.jar"/-->
+ <!--work nested="jar/findbugsGUI.jar"/-->
<work nested="jar/gjc-rt.jar"/>
<work nested="jar/jbuilder.jar"/>
<work nested="jar/jedit.jar"/>
1.21 +4 -5 gump/project/smartfrog.xml
Index: smartfrog.xml
===================================================================
RCS file: /home/cvs/gump/project/smartfrog.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- smartfrog.xml 6 Oct 2004 07:06:20 -0000 1.20
+++ smartfrog.xml 10 Oct 2004 05:06:39 -0000 1.21
@@ -30,8 +30,8 @@
<mkdir dir="smartfrog/build"/>
<ant basedir="." target="dist" >
- <property name="ant.home" reference="home" project="ant"/>
- </ant>
+ <property name="ant.home" reference="home" project="ant"/>
+ </ant>
<depend project="ant" runtime="false"/>
<depend project="junit" runtime="true"/>
<depend project="javacc" runtime="false"/>
@@ -45,9 +45,8 @@
<license name="smartfrog/LICENSE.txt"/>
<!-- <javadoc nested="doc/javadocs"/> -->
<nag from="Smartfrog <smartfrog@users.sf.net>"
- to="smartfrog-developer@lists.sourceforge.net">
- <regexp subject="[Gump:Smartfrog] Build Failure"/>
- </nag>
+ to="smartfrog-developer@lists.sourceforge.net"
+ subject="[Gump] Build Failure"/>
</project>
1.15 +1 -1 gump/project/wss4j.xml
Index: wss4j.xml
===================================================================
RCS file: /home/cvs/gump/project/wss4j.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wss4j.xml 6 Oct 2004 04:59:58 -0000 1.14
+++ wss4j.xml 10 Oct 2004 05:06:39 -0000 1.15
@@ -60,7 +60,7 @@
<junitreport nested="build/test-reports"/>
<nag from="Davanum Srinivas <dims@yahoo.com>"
- to="wss4j-devel@lists.sourceforge.net"/>
+ to="fx-dev@ws.apache.org"/>
</project>
</module>
1.1 gump/project/ant-contrib-cpptasks.xml
Index: ant-contrib-cpptasks.xml
===================================================================
<?xml version="1.0"?>
<module name="cpptasks">
<!--
Copyright 2002-2004 The Ant-Contrib project
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.
-->
<url href="http://sourceforge.net/projects/ant-contrib/"/>
<description>
C/C++ compilation tasks for Ant
</description>
<redistributable/>
<cvs repository="sourceforge" dir="ant-contrib"/>
<project name="ant-contrib-cpptasks">
<ant target="gump" />
<depend project="ant" inherit="runtime"/>
<depend project="xml-xerces"/>
<home nested="build"/>
<jar name="lib/cpptasks.jar" />
<license name="LICENSE"/>
<javadoc nested="build/javadocs" module="ant-contrib"/>
<nag from="Gump Integration Build <general@gump.apache.org>"
to="ant-contrib-developers@lists.sourceforge.net"/>
</project>
<project name="ant-contrib-cpptasks-test">
<description>JUnit tests for the C/C++ compilation tasks</description>
<ant target="run-tests" />
<depend project="ant" inherit="runtime"/>
<depend project="xml-xerces"/>
<depend project="ant-contrib-cpptasks"/>
<depend project="junit"/>
<work nested="build/tests" />
<nag from="Gump Integration Build <general@gump.apache.org>"
to="ant-contrib-developers@lists.sourceforge.net"/>
</project>
</module>
1.1 gump/project/ant-contrib.xml
Index: ant-contrib.xml
===================================================================
<?xml version="1.0"?>
<module name="ant-contrib">
<url href="http://sourceforge.net/projects/ant-contrib/"/>
<description>
Useful little Ant tasks
</description>
<redistributable/>
<cvs repository="sourceforge" dir="ant-contrib"/>
<project name="ant-contrib">
<ant>
<property name="jar.name" value="ant-contrib-@@DATE@@.jar"/>
</ant>
<depend project="ant" inherit="runtime"/>
<depend project="xml-xerces"/>
<jar name="build/lib/ant-contrib-@@DATE@@.jar" />
<license name="manual/LICENSE.txt"/>
<javadoc nested="build/docs/api" project="ant-contrib"/>
<nag from="Gump Integration Build <general@gump.apache.org>"
to="ant-contrib-developers@lists.sourceforge.net"/>
</project>
<project name="ant-contrib-test">
<mkdir dir="test/classes"/>
<ant target="test">
<property name="version" value="@@DATE@@"/>
<depend property="junit.jar.location" project="junit"/>
<depend property="testutil.jar.location" project="ant-testutil"/>
</ant>
<depend project="ant" inherit="runtime"/>
<depend project="xml-xerces"/>
<depend project="ant-contrib"/>
<work nested="test/classes"/>
<nag from="Gump Integration Build <general@gump.apache.org>"
to="ant-contrib-developers@lists.sourceforge.net"/>
</project>
</module>
1.1 gump/project/domts.xml
Index: domts.xml
===================================================================
<?xml version="1.0"?>
<module name="domts">
<!--
Copyright (c) 2003-2004 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. This program is distributed under the W3C's Software
Intellectual Property License. This program is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE.
See W3C License http://www.w3.org/Consortium/Legal/ for more details.
-->
<!--
Gump (http://jakarta.apache.org/gump) descriptor for the
DOM Test Suite
-->
<url href="http://www.w3.org/DOM/Test"/>
<description>
Document Object Model Conformance Test Suites
</description>
<redistributable/>
<cvs repository="w3c" module="2001/DOM-Test-Suite"/>
<project name="dom1">
<description>DOM Level 1 test suites</description>
<ant target="dom1-gump" />
<depend project="ant" inherit="runtime"/>
<depend project="xml-xerces"/>
<depend project="xml-xalan2"/>
<depend project="junit"/>
<home nested="build"/>
<jar name="dom1-core.jar" />
<jar name="dom1-html.jar" />
<jar name="junit-run.jar" />
<license name="docs/resources/COPYRIGHT.html"/>
<nag from="Curt Arnold <carnold@houston.rr.com>"
to="www-dom-ts@w3.org"/>
</project>
<project name="dom2">
<description>DOM Level 2 test suites</description>
<ant target="dom2-gump" />
<depend project="ant" inherit="runtime"/>
<depend project="xml-xerces"/>
<depend project="xml-xalan2"/>
<home nested="build"/>
<jar name="dom2-core.jar" />
<jar name="dom2-html.jar" />
<jar name="dom2-events.jar" />
<license name="docs/resources/COPYRIGHT.html"/>
<nag from="Curt Arnold <carnold@houston.rr.com>"
to="www-dom-ts@w3.org"/>
</project>
<project name="dom3">
<description>DOM Level 3 test suites</description>
<ant target="dom3-gump" />
<depend project="ant" inherit="runtime"/>
<depend project="xml-xerces"/>
<depend project="xml-xalan2"/>
<home nested="build"/>
<jar name="dom3-core.jar" />
<jar name="dom3-ls.jar" />
<jar name="dom3-events.jar" />
<jar name="dom3-validation.jar" />
<jar name="dom3-xpath.jar" />
<license name="docs/resources/COPYRIGHT.html"/>
<nag from="Curt Arnold <carnold@houston.rr.com>"
to="www-dom-ts@w3.org"/>
</project>
</module>
1.1 gump/project/findbugs.xml
Index: findbugs.xml
===================================================================
<?xml version="1.0" ?>
<!--
Copyright 2001-2004 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.
-->
<module name="jrefactory">
<url href="http://findbugs.sourceforge.net/"/>
<description>
A Bug Pattern Detector for the Java programming language
</description>
<cvs repository="sourceforge" dir="findbugs" module="findbugs"/>
<project name="findbugs">
<package>edu.umd.cs.findbugs</package>
<ant target="build"/>
<depend project="ant" inherit="runtime"/>
<depend project="dom4j"/>
<depend project="jakarta-bcel"/>
<depend project="junit"/>
<work nested="jar/AppleJavaExtensions.jar"/>
<jar name="jar/findbugs.jar"/>
<jar name="jar/findbugsGUI.jar"/>
<jar name="jar/coreplugin.jar"/>
<jar name="jar/findbugs-ant.jar"/>
</project>
</module>