You are viewing a plain text version of this content. The canonical link for it is here.
Posted to alexandria-dev@jakarta.apache.org by ni...@apache.org on 2002/09/16 15:38:55 UTC
cvs commit: jakarta-alexandria/shrimpfactory/project checkstyle.xml jakarta-commons-sandbox.xml jakarta-commons.xml jakarta-turbine-maven.xml webwork.xml xdoclet.xml xml-commons.xml
nicolaken 2002/09/16 06:38:55
Modified: shrimpfactory/profile gump.xml
shrimpfactory/project checkstyle.xml
jakarta-commons-sandbox.xml jakarta-commons.xml
jakarta-turbine-maven.xml webwork.xml xdoclet.xml
xml-commons.xml
Log:
Synch with proposal/gump
Revision Changes Path
1.2 +3 -0 jakarta-alexandria/shrimpfactory/profile/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/shrimpfactory/profile/gump.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gump.xml 2 Sep 2002 14:32:25 -0000 1.1
+++ gump.xml 16 Sep 2002 13:38:54 -0000 1.2
@@ -36,13 +36,16 @@
<module href="http://cvs.apache.org/viewcvs/~checkout~/jakarta-poi/module.xml"/>
<module href="project/jakarta-regexp.xml"/>
<module href="project/jakarta-servletapi-4.xml"/>
+ <module href="project/jakarta-servletapi-5.xml"/>
<module href="project/jakarta-servletapi.xml"/>
<module href="project/jakarta-site2.xml"/>
<module href="project/jakarta-slide.xml"/>
<module href="project/jakarta-struts.xml"/>
<module href="project/jakarta-taglibs.xml"/>
<module href="http://cvs.apache.org/viewcvs/~checkout~/jakarta-tomcat-4.0/gump.xml"/>
+ <module href="http://cvs.apache.org/viewcvs/~checkout~/jakarta-tomcat-catalina/gump.xml"/>
<module href="http://cvs.apache.org/viewcvs/~checkout~/jakarta-tomcat-5/gump.xml"/>
+ <module href="http://cvs.apache.org/viewcvs/~checkout~/jakarta-tomcat-jasper/gump3.xml"/>
<module href="http://cvs.apache.org/viewcvs/~checkout~/jakarta-tomcat-connectors/gump.xml"/>
<module href="http://cvs.apache.org/viewcvs/~checkout~/jakarta-tomcat-jasper/gump2.xml"/>
<module href="http://cvs.apache.org/viewcvs/~checkout~/jakarta-tomcat/gump.xml"/>
1.2 +6 -2 jakarta-alexandria/shrimpfactory/project/checkstyle.xml
Index: checkstyle.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/shrimpfactory/project/checkstyle.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- checkstyle.xml 2 Sep 2002 14:32:20 -0000 1.1
+++ checkstyle.xml 16 Sep 2002 13:38:55 -0000 1.2
@@ -19,11 +19,15 @@
<depend project="xml-xerces"/>
<depend project="xml-xalan2"/>
<depend project="junit"/>
- <depend project="antlr" inherit="jars"/>
- <depend project="jakarta-regexp" inherit="jars"/>
+ <depend project="antlr" runtime="true"/>
+ <depend project="jakarta-regexp" runtime="true"/>
+ <depend project="jakarta-bcel" runtime="true"/>
<work nested="target/checkstyle"/>
<work nested="target/tests"/>
<jar name="target/dist/checkstyle-@@DATE@@/checkstyle-@@DATE@@.jar"/>
+
+ <nag from="Conor MacNeill <conor@apache.org>"
+ to="oli-gump@puppycrawl.com"/>
</project>
</module>
1.2 +15 -10 jakarta-alexandria/shrimpfactory/project/jakarta-commons-sandbox.xml
Index: jakarta-commons-sandbox.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/shrimpfactory/project/jakarta-commons-sandbox.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jakarta-commons-sandbox.xml 2 Sep 2002 14:32:20 -0000 1.1
+++ jakarta-commons-sandbox.xml 16 Sep 2002 13:38:55 -0000 1.2
@@ -127,6 +127,9 @@
from="Ted Husted <ted@husted.com>"/>
</project>
+ <!--
+ giving up, dependencies are added too quickly for me to follow, many
+ of them not buildable by Gump
<project name="commons-jelly">
<package>org.apache.commons.jelly</package>
<description>Commons Jelly Package</description>
@@ -136,25 +139,26 @@
<depend project="jakarta-ant" inherit="runtime"/>
<depend project="xml-xerces"/>
- <depend project="commons-logging"/>
+ <depend project="beanshell"/>
+ <depend project="bsf"/>
<depend project="commons-beanutils"/>
<depend project="commons-collections"/>
<depend project="commons-digester"/>
- <depend project="dom4j"/>
+ <depend project="commons-discovery"/>
+ <depend project="commons-httpclient"/>
<depend project="commons-jexl"/>
+ <depend project="commons-logging"/>
+ <depend project="commons-messenger"/>
+ <depend project="dom4j"/>
+ <depend project="hsqldb"/>
+ <depend project="iso-relax"/>
+ <depend project="jakarta-ojb"/>
<depend project="jakarta-velocity"/>
<depend project="jdbc"/>
- <depend project="werkz"/>
- <depend project="beanshell"/>
- <depend project="bsf"/>
- <depend project="jakarta-ojb"/>
<depend project="jms"/>
- <depend project="commons-messenger"/>
- <depend project="commons-httpclient"/>
- <depend project="iso-relax"/>
<depend project="msv"/>
<depend project="relaxng"/>
- <depend project="hsqldb"/>
+ <depend project="werkz"/>
<work nested="jelly/target/classes"/>
<home nested="jelly/target"/>
@@ -163,6 +167,7 @@
<nag to="commons-dev@jakarta.apache.org"
from="James Strachan <jstrachan@apache.org>"/>
</project>
+ -->
<project name="commons-jexl">
<package>org.apache.commons.jexl</package>
1.2 +1 -1 jakarta-alexandria/shrimpfactory/project/jakarta-commons.xml
Index: jakarta-commons.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/shrimpfactory/project/jakarta-commons.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jakarta-commons.xml 2 Sep 2002 14:32:20 -0000 1.1
+++ jakarta-commons.xml 16 Sep 2002 13:38:55 -0000 1.2
@@ -220,7 +220,7 @@
<depend project="jakarta-servletapi-4"/>
<depend project="jdom"/>
<depend project="junit"/>
- <option project="commons-jelly"/>
+ <!-- option project="commons-jelly"/ -->
<option project="jaxen" inherit="runtime"/>
<home nested="latka/dist"/>
<jar name="commons-latka.jar"/>
1.2 +2 -4 jakarta-alexandria/shrimpfactory/project/jakarta-turbine-maven.xml
Index: jakarta-turbine-maven.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/shrimpfactory/project/jakarta-turbine-maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jakarta-turbine-maven.xml 2 Sep 2002 14:32:20 -0000 1.1
+++ jakarta-turbine-maven.xml 16 Sep 2002 13:38:55 -0000 1.2
@@ -14,9 +14,7 @@
<!-- Standard Maven target to produce Javadocs, source -->
<!-- and binary distributions. -->
- <ant buildfile="build-gump.xml" target="jar">
- <property name="final.name" value="maven-@@DATE@@"/>
- </ant>
+ <ant buildfile="build.xml" target="jar"/>
<!-- All Maven projects need Ant and Xerces to build. -->
<depend project="jakarta-ant" inherit="runtime"/>
@@ -30,7 +28,7 @@
<depend project="commons-cli"/>
<depend project="commons-lang"/>
<depend project="commons-io"/>
- <depend project="commons-jelly"/>
+ <!-- depend project="commons-jelly"/ -->
<depend project="commons-jexl"/>
<depend project="commons-beanutils"/>
<depend project="commons-collections"/>
1.2 +1 -0 jakarta-alexandria/shrimpfactory/project/webwork.xml
Index: webwork.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/shrimpfactory/project/webwork.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- webwork.xml 2 Sep 2002 14:32:21 -0000 1.1
+++ webwork.xml 16 Sep 2002 13:38:55 -0000 1.2
@@ -24,6 +24,7 @@
<depend project="db40"/>
<depend project="xml-axis"/>
<depend project="cos"/>
+ <depend project="commons-logging"/>
<depend project="multipartrequest"/>
<jar id="webwork" name="build/result/web/WEB-INF/lib/webwork.jar"/>
</project>
1.2 +1 -0 jakarta-alexandria/shrimpfactory/project/xdoclet.xml
Index: xdoclet.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/shrimpfactory/project/xdoclet.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xdoclet.xml 2 Sep 2002 14:32:21 -0000 1.1
+++ xdoclet.xml 16 Sep 2002 13:38:55 -0000 1.2
@@ -36,6 +36,7 @@
<ant basedir="modules/xdoclet" target="xdoclet-xml" />
<depend project="xdoclet-compile-core" inherit="all" />
+ <depend project="xml-apis" />
<work nested="core/build/classes" />
1.2 +0 -0 jakarta-alexandria/shrimpfactory/project/xml-commons.xml
Index: xml-commons.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/shrimpfactory/project/xml-commons.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>