cvs commit: jakarta-tomcat build.xml
billbarker2005/06/17 21:16:57
Modified:.build.xml
Log:
Update to support building the APR connectors.
This was actually badly broken before (like, for months :). It's nice to see
that the TC 3.3 community is so active ;-).
Revision ChangesPath
1.208 +7 -2 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- build.xml 15 Apr 2005 03:17:08 - 1.207
+++ build.xml 18 Jun 2005 04:16:56 - 1.208
@@ -428,7 +428,7 @@
property name=version value=1.0.0 /
/ant
/target
- target name=dep.tomcat-util unless=tomcat-util.is.uptodate
+ target name=dep.tomcat-util unless=tomcat-util.is.uptodate
depends=dep.tomcat-jni
description=Build j-t-c util which we depend on. To be called
before main
ant dir=${jtc.util.home} /
@@ -448,9 +448,13 @@
property name=tomcat-jni.jar value=${tomcat-jni.jar} /
/ant
-ant dir=${jtc.jk.home} target=build-jk
+ant dir=${jtc.jk.home} target=build-jk inheritAll=false
property name=tomcat33.home value=${tomcat.build}/
property name=servlet-api.jar
value=${basedir}/${servlet22.jar}/
+property name=tomcat-apr.jar value=${tomcat-jni.jar} /
+property name=jmx.jar value=${jmx.jar} /
+property name=commons-modeler.jar
value=${commons-modeler.jar} /
+property name=commons-logging.jar
value=${commons-logging.jar} /
/ant
/target
@@ -1236,6 +1240,7 @@
ant dir=${jakarta-tomcat-connectors}/coyote target=clean /
ant dir=${jakarta-tomcat-connectors}/http11 target=clean /
ant dir=${jakarta-tomcat-connectors}/jk target=clean /
+ant dir=${jakarta-tomcat-connectors}/jni target=clean /
/target
target name=all depends=clean,dist/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
billbarker2005/04/14 20:17:08
Modified:.build.xml
Log:
Get 3.3 building again with j-t-c/jni.
Revision ChangesPath
1.207 +14 -0 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- build.xml 19 Nov 2004 08:15:53 - 1.206
+++ build.xml 15 Apr 2005 03:17:08 - 1.207
@@ -85,6 +85,9 @@
property name=tomcat-jk.home location=${jakarta-tomcat-connectors}/jk
/
property name=jtc.util.home
location=${jakarta-tomcat-connectors}/util/
+ property name=jtc.jni.home location=${jakarta-tomcat-connectors}/jni
/
+ property name=tomcat-jni.jar
+location=${jtc.jni.home}/dist/tomcat-native-1.0.0.jar /
property name=jtc.util.build location=${jtc.util.home}/build/
property name=tomcat-util.jar
location=${jtc.util.build}/lib/tomcat-util.jar/
@@ -241,6 +244,9 @@
uptodate property=tomcat-util.is.uptodate
targetfile=${tomcat-util.jar}
srcfiles dir=${jtc.util.home} includes=java/**,build.xml/
/uptodate
+uptodate property=tomcat-jni.is.uptodate
targetfile=${tomcat-jni.jar}
+ srcfiles dir=${jtc.jni.home} includes=java/**,build.xml/
+/uptodate
/target
target name=msg.ant15 if=ant15-present
@@ -416,7 +422,14 @@
/move
/target
+ target name=dep.tomcat-jni unless=tomcat-jni.is.uptodate
+ description=Build j-t-c jni which j-t-c util depends on.
+ ant dir=${jtc.jni.home} target=jar
+ property name=version value=1.0.0 /
+ /ant
+ /target
target name=dep.tomcat-util unless=tomcat-util.is.uptodate
+ depends=dep.tomcat-jni
description=Build j-t-c util which we depend on. To be called
before main
ant dir=${jtc.util.home} /
/target
@@ -432,6 +445,7 @@
property name=commons-logging.jar
value=${commons-logging.jar}/
property name=commons-modeler.jar
value=${commons-modeler.jar}/
property name=jmx.jar value=${jmx.jar}/
+property name=tomcat-jni.jar value=${tomcat-jni.jar} /
/ant
ant dir=${jtc.jk.home} target=build-jk
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
billbarker2004/11/19 00:15:53
Modified:.build.xml
Log:
Fix the build for new Jk doc location.
Revision ChangesPath
1.206 +1 -2 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- build.xml 20 Oct 2004 05:29:54 - 1.205
+++ build.xml 19 Nov 2004 08:15:53 - 1.206
@@ -867,11 +867,10 @@
/copy
mkdir dir=${tomcat.build}/webapps/ROOT/doc/jk2 /
mkdir dir=${tomcat.build}/webapps/ROOT/doc/jk2/printer /
-ant dir=${tomcat-jk.home} target=docs/
+ant dir=${tomcat-jk.home}/xdocs /
copy todir=${tomcat.build}/webapps/ROOT/doc/jk2
fileset dir=${tomcat-jk.home}/build/docs/
/copy
-
!-- admin context --
mkdir dir=${tomcat.build}/webapps/admin/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
billbarker2004/10/19 22:29:55
Modified:.build.xml
Log:
Allow compilation with a 1.5 JDK.
Note that setting compile.source=1.5 won't currently work, since there are still
some enums floating around.
Revision ChangesPath
1.205 +35 -7 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- build.xml 6 Apr 2004 07:12:31 - 1.204
+++ build.xml 20 Oct 2004 05:29:54 - 1.205
@@ -23,6 +23,8 @@
property name=optimize value=false/
property name=debug value=on/
+ property name=compile.target value=1.2 /
+ property name=compile.source value=${compile.target} /
!-- Version properties --
property name=version value=3.3.3 /
@@ -117,9 +119,6 @@
property name=commons-logging.lib location=${commons-logging.home} /
property name=commons-logging.jar
location=${commons-logging.lib}/commons-logging-api.jar /
- property name=regexp.home location=${ws}/jakarta-regexp /
- property name=regexp.jar location=${regexp.home}/jakarta-regexp.jar /
-
property name=commons-collections.home
location=${jakarta-commons}/collections/
property name=commons-collections.lib
location=${commons-collections.home}/dist/
property name=commons-collections.jar
location=${commons-collections.lib}/commons-collections.jar/
@@ -433,7 +432,6 @@
property name=commons-logging.jar value=${commons-logging.jar}/
property name=commons-modeler.jar value=${commons-modeler.jar}/
property name=jmx.jar value=${jmx.jar}/
-property name=regexp.jar value=${regexp.jar} /
/ant
ant dir=${jtc.jk.home} target=build-jk
@@ -448,7 +446,8 @@
target name=tomcat_util depends=prepare
javac destdir=${tomcat.build}/classes
-target=1.1
+target=${compile.target}
+ source=${compile.source}
debug=${debug}
optimize=${optimize}
deprecation=off
@@ -494,8 +493,6 @@
!-- Copy commons-logging-api.jar since tomcat-util depends on it --
copy todir=${tomcat.build}/lib/common
file=${commons-logging.jar}/
-copy todir=${tomcat.build}/lib/container
- file=${regexp.jar} /
!-- All tomcat3 specific utils --
jar jarfile=${tomcat.build}/lib/container/container_util.jar
@@ -513,7 +510,12 @@
debug=${debug}
optimize=${optimize}
deprecation=off
+ source=${compile.source}
+ target=${compile.target}
srcdir=src/share
+ classpath
+path refid=tomcat_util.class.path/
+ /classpath
!-- no dependencies --
include name=org/apache/tomcat/startup/Main.java/
include name=org/apache/tomcat/util/compat/**/
@@ -543,6 +545,8 @@
debug=${debug}
optimize=${optimize}
deprecation=off
+ source=${compile.source}
+ target=${compile.target}
srcdir=src/share
classpath
pathelement location=${jtc.util.build}/classes/
@@ -575,6 +579,8 @@
debug=${debug}
optimize=${optimize}
deprecation=off
+ source=${compile.source}
+ target=${compile.target}
srcdir=src/share
classpath
path refid=tomcat_util.class.path/
@@ -602,6 +608,8 @@
debug=${debug}
optimize=${optimize}
deprecation=off
+ source=${compile.source}
+ target=${compile.target}
srcdir=src/share
classpath
path refid=xml-apis.class.path/
@@ -626,6 +634,8 @@
debug=${debug}
optimize=${optimize}
deprecation=off
+ source=${compile.source}
+ target=${compile.target}
srcdir=src/facade22
classpath
path refid=tomcat_util.class.path/
@@ -676,6 +686,8 @@
srcdir=src/share
debug=${debug}
optimize=${optimize}
+ source=${compile.source}
+ target=${compile.target}
deprecation=off
classpath
path refid=tomcat_util.class.path/
@@ -744,6 +756,8 @@
srcdir=src/share
debug=${debug}
optimize=${optimize}
+ source=${compile.source}
+ target=${compile.target}
deprecation=off
classpath
path refid=xml-apis.class.path/
@@ -794,6 +808,8 @@
target name=tomcat-ant depends=detect if=ant15-present
delete dir=${tomcat.build}/ant /
javac srcdir=src/share
+
cvs commit: jakarta-tomcat build.xml
hgomez 2004/04/06 00:12:31
Modified:.build.xml
Log:
We're now on 3.3.3-dev
Revision ChangesPath
1.204 +1 -1 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- build.xml 3 Mar 2004 06:15:55 - 1.203
+++ build.xml 6 Apr 2004 07:12:31 - 1.204
@@ -25,7 +25,7 @@
property name=debug value=on/
!-- Version properties --
- property name=version value=3.3.2 /
+ property name=version value=3.3.3 /
property name=release value=Dev /
property name=version.release value=${version} ${release}/
property name=tomcat.name value=Tomcat ${version} /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
billbarker2004/03/02 22:15:56
Modified:.build.xml
Log:
Add the j-t-c docs to the bundled documentation.
Revision ChangesPath
1.203 +8 -0 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- build.xml 1 Mar 2004 01:52:59 - 1.202
+++ build.xml 3 Mar 2004 06:15:55 - 1.203
@@ -81,6 +81,7 @@
property name=jaxp.home location=bin /
+ property name=tomcat-jk.home location=${jakarta-tomcat-connectors}/jk /
property name=jtc.util.home location=${jakarta-tomcat-connectors}/util/
property name=jtc.util.build location=${jtc.util.home}/build/
property name=tomcat-util.jar
@@ -844,6 +845,13 @@
copy todir=${tomcat.build}/webapps/ROOT/doc
fileset dir=src/doc/
/copy
+mkdir dir=${tomcat.build}/webapps/ROOT/doc/jk2 /
+mkdir dir=${tomcat.build}/webapps/ROOT/doc/jk2/printer /
+ant dir=${tomcat-jk.home} target=docs/
+copy todir=${tomcat.build}/webapps/ROOT/doc/jk2
+ fileset dir=${tomcat-jk.home}/build/docs/
+/copy
+
!-- admin context --
mkdir dir=${tomcat.build}/webapps/admin/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
billbarker2004/02/05 19:37:20
Modified:.build.xml
Log:
It seems that o.a.t.u.log needs to be in the common cl.
Also, actually copy over the regexp jar, so that the CoyoteConnector2 can actually
work.
Revision ChangesPath
1.200 +3 -0 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- build.xml 1 Jan 2004 23:20:46 - 1.199
+++ build.xml 6 Feb 2004 03:37:20 - 1.200
@@ -461,6 +461,7 @@
jar jarfile=${tomcat.build}/lib/common/core_util.jar
fileset dir=${tomcat.build}/classes
include name=org/apache/tomcat/util/hooks/**/
+ include name=org/apache/tomcat/util/log/**/
!-- All resource must go to common, bug in StringManager/ResourceBundle --
include name=org/apache/tomcat/util/**/*.properties/
/fileset
@@ -476,6 +477,8 @@
!-- Copy commons-logging-api.jar since tomcat-util depends on it --
copy todir=${tomcat.build}/lib/common
file=${commons-logging.jar}/
+copy todir=${tomcat.build}/lib/container
+ file=${regexp.jar} /
!-- All tomcat3 specific utils --
jar jarfile=${tomcat.build}/lib/container/container_util.jar
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml build.properties.sample
billbarker2004/01/01 15:20:46
Modified:.build.xml build.properties.sample
Log:
Adding Regexp since it is needed by coyote-http11 (I can see how active development
is in j-t :).
Revision ChangesPath
1.199 +4 -0 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- build.xml 13 Oct 2003 09:44:16 - 1.198
+++ build.xml 1 Jan 2004 23:20:46 - 1.199
@@ -99,6 +99,9 @@
property name=commons-logging.home
location=${jakarta-commons}/commons-logging-1.0.2 /
property name=commons-logging.lib location=${commons-logging.home} /
property name=commons-logging.jar
location=${commons-logging.lib}/commons-logging-api.jar /
+
+ property name=regexp.home location=${ws}/jakarta-regexp /
+ property name=regexp.jar location=${regexp.home}/jakarta-regexp.jar /
property name=commons-collections.home
location=${jakarta-commons}/collections/
property name=commons-collections.lib
location=${commons-collections.home}/dist/
@@ -413,6 +416,7 @@
property name=commons-logging.jar value=${commons-logging.jar}/
property name=commons-modeler.jar value=${commons-modeler.jar}/
property name=jmx.jar value=${jmx.jar}/
+property name=regexp.jar value=${regexp.jar} /
/ant
ant dir=${jtc.jk.home} target=build-jk
1.4 +6 -1 jakarta-tomcat/build.properties.sample
Index: build.properties.sample
===
RCS file: /home/cvs/jakarta-tomcat/build.properties.sample,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.properties.sample 2 Oct 2003 05:42:22 - 1.3
+++ build.properties.sample 1 Jan 2004 23:20:46 - 1.4
@@ -56,6 +56,11 @@
commons-modeler.lib=${commons-modeler.home}/dist
commons-modeler.jar=${commons-modeler.lib}/commons-modeler.jar
+# - (optional) Jakarta Regexp (required by Http11) -
+regexp.home=../jakarta-regexp-1.3
+regexp.lib=${regexp.home}
+regexp.jar=${regexp.lib}/jakarta-regexp-1.3.jar
+
# - (optional) Jakarta Commons DB Pool (required by future PooledJDBCRealm )
-
commons-dbcp.home=../commons-dbcp-1.0
commons-dbcp.lib=${commons-dbcp.home}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
hgomez 2003/10/13 02:44:16
Modified:.build.xml
Log:
Create an empty endorsed directory in lib/
Revision ChangesPath
1.198 +5 -1 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- build.xml 2 Oct 2003 02:50:59 - 1.197
+++ build.xml 13 Oct 2003 09:44:16 - 1.198
@@ -108,7 +108,7 @@
property name=commons-modeler.lib location=${commons-modeler.home} /
property name=commons-modeler.jar
location=${commons-modeler.lib}/commons-modeler.jar /
- property name=jmx.jar location=${jakarta-tomcat-connectors}/lib/mx4j.jar/
+ property name=jmx.jar
location=${jakarta-tomcat-connectors}/lib/mx4j-jmx.jar/
property name=jmxtools.jar
location=${jakarta-tomcat-connectors}/lib/mx4j-tools.jar/
property name=log4j.jar location=${install.dir}/log4j/log4j.jar /
@@ -331,6 +331,7 @@
mkdir dir=${tomcat.build}/lib/apps/
mkdir dir=${tomcat.build}/lib/container/
mkdir dir=${tomcat.build}/lib/common/
+mkdir dir=${tomcat.build}/lib/endorsed/
mkdir dir=${tomcat.build}/logs/
mkdir dir=${tomcat.build}/bin/
mkdir dir=${tomcat.build}/doc/
@@ -375,6 +376,9 @@
copy file =src/build/readme/readme.common
tofile=${tomcat.build}/lib/common/README /
+
+copy file =src/build/readme/readme.endorsed
+ tofile=${tomcat.build}/lib/endorsed/README /
!-- This act as a default, Tomcat3.3 will not load it in
classpath, just a hack to ease the transition
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat build.xml
[EMAIL PROTECTED] a écrit : larryi 2003/10/01 19:50:59 Modified:.build.xml Log: Update to build using MAIN branch of JTC coyote and http11. The jars are a little different from coyote_10 version. Thanks Larry - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
larryi 2003/10/01 19:50:59
Modified:.build.xml
Log:
Update to build using MAIN branch of JTC coyote and http11. The jars are
a little different from coyote_10 version.
Sync log4j detection property name.
Revision ChangesPath
1.197 +10 -4 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- build.xml 4 Aug 2003 23:30:44 - 1.196
+++ build.xml 2 Oct 2003 02:50:59 - 1.197
@@ -71,6 +71,7 @@
location=${jtc.util.build}/lib/tomcat-util.jar/
property name=jtc.coyote.home location=${jakarta-tomcat-connectors}/coyote/
+ property name=jtc.coyote.lib location=${jtc.coyote.home}/build/lib/
property name=jtc.http11.home location=${jakarta-tomcat-connectors}/http11/
property name=jtc.http11.lib location=${jtc.http11.home}/build/lib/
@@ -259,7 +260,7 @@
echo message=tomcat-util.jar is up to date/
/target
- target name=msg.log4j if=log4j.present
+ target name=msg.log4j if=log4j-present
echo message=Detected Log4j /
/target
@@ -405,7 +406,9 @@
ant dir=${jtc.http11.home} inheritAll=false
property name=util.home value=${jtc.util.home}/
+property name=commons-logging.jar value=${commons-logging.jar}/
property name=commons-modeler.jar value=${commons-modeler.jar}/
+property name=jmx.jar value=${jmx.jar}/
/ant
ant dir=${jtc.jk.home} target=build-jk
@@ -689,11 +692,14 @@
copy tofile=${tomcat.build}/lib/common/tomcat33-resource.jar
file=${jtc.http11.lib}/tomcat33-resource.jar/
-copy tofile=${tomcat.build}/lib/container/tomcat-http11.jar
- file=${jtc.http11.lib}/tomcat-http11.jar/
+copy tofile=${tomcat.build}/lib/container/tomcat-coyote.jar
+ file=${jtc.coyote.lib}/tomcat-coyote.jar/
copy tofile=${tomcat.build}/lib/container/tomcat33-coyote.jar
- file=${jtc.http11.lib}/tomcat33-coyote.jar/
+ file=${jtc.coyote.lib}/tomcat33-coyote.jar/
+
+copy tofile=${tomcat.build}/lib/container/tomcat-http11.jar
+ file=${jtc.http11.lib}/tomcat-http11.jar/
copy todir=${tomcat.build}/lib/container
file=${jtc.jk.home}/build/lib/tomcat-jk2.jar/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
larryi 2003/08/04 16:30:45
Modified:.build.xml
Log:
Update to copy commons-logging-api.jar since JTC-util HEAD no longer
copies it.
Revision ChangesPath
1.196 +4 -1 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- build.xml 7 Apr 2003 00:48:11 - 1.195
+++ build.xml 4 Aug 2003 23:30:44 - 1.196
@@ -456,12 +456,15 @@
/jar
!-- Add jakarta-tomcat-connectors utils --
-!-- Includes the tomcat-utils.jar and common-logging.jar --
copy todir=${tomcat.build}/lib/common
fileset dir=${jtc.util.build}/lib
include name=*.jar/
/fileset
/copy
+
+!-- Copy commons-logging-api.jar since tomcat-util depends on it --
+copy todir=${tomcat.build}/lib/common
+ file=${commons-logging.jar}/
!-- All tomcat3 specific utils --
jar jarfile=${tomcat.build}/lib/container/container_util.jar
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
larryi 2003/02/16 17:59:03
Modified:.build.xml
Log:
Update to allow independent control over location of util, coyote, and
http11 locations.
Revision ChangesPath
1.193 +17 -11jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- build.xml 26 Jan 2003 03:05:31 - 1.192
+++ build.xml 17 Feb 2003 01:59:02 - 1.193
@@ -70,6 +70,13 @@
property name=tomcat-util.jar
location=${jtc.util.build}/lib/tomcat-util.jar/
+ property name=jtc.coyote.home location=${jakarta-tomcat-connectors}/coyote/
+
+ property name=jtc.http11.home location=${jakarta-tomcat-connectors}/http11/
+ property name=jtc.http11.lib location=${jtc.http11.home}/build/lib/
+
+ property name=jtc.jk.home location=${jakarta-tomcat-connectors}/jk/
+
property name=jsse.home location=${install.dir}/jsse1.0.2/
property name=jsse.lib location=${jsse.home}/lib/
property name=jsse.jar location=${jsse.lib}/jsse.jar/
@@ -100,9 +107,6 @@
property name=commons-modeler.lib location=${commons-modeler.home} /
property name=commons-modeler.jar
location=${commons-modeler.lib}/commons-modeler.jar /
- property name=jtc.http11.home location=${jakarta-tomcat-connectors}/http11/
- property name=jtc.http11.lib location=${jtc.http11.home}/build/lib/
-
property name=jmx.jar location=${jakarta-tomcat-connectors}/lib/mx4j.jar/
property name=jmxtools.jar
location=${jakarta-tomcat-connectors}/lib/mx4j-tools.jar/
@@ -382,19 +386,21 @@
target name=dep.tomcat-util unless=tomcat-util.is.uptodate
description=Build j-t-c util which we depend on. To be called before
main
-ant dir=${jakarta-tomcat-connectors}/util /
+ant dir=${jtc.util.home} /
/target
target name=deps description=Build repositoried that depends on. To be called
before main
-ant dir=${jakarta-tomcat-connectors}/coyote
+ant dir=${jtc.coyote.home}
property name=tomcat33.home value=${tomcat.build}/
+property name=util.home value=${jtc.util.home}/
/ant
-ant dir=${jakarta-tomcat-connectors}/http11 inheritAll=false
+ant dir=${jtc.http11.home} inheritAll=false
+property name=util.home value=${jtc.util.home}/
property name=commons-modeler.jar value=${commons-modeler.jar}/
/ant
-ant dir=${jakarta-tomcat-connectors}/jk target=build-jk
+ant dir=${jtc.jk.home} target=build-jk
property name=tomcat33.home value=${tomcat.build}/
property name=servlet-api.jar value=${basedir}/${servlet22.jar}/
/ant
@@ -444,7 +450,7 @@
!-- Add jakarta-tomcat-connectors utils --
!-- Includes the tomcat-utils.jar and common-logging.jar --
copy todir=${tomcat.build}/lib/common
- fileset dir=${jakarta-tomcat-connectors}/util/build/lib
+ fileset dir=${jtc.util.build}/lib
include name=*.jar/
/fileset
/copy
@@ -665,7 +671,7 @@
!-- This can't be compiled while j-t-c is built - tomcat is built
after, so files depending on 3.3 are ignored --
-ant dir=${jakarta-tomcat-connectors}/coyote target=compile.tomcat33
+ant dir=${jtc.coyote.home} target=compile.tomcat33
property name=tomcat33.home value=${tomcat.build}/
/ant
@@ -679,10 +685,10 @@
file=${jtc.http11.lib}/tomcat33-coyote.jar/
copy todir=${tomcat.build}/lib/container
- file=${jakarta-tomcat-connectors}/jk/build/lib/tomcat-jk2.jar/
+ file=${jtc.jk.home}/build/lib/tomcat-jk2.jar/
copy todir=${tomcat.build}/conf
- file=${jakarta-tomcat-connectors}/jk/conf/jk2.properties/
+ file=${jtc.jk.home}/conf/jk2.properties/
/target
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
larryi 2003/02/16 19:12:05
Modified:.build.xml
Log:
Remove task to build SnoopServlet removed from ROOT webapp
Revision ChangesPath
1.194 +0 -4 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- build.xml 17 Feb 2003 01:59:02 - 1.193
+++ build.xml 17 Feb 2003 03:12:05 - 1.194
@@ -800,10 +800,6 @@
copy todir=${tomcat.build}/webapps/ROOT/doc
fileset dir=src/doc/
/copy
-javac srcdir=src/webpages/WEB-INF/classes
- optimize=${optimize}
- destdir=${tomcat.build}/webapps/ROOT/WEB-INF/classes
- classpath=${tomcat.build}/classes;${servlet22.jar}/
!-- admin context --
mkdir dir=${tomcat.build}/webapps/admin/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat build.xml
- Original Message - From: [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Saturday, January 25, 2003 7:05 PM Subject: cvs commit: jakarta-tomcat build.xml larryi 2003/01/25 19:05:33 Modified:.build.xml Log: Update commons-logging default version and add commons-modeler properties. Pass commons-modeler to http11 build. modeler-1.0 doesn't work with j-t-c HEAD (the main reason that I was pushing for a branch), and the j-t-c coyote_10 branch doesn't require modeler at all for Tomcat 3.3. What is the reason for adding in modeler to TC 3.3? -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
larryi 2003/01/25 19:05:33
Modified:.build.xml
Log:
Update commons-logging default version and add commons-modeler
properties. Pass commons-modeler to http11 build.
Update tomcat-ant.jar build to use one jar task. I had strange rename
problems in my gump build on WinXP when using two jar tasks.
Revision ChangesPath
1.192 +17 -10jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- build.xml 22 Oct 2002 06:57:29 - 1.191
+++ build.xml 26 Jan 2003 03:05:31 - 1.192
@@ -88,7 +88,7 @@
property name=commons-pool.lib location=${commons-pool.home}/dist/
property name=commons-pool.jar
location=${commons-pool.lib}/commons-pool.jar/
- property name=commons-logging.home
location=${jakarta-commons}/commons-logging-1.0.1 /
+ property name=commons-logging.home
location=${jakarta-commons}/commons-logging-1.0.2 /
property name=commons-logging.lib location=${commons-logging.home} /
property name=commons-logging.jar
location=${commons-logging.lib}/commons-logging-api.jar /
@@ -96,6 +96,10 @@
property name=commons-collections.lib
location=${commons-collections.home}/dist/
property name=commons-collections.jar
location=${commons-collections.lib}/commons-collections.jar/
+ property name=commons-modeler.home
location=${jakarta-commons}/commons-modeler-1.0 /
+ property name=commons-modeler.lib location=${commons-modeler.home} /
+ property name=commons-modeler.jar
location=${commons-modeler.lib}/commons-modeler.jar /
+
property name=jtc.http11.home location=${jakarta-tomcat-connectors}/http11/
property name=jtc.http11.lib location=${jtc.http11.home}/build/lib/
@@ -386,10 +390,13 @@
property name=tomcat33.home value=${tomcat.build}/
/ant
-ant dir=${jakarta-tomcat-connectors}/http11 inheritAll=false /
+ant dir=${jakarta-tomcat-connectors}/http11 inheritAll=false
+property name=commons-modeler.jar value=${commons-modeler.jar}/
+/ant
ant dir=${jakarta-tomcat-connectors}/jk target=build-jk
property name=tomcat33.home value=${tomcat.build}/
+property name=servlet-api.jar value=${basedir}/${servlet22.jar}/
/ant
/target
@@ -743,14 +750,14 @@
/classpath
/javac
mkdir dir=${tomcat.build}/ant /
-jar jarfile=${tomcat.build}/ant/tomcat-ant.jar
- basedir=${tomcat.build}/classes
- include name=org/apache/tomcat/ant/*.class /
-/jar
-jar jarfile=${tomcat.build}/ant/tomcat-ant.jar
- basedir=src/share/org/apache/tomcat/ant
- update=yes
- include name=META-INF/*.properties /
+
+jar jarfile=${tomcat.build}/ant/tomcat-ant.jar
+fileset dir=${tomcat.build}/classes
+include name=org/apache/tomcat/ant/*.class/
+/fileset
+fileset dir=src/share/org/apache/tomcat/ant
+include name=META-INF/*.properties/
+/fileset
/jar
/target
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
billbarker2002/10/21 23:57:29 Modified:.build.xml Log: Remove the j2ee target. It hasn't worked at least since 3.3 M2. I strongly doubt that Sun will release a J2EE based on the 3.3 code, and it only seems to be causing confusion at the moment. Revision ChangesPath 1.191 +0 -5 jakarta-tomcat/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat/build.xml,v retrieving revision 1.190 retrieving revision 1.191 diff -u -r1.190 -r1.191 --- build.xml 30 Sep 2002 02:25:18 - 1.190 +++ build.xml 22 Oct 2002 06:57:29 - 1.191 -731,11 +731,6 target name=tomcat-jars-new depends=tomcat-jars /target - !-- J2EE integration == -- - target name=j2ee -ant antfile=src/j2ee/build.xml target=tomcat-j2ee.jar/ - /target - !-- Ant utilities == -- target name=tomcat-ant depends=detect if=ant15-present -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
cvs commit: jakarta-tomcat build.xml
larryi 2002/09/29 19:25:19 Modified:.build.xml Log: Remove MxInterceptor from main build. Add tasks for JmxSupport add-on. Revision ChangesPath 1.190 +3 -3 jakarta-tomcat/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat/build.xml,v retrieving revision 1.189 retrieving revision 1.190 diff -u -r1.189 -r1.190 --- build.xml 19 Sep 2002 11:12:06 - 1.189 +++ build.xml 30 Sep 2002 02:25:18 - 1.190 @@ -637,9 +637,6 @@ name=org/apache/tomcat/modules/config/LoaderInterceptor12.java unless=jdk12.present/ exclude - name=org/apache/tomcat/modules/config/MxInterceptor.java - unless=jmx-present/ - exclude name=org/apache/tomcat/modules/aaa/PooledJDBCRealm.java unless=commons-dbcp.complete/ exclude @@ -861,16 +858,19 @@ !-- Build the sample add-on modules === -- target name=sample.add-ons +ant antfile=proposals/JmxSupport/build.xml / ant antfile=proposals/PasswordPrompter/build.xml/ ant antfile=proposals/StreamHandler/build.xml / /target target name=sample.add-ons.dist +ant antfile=proposals/JmxSupport/build.xml target=jmx.support.war/ ant antfile=proposals/PasswordPrompter/build.xml target=password.prompter.war/ ant antfile=proposals/StreamHandler/build.xml target=stream.handler.war / /target target name=sample.add-ons.clean +ant antfile=proposals/JmxSupport/build.xml target=clean/ ant antfile=proposals/PasswordPrompter/build.xml target=clean/ ant antfile=proposals/StreamHandler/build.xml target=clean / /target -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
hgomez 2002/09/19 01:12:59
Modified:.build.xml
Log:
Majors modifications in build.xml :
- make it works from Eclipse IDE
- fix problems when building from non 'apache' layout (tc/jtc in same dir)
- add support for xerces2 parser or external parsers (usefull for
packagers like jpackage.org)
Revision ChangesPath
1.188 +145 -46 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- build.xml 11 Sep 2002 17:23:07 - 1.187
+++ build.xml 19 Sep 2002 08:12:59 - 1.188
@@ -28,8 +28,9 @@
--
property name=work.dir value=. /
- property name=tomcat.build value=${work.dir}/build/tomcat/
- property name=tomcat.dist value=${work.dir}/dist/tomcat/
+ !-- append basedir since jtc will need a full path for tomcat33.home --
+ property name=tomcat.build value=${basedir}/${work.dir}/build/tomcat/
+ property name=tomcat.dist value=${basedir}/${work.dir}/dist/tomcat/
!-- Location where various binaries are installed.
It can be c:\Program Files or /usr/share/java or
@@ -58,6 +59,9 @@
property name=ant.home location=${install.dir}/jakarta-ant/
property name=ant.bin location=${ant.home}/bin/
property name=ant.lib location=${ant.home}/lib/
+ property name=ant.jar location=${ant.home}/lib/ant.jar/
+ property name=optional.jar location=${ant.home}/lib/optional.jar/
+ property name=ant-optional.jar location=${ant.home}/lib/ant-optional.jar/
property name=jaxp.home location=bin /
@@ -96,6 +100,13 @@
property name=jtc.http11.lib location=${jtc.http11.home}/build/lib/
property name=jmx.jar location=${jakarta-tomcat-connectors}/lib/mx4j.jar/
+ property name=jmxtools.jar
location=${jakarta-tomcat-connectors}/lib/mx4j-tools.jar/
+
+ !-- xalan is required by MX4J HTTP adaptor --
+ property name=xalan.home location=${install.dir}/xalan/
+ property name=xalan.lib location=${xalan.home}/bin/
+ property name=xalan.jar location=${xalan.lib}/xalan.jar/
+ property name=xml-apis.jar location=${xalan.lib}/xml-apis.jar/
!-- Binaries checked in ( servlet.jar is not likely to change,
the 2.2 spec is final --
@@ -120,12 +131,28 @@
file=${jaxp.home}/jaxp.jar /
available property=jmx-present
file=${jmx.jar} /
+available property=jmxtools-present
+ file=${jmxtools.jar} /
+available property=xalan-present
+ file=${xalan.jar} /
available property=jaxp10-present
file=${jaxp.home}/parser.jar /
available property=jaxp11-present
file=${jaxp.home}/crimson.jar /
available property=xerces-present
file=${jaxp.home}/xerces.jar /
+condition property=xerces2-present
+ and
+available file=${xerces2.home}/xercesImpl.jar /
+available file=${xerces2.home}/xmlParserAPIs.jar /
+ /and
+/condition
+condition property=xml-parser-present
+ and
+available file=${xml-parser-impl.jar} /
+available file=${xml-parser-apis.jar} /
+ /and
+/condition
available property=jtc-present
file=${jakarta-tomcat-connectors} /
condition property=commons-dbcp.complete
@@ -135,6 +162,54 @@
available file=${commons-collections.jar} /
/and
/condition
+
+ !-- Some IDE like Eclipse didn't export ant and xml api --
+ !-- jars so javac will faild at compile time --
+ !-- To fix that, create some path ref which will be used --
+
+ path id=ant.class.path
+pathelement location=${ant.jar}//
+pathelement location=${optional.jar}/
+pathelement location=${ant-optional.jar}/
+ /path
+
+ path id=xml-apis.class.path
+pathelement location=${jaxp.home}/jaxp.jar/
+pathelement location=${xerces2.home}/xmlParserAPIs.jar/
+pathelement location=${xml-parser-apis.jar}/
+ /path
+
+ path id=tomcat_util.class.path
+pathelement location=${tomcat-util.jar}/
+ pathelement location=${commons-logging.jar} /
+ /path
+
+ path id=crypto.class.path
+pathelement location=${jcert.jar}/
+pathelement location=${jnet.jar}/
+pathelement location=${jsse.jar}/
+pathelement location=${puretls.jar}/
+ /path
+
+ path id=jdk.class.path
+fileset dir=${java.home}/..
+ include name=lib/tools.jar/
+/fileset
+fileset dir=${java.home}
+ include name=lib/classes.zip/
+/fileset
+ /path
+
+ path id=javadoc.classpath
+pathelement location=${servlet22.jar}/
+pathelement location=${jmx.jar}/
+path refid=ant.class.path/
+path
cvs commit: jakarta-tomcat build.xml
larryi 2002/09/11 10:23:07
Modified:.build.xml
Log:
Fix, I assume, cut paste error with jakarta-logging. Default to version
1.0.1 since this is the one that has commons-logging-api.jar.
Revision ChangesPath
1.187 +2 -2 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- build.xml 11 Sep 2002 05:36:42 - 1.186
+++ build.xml 11 Sep 2002 17:23:07 - 1.187
@@ -84,8 +84,8 @@
property name=commons-pool.lib location=${commons-pool.home}/dist/
property name=commons-pool.jar
location=${commons-pool.lib}/commons-pool.jar/
- property name=commons-logging.home
location=${jakarta-commons}/commons-logging-1.0 /
- property name=commons-logging.lib location=${jakarta-logging.home} /
+ property name=commons-logging.home
location=${jakarta-commons}/commons-logging-1.0.1 /
+ property name=commons-logging.lib location=${commons-logging.home} /
property name=commons-logging.jar
location=${commons-logging.lib}/commons-logging-api.jar /
property name=commons-collections.home
location=${jakarta-commons}/collections/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
billbarker2002/09/10 22:36:43
Modified:.build.xml
Log:
Add commons-logging to the ClassPath for Util.
Preliminary step for starting on converting Util to c-l (which makes debugging s
much nicer :)
Revision ChangesPath
1.186 +5 -0 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- build.xml 30 Jul 2002 19:07:28 - 1.185
+++ build.xml 11 Sep 2002 05:36:42 - 1.186
@@ -84,6 +84,10 @@
property name=commons-pool.lib location=${commons-pool.home}/dist/
property name=commons-pool.jar
location=${commons-pool.lib}/commons-pool.jar/
+ property name=commons-logging.home
location=${jakarta-commons}/commons-logging-1.0 /
+ property name=commons-logging.lib location=${jakarta-logging.home} /
+ property name=commons-logging.jar
location=${commons-logging.lib}/commons-logging-api.jar /
+
property name=commons-collections.home
location=${jakarta-commons}/collections/
property name=commons-collections.lib
location=${commons-collections.home}/dist/
property name=commons-collections.jar
location=${commons-collections.lib}/commons-collections.jar/
@@ -310,6 +314,7 @@
srcdir=src/share
classpath
pathelement location=${tomcat-util.jar}/
+ pathelement location=${commons-logging.jar} /
/classpath
include name=org/apache/tomcat/util/**/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
larryi 2002/07/30 12:07:29
Modified:.build.xml
Log:
Use j-t-c propety for mx4j.jar location. Add a message for JMX detection.
Note that this detection needs to be in sync with the detection in
jakarta-tomcat-util.
Revision ChangesPath
1.185 +6 -2 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- build.xml 11 Jun 2002 12:13:22 - 1.184
+++ build.xml 30 Jul 2002 19:07:28 - 1.185
@@ -91,7 +91,7 @@
property name=jtc.http11.home location=${jakarta-tomcat-connectors}/http11/
property name=jtc.http11.lib location=${jtc.http11.home}/build/lib/
- property name=jmx.jar location=../jakarta-tomcat-connectors/lib/mx4j.jar/
+ property name=jmx.jar location=${jakarta-tomcat-connectors}/lib/mx4j.jar/
!-- Binaries checked in ( servlet.jar is not likely to change,
the 2.2 spec is final --
@@ -147,6 +147,10 @@
echo message=Detected JSSE/
/target
+ target name=msg.jmx if=jmx-present
+echo message=Detected JMX/
+ /target
+
target name=msg.puretls if=puretls.present
echo message=Detected PureTLS/
/target
@@ -164,7 +168,7 @@
/target
target name=init
-
depends=detect,uptodate,msg.jdk12,msg.jsse,msg.puretls,msg.commons-dbcp,msg.jtc,msg.jtc.util
+
depends=detect,uptodate,msg.jdk12,msg.jsse,msg.jmx,msg.puretls,msg.commons-dbcp,msg.jtc,msg.jtc.util
/target
target name=prepare.jaxp101 depends=detect if=jaxp10-present
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml build.properties.sample
hgomez 2002/06/11 05:13:22
Modified:.build.xml build.properties.sample
Log:
PR: Updated build.xml which will ensure that all required commons
jars needed for JDBCPooledRealm are present.
Updated build.properties.sample to reflect commons updates and
ant.lib (which is required for ant jscp task)
Revision ChangesPath
1.184 +27 -18jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- build.xml 7 Jun 2002 07:16:51 - 1.183
+++ build.xml 11 Jun 2002 12:13:22 - 1.184
@@ -76,6 +76,18 @@
property name=puretls.lib location=${puretls.home}/build/
property name=puretls.jar location=${puretls.lib}/puretls.jar/
+ property name=commons-dbcp.home location=${jakarta-commons}/dbcp/
+ property name=commons-dbcp.lib location=${commons-dbcp.home}/dist/
+ property name=commons-dbcp.jar
location=${commons-dbcp.lib}/commons-dbcp.jar/
+
+ property name=commons-pool.home location=${jakarta-commons}/pool/
+ property name=commons-pool.lib location=${commons-pool.home}/dist/
+ property name=commons-pool.jar
location=${commons-pool.lib}/commons-pool.jar/
+
+ property name=commons-collections.home
location=${jakarta-commons}/collections/
+ property name=commons-collections.lib
location=${commons-collections.home}/dist/
+ property name=commons-collections.jar
location=${commons-collections.lib}/commons-collections.jar/
+
property name=jtc.http11.home location=${jakarta-tomcat-connectors}/http11/
property name=jtc.http11.lib location=${jtc.http11.home}/build/lib/
@@ -98,8 +110,6 @@
file=${jsse.jar}/
available property=puretls.present
file=${puretls.jar}/
-available property=commons-dbcp.present
- file=${jakarta-commons}/dbcp/dist/commons-dbcp.jar /
available property=jdk12.present
classname=java.security.PrivilegedAction/
available property=jaxp-present
@@ -114,6 +124,13 @@
file=${jaxp.home}/xerces.jar /
available property=jtc-present
file=${jakarta-tomcat-connectors} /
+condition property=commons-dbcp.complete
+ and
+available file=${commons-dbcp.jar} /
+available file=${commons-pool.jar} /
+available file=${commons-collections.jar} /
+ /and
+/condition
/target
target name=uptodate
@@ -134,8 +151,8 @@
echo message=Detected PureTLS/
/target
- target name=msg.commons-dbcp if=commons-dbcp.present
-echo message=Detected commons-DBCP/
+ target name=msg.commons-dbcp if=commons-dbcp.complete
+echo message=Detected commons-DBCP and required jars/
/target
target name=msg.jtc unless=jtc-present
@@ -467,7 +484,7 @@
/target
- target name=commons-prepare depends=prepare if=commons-dbcp.present
+ target name=commons-prepare depends=prepare if=commons-dbcp.complete
!-- Because of way the build.xml files are set up, we can't call them from
inside this file. They need to be run before this script is executed
if you want the PooledJDBCRealm code to be built.
@@ -475,18 +492,10 @@
ant antfile=../jakarta-commons/pool/build.xml target=dist/
ant antfile=../jakarta-commons/dbcp/build.xml target=dist/
--
-echo message=copying commons jars/
-copy todir=${tomcat.build}/lib/container flatten=yes
-fileset dir=../jakarta-commons/dbcp
-include name=**/dist/*.jar/
-/fileset
-fileset dir=../jakarta-commons/pool
-include name=**/dist/*.jar/
-/fileset
-fileset dir=../jakarta-commons/collections
-include name=**/dist/*.jar/
-/fileset
-/copy
+echo message=copying commons jars for DBCP support/
+copy file=${commons-dbcp.jar} todir=${tomcat.build}/lib/container/
+copy file=${commons-pool.jar} todir=${tomcat.build}/lib/container/
+copy file=${commons-collections.jar} todir=${tomcat.build}/lib/container/
/target
!-- Standard interceptors == --
@@ -515,7 +524,7 @@
exclude
name=org/apache/tomcat/modules/aaa/PooledJDBCRealm.java
- unless=commons-dbcp.present/
+ unless=commons-dbcp.complete/
exclude
name=org/apache/tomcat/modules/config/PolicyInterceptor.java
unless=jdk12.present/
1.2 +22 -2 jakarta-tomcat/build.properties.sample
Index: build.properties.sample
===
RCS file: /home/cvs/jakarta-tomcat/build.properties.sample,v
retrieving revision 1.1
cvs commit: jakarta-tomcat build.xml
costin 2002/06/06 23:41:53
Modified:.build.xml
Log:
Added the excludes for MxInterceptor.
Revision ChangesPath
1.182 +8 -0 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- build.xml 29 May 2002 17:53:00 - 1.181
+++ build.xml 7 Jun 2002 06:41:53 - 1.182
@@ -79,6 +79,8 @@
property name=jtc.http11.home location=${jakarta-tomcat-connectors}/http11/
property name=jtc.http11.lib location=${jtc.http11.home}/build/lib/
+ property name=jmx.jar location=../jakarta-tomcat-connectors/lib/mx4j.jar/
+
!-- Binaries checked in ( servlet.jar is not likely to change,
the 2.2 spec is final --
property name=servlet22.jar value=bin/servlet22.jar/
@@ -102,6 +104,8 @@
classname=java.security.PrivilegedAction/
available property=jaxp-present
file=${jaxp.home}/jaxp.jar /
+available property=jmx-present
+ file=${jmx.jar} /
available property=jaxp10-present
file=${jaxp.home}/parser.jar /
available property=jaxp11-present
@@ -494,6 +498,7 @@
deprecation=off
classpath
pathelement location=${tomcat-util.jar}/
+pathelement location=${jmx.jar}/
pathelement location=${tomcat.build}/lib/container/tomcat_util.jar/
pathelement location=${tomcat.build}/lib/common/tomcat_core.jar/
fileset dir=${tomcat.build}/lib/container
@@ -504,6 +509,9 @@
exclude
name=org/apache/tomcat/modules/config/LoaderInterceptor12.java
unless=jdk12.present/
+ exclude
+ name=org/apache/tomcat/modules/config/MxInterceptor.java
+ unless=jmx.present/
exclude
name=org/apache/tomcat/modules/aaa/PooledJDBCRealm.java
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
costin 02/05/29 10:53:00
Modified:.build.xml
Log:
In case we compile with JDK1.4, this _must_ be present to preserve backward
compatibility with JDK1.1 and jikes.
Revision ChangesPath
1.181 +1 -0 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- build.xml 21 May 2002 18:15:02 - 1.180
+++ build.xml 29 May 2002 17:53:00 - 1.181
@@ -278,6 +278,7 @@
target name=tomcat_util depends=prepare
javac destdir=${tomcat.build}/classes
+target=1.1
debug=${debug}
optimize=${optimize}
deprecation=off
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
keith 02/05/18 10:17:13
Modified:.build.xml
Log:
Tomcat-ant task depends on JspC task in Ant, which
isn't in latest release build, 1.4.1. To build this
task use the 1.5 beta or head.
Revision ChangesPath
1.179 +4 -2 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- build.xml 16 May 2002 03:15:13 - 1.178
+++ build.xml 18 May 2002 17:17:13 - 1.179
@@ -90,6 +90,8 @@
target name=detect
available property=jsse.present.runtime
classname=javax.net.ssl.SSLServerSocket/
+available property=ant15-present
+ classname=org.apache.tools.ant.taskdefs.optional.jsp.JspC /
available property=jsse.present
file=${jsse.jar}/
available property=puretls.present
@@ -603,14 +605,14 @@
!-- Ant utilities == --
- target name=tomcat-ant
+ target name=tomcat-ant depends=detect if=ant15-present
javac srcdir=src/share
destdir=${tomcat.build}/classes
include name=org/apache/tomcat/ant/*.java /
classpath
pathelement path=${ant.lib}/ant.jar /
- pathelement path=${ant.lib}/ant-optional.jar /
pathelement path=${ant.lib}/optional.jar /
+ pathelement path=${ant.lib}/ant-optional.jar /
/classpath
/javac
mkdir dir=${tomcat.build}/ant /
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
keith 02/04/24 05:26:23
Modified:.build.xml
Log:
Fix build with the http11 connector
Revision ChangesPath
1.177 +1 -1 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- build.xml 18 Apr 2002 13:57:59 - 1.176
+++ build.xml 24 Apr 2002 12:26:23 - 1.177
@@ -263,7 +263,7 @@
property name=tomcat33.home value=${basedir}/build/tomcat/
/ant
-ant dir=${jakarta-tomcat-connectors}/http11 /
+ant dir=${jakarta-tomcat-connectors}/http11 inheritAll=false /
ant dir=${jakarta-tomcat-connectors}/jk target=build-jk
property name=tomcat33.home value=${basedir}/build/tomcat/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml gump.xml
costin 02/04/14 09:04:52
Modified:.build.xml gump.xml
Log:
Hopefully this will fix next gump.
Revision ChangesPath
1.174 +28 -12jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- build.xml 11 Apr 2002 02:05:12 - 1.173
+++ build.xml 14 Apr 2002 16:04:52 - 1.174
@@ -257,12 +257,24 @@
chmod perm=+x file=${tomcat.build}/bin/shutdown.sh/
/target
+ target name=deps description=Build repositoried that depends on. To be called
before main
+ant dir=${jakarta-tomcat-connectors}/util /
+ant dir=${jakarta-tomcat-connectors}/coyote
+property name=tomcat33.home value=${basedir}/build/tomcat/
+/ant
+
+ant dir=${jakarta-tomcat-connectors}/http11 /
+
+ant dir=${jakarta-tomcat-connectors}/jk target=build-jk
+property name=tomcat33.home value=${basedir}/build/tomcat/
+/ant
+ /target
+
+
!-- Tomcat util --
!-- Local Tomcat utilities --
target name=tomcat_util depends=prepare
-ant dir=${jakarta-tomcat-connectors}/util /
-
javac destdir=${tomcat.build}/classes
debug=${debug}
optimize=${optimize}
@@ -512,14 +524,10 @@
target name=coyote depends=prepare,tomcat_core,tomcat_modules
echo message=Building Coyote/
-!-- By now we have built the modules coyote needs --
-ant dir=${jakarta-tomcat-connectors}/coyote
-property name=tomcat33.home value=${basedir}/build/tomcat/
-/ant
-ant dir=${jakarta-tomcat-connectors}/http11 /
-
-ant dir=${jakarta-tomcat-connectors}/jk target=build-jk
+!-- This can't be compiled while j-t-c is built - tomcat is built
+ after, so files depending on 3.3 are ignored --
+ant dir=${jakarta-tomcat-connectors}/coyote target=compile.tomcat33
property name=tomcat33.home value=${basedir}/build/tomcat/
/ant
@@ -786,10 +794,13 @@
!-- Copy the files to distribution format --
- target name=dist depends=dist.prepare,javadoc,dist.war
+ target name=dist
depends=main,webapps,tomcat-jars,dist.prepare,javadoc,dist.war
+ /target
+
+ target name=dist-gump
depends=main-gump,webapps,tomcat-jars,dist.prepare,javadoc,dist.war
/target
- target name=dist.prepare depends=main,webapps,tomcat-jars
+ target name=dist.prepare
mkdir dir=${tomcat.dist}/
mkdir dir=${tomcat.dist}/webapps/
@@ -955,7 +966,12 @@
zip zipfile=${Name}-${version}.zip basedir=${tomcat.dist} includes=**/
/target
- target name=main depends=tomcat,webapps
+ target name=main depends=deps,tomcat,webapps
+ description=Built tomcat in build/, without packaging. Include all
dependent code
+ /target
+
+ target name=main-gump depends=tomcat,webapps
+ description=Build tomcat but not the code it depends on. For gump use
/target
1.2 +1 -1 jakarta-tomcat/gump.xml
Index: gump.xml
===
RCS file: /home/cvs/jakarta-tomcat/gump.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gump.xml 13 Apr 2002 17:05:45 - 1.1
+++ gump.xml 14 Apr 2002 16:04:52 - 1.2
@@ -10,7 +10,7 @@
project name=jakarta-tomcat
packageorg.apache.tomcat/package
-ant target=dist
+ant target=dist-gump
property name=jaxp.home reference=home project=jaxp/
property name=ant.home reference=home project=jakarta-ant/
property name=jsse.home reference=home project=jsse/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
larryi 02/04/14 21:25:24
Modified:.build.xml
Log:
Note sure if this will be in time for tonight's Gump build. The tomcat-jar target
still included the coyote target, which would cause it to fail.
This also implements a different approach to keeping Gump happy. Rather
than to define separate Gump targets, add new targets at needed points
in the standard build flow. For this purpose, main.lite was added.
It relies on the use of uptodate to avoid rebuilding the J-T-C util project,
which causes problems for Gump.
Also, since jakarta-tomcat doesn't directly depend on commons-logging,
I have removed it from this build.xml. commons-logging.jar is now copied
from the results of the J-T-C util build.
These changes should get Gump working again with main and dist'
targets still including coyote. More changes are coming so that a
future Gump project can defined for jakarta-tomcat which will include
the J-T-C dependencies.
Revision ChangesPath
1.175 +29 -38jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- build.xml 14 Apr 2002 16:04:52 - 1.174
+++ build.xml 15 Apr 2002 04:25:24 - 1.175
@@ -79,20 +79,6 @@
property name=jtc.http11.home location=${jakarta-tomcat-connectors}/http11/
property name=jtc.http11.lib location=${jtc.http11.home}/build/lib/
- !-- A binary copy of commons-logging.jar is checked in j-t-c.
- It can be overriden by gump or if you want to build jakarta-commons --
- !--
- property name=commons-logging.home
-location=${jakarta-commons}/logging/
- property name=commons-logging.lib
-location=${commons-logging.home}/dist/
- property name=commons-logging.jar
-location=${commons-logging.lib}/commons-logging.jar/
- --
-
- property name=commons-logging.jar
-location=${jakarta-tomcat-connectors}/lib/commons-logging.jar/
-
!-- Binaries checked in ( servlet.jar is not likely to change,
the 2.2 spec is final --
property name=servlet22.jar value=bin/servlet22.jar/
@@ -124,6 +110,12 @@
file=${jakarta-tomcat-connectors} /
/target
+ target name=uptodate
+uptodate property=tomcat-util.is.uptodate targetfile=${tomcat-util.jar}
+ srcfiles dir=${jtc.util.home} includes=java/**,build.xml/
+/uptodate
+ /target
+
target name=msg.jdk12 if=jdk12.present
echo message=Detected JDK1.2 /
/target
@@ -144,7 +136,12 @@
fail message=Jakarta-tomcat-connectors repository is required
${jakarta-tomcat-connectors}/
/target
- target name=init
depends=detect,msg.jdk12,msg.jsse,msg.puretls,msg.commons-dbcp,msg.jtc
+ target name=msg.jtc.util if=tomcat-util.is.uptodate
+echo message=tomcat-util.jar is up to date/
+ /target
+
+ target name=init
+
depends=detect,uptodate,msg.jdk12,msg.jsse,msg.puretls,msg.commons-dbcp,msg.jtc,msg.jtc.util
/target
target name=prepare.jaxp101 depends=detect if=jaxp10-present
@@ -239,9 +236,6 @@
copy file =src/build/readme/readme.common
tofile=${tomcat.build}/lib/common/README /
-copy tofile=${tomcat.build}/lib/common/commons-logging.jar
- file=${commons-logging.jar}/
-
!-- This act as a default, Tomcat3.3 will not load it in
classpath, just a hack to ease the transition
--
@@ -257,8 +251,12 @@
chmod perm=+x file=${tomcat.build}/bin/shutdown.sh/
/target
+ target name=dep.tomcat-util unless=tomcat-util.is.uptodate
+ description=Build j-t-c util which we depend on. To be called before
main
+ant dir=${jakarta-tomcat-connectors}/util /
+ /target
+
target name=deps description=Build repositoried that depends on. To be called
before main
-ant dir=${jakarta-tomcat-connectors}/util /
ant dir=${jakarta-tomcat-connectors}/coyote
property name=tomcat33.home value=${basedir}/build/tomcat/
/ant
@@ -307,16 +305,13 @@
/fileset
/jar
-!-- J-T-C utils - with tomcat_util.jar name --
-!--
-jar jarfile=${tomcat.build}/lib/common/tomcat_util.jar
- fileset dir=${jakarta-tomcat-connectors}/util/build/classes
-include name=org/apache/tomcat/util/**/
+!-- Add jakarta-tomcat-connectors utils --
+!-- Includes the tomcat-utils.jar and common-logging.jar --
+copy todir=${tomcat.build}/lib/common
+ fileset dir=${jakarta-tomcat-connectors}/util/build/lib
+include name=*.jar/
/fileset
-/jar
---
-copy file=${jakarta-tomcat-connectors}/util/build/lib/tomcat-util.jar
-
cvs commit: jakarta-tomcat build.xml
costin 02/04/10 17:05:16
Modified:.build.xml
Log:
Copy commons-logging in common. Roll back if you think it's a problem, but
it shouldn't be. There are few things that will work better - especially
if you use log4j or another logger.
Copy jk2.properties.
Revision ChangesPath
1.172 +4 -1 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- build.xml 10 Apr 2002 03:24:44 - 1.171
+++ build.xml 11 Apr 2002 00:05:16 - 1.172
@@ -239,7 +239,7 @@
copy file =src/build/readme/readme.common
tofile=${tomcat.build}/lib/common/README /
-copy tofile=${tomcat.build}/lib/container/commons-logging.jar
+copy tofile=${tomcat.build}/lib/common/commons-logging.jar
file=${commons-logging.jar}/
!-- This act as a default, Tomcat3.3 will not load it in
@@ -534,6 +534,9 @@
copy todir=${tomcat.build}/lib/container
file=${jakarta-tomcat-connectors}/jk/build/lib/tomcat-jk2.jar/
+
+copy todir=${tomcat.build}/conf
+ file=${jakarta-tomcat-connectors}/jk/conf/jk2.properties/
/target
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
larryi 02/04/10 19:05:13 Modified:.build.xml Log: The needed depency is already in the add-ons build.xml files. Removing it from here to avoid building twice. Revision ChangesPath 1.173 +1 -1 jakarta-tomcat/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat/build.xml,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- build.xml 11 Apr 2002 00:05:16 - 1.172 +++ build.xml 11 Apr 2002 02:05:12 - 1.173 @@ -693,7 +693,7 @@ ant antfile=proposals/StreamHandler/build.xml / /target - target name=sample.add-ons.dist depends=sample.add-ons + target name=sample.add-ons.dist ant antfile=proposals/PasswordPrompter/build.xml target=password.prompter.war/ ant antfile=proposals/StreamHandler/build.xml target=stream.handler.war / /target -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat build.xml
On Mon, 8 Apr 2002, Larry Isaacs wrote: It's not so much having one util jar, but understanding the differences between jakarta-tomcat-connectors' tomcat-util.jar and connectors_util.jar. If they are the same, then I would prefer to use a single name. They are certainly not the same ( or they weren't in 3.3.0/3.3.1 ). Tomcat utils are a collection of (more or less independent) tools. In tomcat3.3 we put some of them in the common loader ( the minimal set required to get things running ), and the rest in the container loader. The 'minimal' set consist of core_util.jar and connectors_util.jar. tomcat_util.jar ( in container ) has all of the tools. I think it would be a mistake to name the jar in common with the same name, since they have different content. If we put all the utils in common ( which wouldn't be bad - the reasons for keeping the 'minimal set' only are not very strong ) - then we can name it tomcat_util.jar, and remove the one in container. If we do that, we need to fix few bugs - XmlMapper will not work because crimson is in container/, and we don't set the thread class loader to container/ when starting up. The main reason for doing the minimal set was a bit of security paranoia, the utils are used by the core and we must be sure they don't expose anything ( static fields/methods, priviledged actions, etc ). For example the compat util used to have a bug allowing untrusted code to run trusted apps ( it had a doPriviledged without checking the source ). I'm 99% sure we're ok. Other reasons - like allowing apps to load different versions of utils - are not that important. Somehow important is to make sure all utils are webapp-friendly ( ie. use thread class loader - like commons-logging for example ) Costin Cheers, Larry -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]] Sent: Mon 4/8/2002 6:37 PM To: Tomcat Developers List Cc: Subject: RE: cvs commit: jakarta-tomcat build.xml On Mon, 8 Apr 2002, Larry Isaacs wrote: Hi Costin, I'm curious as to the reason to have connectors_util.jar instead of just using the tomcat-utils.jar built by j-t-c/util? We have 2 'sets' of utils - one in j-t-c/util, one in j-t. We also have 2 lib dirs - lib/common and lib/container. The way we used to split the utils - we put minimal stuff in common, and that was core_utils and connector_utils. That's how 3.3.0/3.3.1 are doing it. I'm +1 to change to a single tomcat-util.jar in common, but that requires few fixes in xml-mapper ( actually in startup, to make xml-mapper find the thread loader pointing to container ). It also requires another review of the utils/ from security point of view - whatever is in common must be safe, since it'll be exposed to untrusted apps. Costin msg24683/bin0.bin Description: application/ms-tnef -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat build.xml
-Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]] Sent: Tuesday, April 09, 2002 2:50 AM To: Tomcat Developers List Subject: RE: cvs commit: jakarta-tomcat build.xml On Mon, 8 Apr 2002, Larry Isaacs wrote: It's not so much having one util jar, but understanding the differences between jakarta-tomcat-connectors' tomcat-util.jar and connectors_util.jar. If they are the same, then I would prefer to use a single name. They are certainly not the same ( or they weren't in 3.3.0/3.3.1 ). Tomcat utils are a collection of (more or less independent) tools. In tomcat3.3 we put some of them in the common loader ( the minimal set required to get things running ), and the rest in the container loader. The 'minimal' set consist of core_util.jar and connectors_util.jar. tomcat_util.jar ( in container ) has all of the tools. The instructions for installing Coyote on Tomcat 3.3.x say to replace connectors_util.jar with j-t-c's tomcat-utils.jar. Since I plan to include Coyote in Tomcat 3.3.2 distribution, then the util jar we ship in common loader must remain compatible with the tomcat-utils.jar that j-t-c builds. So why not just use the util jar that j-t-c builds? I would be +1 for renaming the util jar that j-t-c builds to connectors_util.jar to avoid name confusion with the tomcat_util.jar. I think it would be a mistake to name the jar in common with the same name, since they have different content. If we put all the utils in common ( which wouldn't be bad - the reasons for keeping the 'minimal set' only are not very strong ) - then we can name it tomcat_util.jar, and remove the one in container. If we do that, we need to fix few bugs - XmlMapper will not work because crimson is in container/, and we don't set the thread class loader to container/ when starting up. I don't have any special urge to have a single util jar. I find it preferable to not have a XML parser in the common loader. IMHO, auto-adding the XML parser to the web application loader is a good solution for providing a default XML parser. If this means we keep separate common and container util jars, I'm in favor of that. Cheers, Larry The main reason for doing the minimal set was a bit of security paranoia, the utils are used by the core and we must be sure they don't expose anything ( static fields/methods, priviledged actions, etc ). For example the compat util used to have a bug allowing untrusted code to run trusted apps ( it had a doPriviledged without checking the source ). I'm 99% sure we're ok. Other reasons - like allowing apps to load different versions of utils - are not that important. Somehow important is to make sure all utils are webapp-friendly ( ie. use thread class loader - like commons-logging for example ) Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat build.xml
tomcat_util.jar ( in container ) has all of the tools. The instructions for installing Coyote on Tomcat 3.3.x say to replace connectors_util.jar with j-t-c's tomcat-utils.jar. Since I plan to include Coyote in Tomcat 3.3.2 distribution, then the util jar we ship in common loader must remain compatible with the tomcat-utils.jar that j-t-c builds. So why not just use the util jar that j-t-c builds? I would be +1 for renaming the util jar that j-t-c builds to connectors_util.jar to avoid name confusion with the tomcat_util.jar. +1 -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat build.xml
On Tue, 9 Apr 2002, Larry Isaacs wrote: The instructions for installing Coyote on Tomcat 3.3.x say to replace connectors_util.jar with j-t-c's tomcat-utils.jar. Since j-t-c tomcat-utils are a subset of tomcat-utils.jar from container/ Sorry, I didn't read the instructions for Coyote - I'm using coyote with the 'old' minimal common loader and it works fine. I have 2 concerns: - we can't have same tomcat-utils.jar name and different content in common and container. - I want to make sure all code that goes to common is carefully reviewed from security standpoint. We had a potential problem with jdk11 compat package ( now it is safe, but at some point it wasn't ). That's the main reason for keeping only minimal utils. the tomcat-utils.jar that j-t-c builds. So why not just use the util jar that j-t-c builds? I would be +1 for renaming the util jar that j-t-c builds to connectors_util.jar to avoid name confusion with the tomcat_util.jar. Or we can rename container/tomcat_util.jar to container/container_util.jar, and leave tomcat_util name to j-t-c. Both are fine - but we still need to review any extra class that ends in common ( i.e. re-read the code and look for static methods/fields, package-protected methods, doPriviledged blocks, etc ) I will do that, but it would help if you could duplicate :-) ( duplication is good sometimes ). I don't have any special urge to have a single util jar. I find it preferable to not have a XML parser in the common loader. IMHO, auto-adding the XML parser to the web application loader is a good solution for providing a default XML parser. If this means we keep separate common and container util jars, I'm in favor of that. No, xml parser in common was not the issue. XmlMapper is also ok and could sit in common loader. The only problem is that XmlMapper doesn't work at this moment in common/ because we don't set the context loader to point to container/ ( this also affects common-logger ). I think the only reason for keeping some utils in container is security and webapp-awareness - as we find time and review the code we can move it to common. By webapp-awareness I mean it should deal with the fact that webapps may use it and use thread class loader instead of Class.forName, etc. Not all code 'behaves' nicely in commons, and I would like to avoid playing ClassLoader tricks and breaking delegation. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat build.xml
On Tue, 9 Apr 2002, Larry Isaacs wrote: The instructions for installing Coyote on Tomcat 3.3.x say to replace connectors_util.jar with j-t-c's tomcat-utils.jar. Since j-t-c tomcat-utils are a subset of tomcat-utils.jar from container/ Sorry, I didn't read the instructions for Coyote - I'm using coyote with the 'old' minimal common loader and it works fine. If there are problems with those install instructions, let me know. Coyote used some bugfixes which were included in TC after 3.3, so that's the reason for those instructions. Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat build.xml
-Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]] Sent: Tuesday, April 09, 2002 2:09 PM To: Tomcat Developers List Subject: RE: cvs commit: jakarta-tomcat build.xml On Tue, 9 Apr 2002, Larry Isaacs wrote: The instructions for installing Coyote on Tomcat 3.3.x say to replace connectors_util.jar with j-t-c's tomcat-utils.jar. Since j-t-c tomcat-utils are a subset of tomcat-utils.jar from container/ Sorry, I didn't read the instructions for Coyote - I'm using coyote with the 'old' minimal common loader and it works fine. I have 2 concerns: - we can't have same tomcat-utils.jar name and different content in common and container. - I want to make sure all code that goes to common is carefully reviewed from security standpoint. We had a potential problem with jdk11 compat package ( now it is safe, but at some point it wasn't ). That's the main reason for keeping only minimal utils. I'm +1 on this too. the tomcat-utils.jar that j-t-c builds. So why not just use the util jar that j-t-c builds? I would be +1 for renaming the util jar that j-t-c builds to connectors_util.jar to avoid name confusion with the tomcat_util.jar. Or we can rename container/tomcat_util.jar to container/container_util.jar, and leave tomcat_util name to j-t-c. You mean leave tomcat-util to j-t-c. Yes, '-' and '_' aren't sufficient differences in the name. Using container_util.jar sounds good to me. Are you okay with using the tomcat-utils.jar built by j-t-c, rather than the current build creation of connector_utils.jar? Both are fine - but we still need to review any extra class that ends in common ( i.e. re-read the code and look for static methods/fields, package-protected methods, doPriviledged blocks, etc ) I will do that, but it would help if you could duplicate :-) ( duplication is good sometimes ). I'll try to find some time to help with this. Cheers, Larry -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat build.xml
-Original Message- From: Remy Maucherat [mailto:[EMAIL PROTECTED]] Sent: Tuesday, April 09, 2002 1:15 PM To: Tomcat Developers List Subject: Re: cvs commit: jakarta-tomcat build.xml On Tue, 9 Apr 2002, Larry Isaacs wrote: The instructions for installing Coyote on Tomcat 3.3.x say to replace connectors_util.jar with j-t-c's tomcat-utils.jar. Since j-t-c tomcat-utils are a subset of tomcat-utils.jar from container/ Sorry, I didn't read the instructions for Coyote - I'm using coyote with the 'old' minimal common loader and it works fine. If there are problems with those install instructions, let me know. Coyote used some bugfixes which were included in TC after 3.3, so that's the reason for those instructions. The instructions are fine. It's just that after following them for Tomcat 3.3, you have a tomcat-util.jar in lib/common and a tomcat_util.jar in lib/container. We have just demonstrated how easy it is to get them confused. :) To avoid confusion, I'll go with Costin's suggestion of renaming the tomcat_util.jar in lib/container to container_util.jar. Cheers, Larry Remy -- To unsubscribe, e-mail: mailto:tomcat-dev- [EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat build.xml
- Original Message - From: Remy Maucherat [EMAIL PROTECTED] To: Tomcat Developers List [EMAIL PROTECTED] Sent: Tuesday, April 09, 2002 10:14 AM Subject: Re: cvs commit: jakarta-tomcat build.xml On Tue, 9 Apr 2002, Larry Isaacs wrote: The instructions for installing Coyote on Tomcat 3.3.x say to replace connectors_util.jar with j-t-c's tomcat-utils.jar. Since j-t-c tomcat-utils are a subset of tomcat-utils.jar from container/ Sorry, I didn't read the instructions for Coyote - I'm using coyote with the 'old' minimal common loader and it works fine. If there are problems with those install instructions, let me know. Coyote used some bugfixes which were included in TC after 3.3, so that's the reason for those instructions. The tomcat-utils.jar replacement is optional with 3.3.1, but at the moment they are fine. Neither of the CoyoteInterceptors is passing watchdog at the moment. This mostly means that the original version is likely to get deprecated sooner rather than later. At that point, the instructions will change. Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat build.xml
I'll commit a fix. Larry, is it ok if we call the buildfile for j-t-c from 3.3's build.xml ? ( 4.0 is doing that too ). The problem is the order which may be tricky - tomcat33 depends on j-t-c utils and it will copy coyote. But coyote depens on tomcat33 beeing build, so it can find the classes. It would make things cleaner I think - right now I'm using scripts and workarounds... Tomcat3.3 will call things in the right order and get all things in place. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat build.xml
-Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]] Sent: Tuesday, April 09, 2002 3:11 PM To: Tomcat Developers List Subject: RE: cvs commit: jakarta-tomcat build.xml I'll commit a fix. Larry, is it ok if we call the buildfile for j-t-c from 3.3's build.xml ? ( 4.0 is doing that too ). I'm fine with that, though I think clean should also call clean target(s) in j-t-c too, so clean cleans everything that Tomcat 3.3.x uses. The problem is the order which may be tricky - tomcat33 depends on j-t-c utils and it will copy coyote. But coyote depens on tomcat33 beeing build, so it can find the classes. It would make things cleaner I think - right now I'm using scripts and workarounds... Tomcat3.3 will call things in the right order and get all things in place. This sounds fine. I was trying in my initial build.xml update to keep Gump working, but wasn't wasn't successful. :-( Larry Costin -- To unsubscribe, e-mail: mailto:tomcat-dev- [EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
costin 02/04/09 12:33:43
Modified:.build.xml
Log:
As discussed on tomcat-dev, place j-t-c/tomcat-utils.jar in common,
rename the old one to container-utils.
Call the ant files for j-t-c to build and clean
Revision ChangesPath
1.169 +53 -31jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- build.xml 8 Apr 2002 20:00:37 - 1.168
+++ build.xml 9 Apr 2002 19:33:42 - 1.169
@@ -120,8 +120,8 @@
file=${jaxp.home}/crimson.jar /
available property=xerces-present
file=${jaxp.home}/xerces.jar /
-available property=http11-present
- file=${jtc.http11.lib}/tomcat-http11.jar /
+available property=jtc-present
+ file=${jakarta-tomcat-connectors} /
/target
target name=msg.jdk12 if=jdk12.present
@@ -131,6 +131,7 @@
target name=msg.jsse if=jsse.present
echo message=Detected JSSE/
/target
+
target name=msg.puretls if=puretls.present
echo message=Detected PureTLS/
/target
@@ -139,7 +140,11 @@
echo message=Detected commons-DBCP/
/target
- target name=init
depends=detect,msg.jdk12,msg.jsse,msg.puretls,msg.commons-dbcp
+ target name=msg.jtc unless=jtc-present
+fail message=Jakarta-tomcat-connectors repository is required
${jakarta-tomcat-connectors}/
+ /target
+
+ target name=init
depends=detect,msg.jdk12,msg.jsse,msg.puretls,msg.commons-dbcp,msg.jtc
/target
target name=prepare.jaxp101 depends=detect if=jaxp10-present
@@ -174,21 +179,9 @@
target name=prepare.jaxp
depends=prepare.jaxp101,prepare.jaxp11,prepare.xerces /
- target name=prepare.http11 depends=detect if=http11-present
-echo message=Installing Http11 and Coyote/
-copy tofile=${tomcat.build}/lib/common/tomcat33-resource.jar
- file=${jtc.http11.lib}/tomcat33-resource.jar/
-copy tofile=${tomcat.build}/lib/container/tomcat-http11.jar
- file=${jtc.http11.lib}/tomcat-http11.jar/
-copy tofile=${tomcat.build}/lib/container/tomcat33-coyote.jar
- file=${jtc.http11.lib}/tomcat33-coyote.jar/
-copy tofile=${tomcat.build}/lib/container/commons-logging.jar
- file=${commons-logging.jar}/
- /target
-
!-- Copy static files --
- target name=prepare depends=init,prepare.dirs,prepare.jaxp,prepare.http11
+ target name=prepare depends=init,prepare.dirs,prepare.jaxp
description=Create the directory structure for build and copy binaries /
target name=prepare.dirs depends=init
@@ -246,6 +239,8 @@
copy file =src/build/readme/readme.common
tofile=${tomcat.build}/lib/common/README /
+copy tofile=${tomcat.build}/lib/container/commons-logging.jar
+ file=${commons-logging.jar}/
!-- This act as a default, Tomcat3.3 will not load it in
classpath, just a hack to ease the transition
@@ -291,34 +286,32 @@
/fileset
/copy
+!-- Hooks and other tomcat3.3 specific utils needed in core --
jar jarfile=${tomcat.build}/lib/common/core_util.jar
fileset dir=${tomcat.build}/classes
include name=org/apache/tomcat/util/hooks/**/
- /fileset
- fileset dir=${jakarta-tomcat-connectors}/util/build/classes
- include name=org/apache/tomcat/util/log/**/
+!-- All resource must go to common, bug in StringManager/ResourceBundle --
+include name=org/apache/tomcat/util/**/*.properties/
/fileset
/jar
-jar jarfile=${tomcat.build}/lib/common/connector_util.jar
+!-- J-T-C utils - with tomcat_util.jar name --
+!--
+jar jarfile=${tomcat.build}/lib/common/tomcat_util.jar
fileset dir=${jakarta-tomcat-connectors}/util/build/classes
-include name=org/apache/tomcat/util/collections/**/
-include name=org/apache/tomcat/util/http/**/
-include name=org/apache/tomcat/util/buf/**/
-include name=org/apache/tomcat/util/res/**/
-!-- All resource must go to common, bug in StringManager/ResourceBundle --
-include name=org/apache/tomcat/util/**/*.properties/
+include name=org/apache/tomcat/util/**/
/fileset
/jar
+--
+copy file=${jakarta-tomcat-connectors}/util/build/lib/tomcat-util.jar
+ todir=${tomcat.build}/lib/common /
-jar jarfile=${tomcat.build}/lib/container/tomcat_util.jar
+!-- All tomcat3 specific utils --
+jar jarfile=${tomcat.build}/lib/container/container_util.jar
fileset dir=${tomcat.build}/classes
include
cvs commit: jakarta-tomcat build.xml
costin 02/04/09 14:37:53
Modified:.build.xml
Log:
Update j-t-c/jk build file
Revision ChangesPath
1.170 +1 -1 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- build.xml 9 Apr 2002 19:33:42 - 1.169
+++ build.xml 9 Apr 2002 21:37:53 - 1.170
@@ -529,7 +529,7 @@
file=${jtc.http11.lib}/tomcat33-coyote.jar/
copy todir=${tomcat.build}/lib/container
- file=${jakarta-tomcat-connectors}/jk/build/WEB-INF/lib/tomcat-jk2.jar/
+ file=${jakarta-tomcat-connectors}/jk/build/lib/tomcat-jk2.jar/
/target
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
larryi 02/04/09 20:24:45
Modified:.build.xml
Log:
Include our home to ensure it is set correctly
Revision ChangesPath
1.171 +6 -2 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- build.xml 9 Apr 2002 21:37:53 - 1.170
+++ build.xml 10 Apr 2002 03:24:44 - 1.171
@@ -513,11 +513,15 @@
target name=coyote depends=prepare,tomcat_core,tomcat_modules
echo message=Building Coyote/
!-- By now we have built the modules coyote needs --
-ant dir=${jakarta-tomcat-connectors}/coyote /
+ant dir=${jakarta-tomcat-connectors}/coyote
+property name=tomcat33.home value=${basedir}/build/tomcat/
+/ant
ant dir=${jakarta-tomcat-connectors}/http11 /
-ant dir=${jakarta-tomcat-connectors}/jk /
+ant dir=${jakarta-tomcat-connectors}/jk target=build-jk
+property name=tomcat33.home value=${basedir}/build/tomcat/
+/ant
copy tofile=${tomcat.build}/lib/common/tomcat33-resource.jar
file=${jtc.http11.lib}/tomcat33-resource.jar/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
costin 02/04/08 12:44:28
Modified:.build.xml
Log:
Few simplifications:
- use the binary version of common-logging. It is trivial to override this
to build-from-source version ( for Gump ), but new users should have minimal
pain.
- call ant in j-t-c/util, don't assume j-t-c will be built first.
This preserves the original behavior ( checkout / build - no extra rules )
( I hope :-), except you must check out both j-t and j-t-c
Revision ChangesPath
1.167 +24 -11jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- build.xml 8 Apr 2002 01:56:50 - 1.166
+++ build.xml 8 Apr 2002 19:44:28 - 1.167
@@ -79,12 +79,19 @@
property name=jtc.http11.home location=${jakarta-tomcat-connectors}/http11/
property name=jtc.http11.lib location=${jtc.http11.home}/build/lib/
+ !-- A binary copy of commons-logging.jar is checked in j-t-c.
+ It can be overriden by gump or if you want to build jakarta-commons --
+ !--
property name=commons-logging.home
location=${jakarta-commons}/logging/
property name=commons-logging.lib
location=${commons-logging.home}/dist/
property name=commons-logging.jar
location=${commons-logging.lib}/commons-logging.jar/
+ --
+
+ property name=commons-logging.jar
+location=${jakarta-tomcat-connectors}/lib/commons-logging.jar/
!-- Binaries checked in ( servlet.jar is not likely to change,
the 2.2 spec is final --
@@ -246,9 +253,6 @@
copy tofile=${tomcat.build}/lib/common/servlet.jar
file=${servlet22.jar}/
-copy tofile=${tomcat.build}/lib/common/tomcat-util.jar
- file=${tomcat-util.jar}/
-
fixcrlf srcdir=${tomcat.build}/bin includes=**/*.sh eol=lf/
fixcrlf srcdir=${tomcat.build}/bin includes=**/*.bat eol=crlf/
@@ -262,6 +266,8 @@
!-- Local Tomcat utilities --
target name=tomcat_util depends=prepare
+ant dir=${jakarta-tomcat-connectors}/util /
+
javac destdir=${tomcat.build}/classes
debug=${debug}
optimize=${optimize}
@@ -285,16 +291,23 @@
/fileset
/copy
-jar jarfile=${tomcat.build}/lib/common/core_util.jar
- basedir=${tomcat.build}/classes
- include name=org/apache/tomcat/util/hooks/**/
- include name=org/apache/tomcat/util/log/**/
+jar jarfile=${tomcat.build}/lib/common/core_util.jar
+ fileset dir=${tomcat.build}/classes
+ include name=org/apache/tomcat/util/hooks/**/
+ /fileset
+ fileset dir=${jakarta-tomcat-connectors}/util/build/classes
+ include name=org/apache/tomcat/util/log/**/
+ /fileset
/jar
-jar jarfile=${tomcat.build}/lib/container/tomcat_util.jar
- basedir=${tomcat.build}/classes
- include name=org/apache/tomcat/util/**/
- exclude name=org/apache/tomcat/util/test/**/
+jar jarfile=${tomcat.build}/lib/container/tomcat_util.jar
+ fileset dir=${tomcat.build}/classes
+include name=org/apache/tomcat/util/**/
+exclude name=org/apache/tomcat/util/test/**/
+ /fileset
+ fileset dir=${jakarta-tomcat-connectors}/util/build/classes
+include name=org/apache/tomcat/util/**/
+ /fileset
/jar
/target
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
costin 02/04/08 13:00:37
Modified:.build.xml
Log:
Forgot one jar, resources.
XXX Must fix the bugs that prevent putting the whole tomcat_util.jar in common,
check that all utils are 'safe', and move them. Same for common-logging.
Revision ChangesPath
1.168 +11 -0 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- build.xml 8 Apr 2002 19:44:28 - 1.167
+++ build.xml 8 Apr 2002 20:00:37 - 1.168
@@ -300,6 +300,17 @@
/fileset
/jar
+jar jarfile=${tomcat.build}/lib/common/connector_util.jar
+ fileset dir=${jakarta-tomcat-connectors}/util/build/classes
+include name=org/apache/tomcat/util/collections/**/
+include name=org/apache/tomcat/util/http/**/
+include name=org/apache/tomcat/util/buf/**/
+include name=org/apache/tomcat/util/res/**/
+!-- All resource must go to common, bug in StringManager/ResourceBundle --
+include name=org/apache/tomcat/util/**/*.properties/
+ /fileset
+/jar
+
jar jarfile=${tomcat.build}/lib/container/tomcat_util.jar
fileset dir=${tomcat.build}/classes
include name=org/apache/tomcat/util/**/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat build.xml
Hi Costin,
I'm curious as to the reason to have connectors_util.jar instead
of just using the tomcat-utils.jar built by j-t-c/util?
Cheers,
Larry
-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
Sent: Mon 4/8/2002 4:00 PM
To: [EMAIL PROTECTED]
Cc:
Subject: cvs commit: jakarta-tomcat build.xml
costin 02/04/08 13:00:37
Modified:.build.xml
Log:
Forgot one jar, resources.
XXX Must fix the bugs that prevent putting the whole tomcat_util.jar in common,
check that all utils are 'safe', and move them. Same for common-logging.
Revision ChangesPath
1.168 +11 -0 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- build.xml 8 Apr 2002 19:44:28 - 1.167
+++ build.xml 8 Apr 2002 20:00:37 - 1.168
@@ -300,6 +300,17 @@
/fileset
/jar
+jar jarfile=${tomcat.build}/lib/common/connector_util.jar
+ fileset dir=${jakarta-tomcat-connectors}/util/build/classes
+include name=org/apache/tomcat/util/collections/**/
+include name=org/apache/tomcat/util/http/**/
+include name=org/apache/tomcat/util/buf/**/
+include name=org/apache/tomcat/util/res/**/
+!-- All resource must go to common, bug in StringManager/ResourceBundle
--
+include name=org/apache/tomcat/util/**/*.properties/
+ /fileset
+/jar
+
jar jarfile=${tomcat.build}/lib/container/tomcat_util.jar
fileset dir=${tomcat.build}/classes
include name=org/apache/tomcat/util/**/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
mailto:[EMAIL PROTECTED]
msg24657/bin0.bin
Description: application/ms-tnef
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat build.xml
On Mon, 8 Apr 2002, Larry Isaacs wrote: Hi Costin, I'm curious as to the reason to have connectors_util.jar instead of just using the tomcat-utils.jar built by j-t-c/util? We have 2 'sets' of utils - one in j-t-c/util, one in j-t. We also have 2 lib dirs - lib/common and lib/container. The way we used to split the utils - we put minimal stuff in common, and that was core_utils and connector_utils. That's how 3.3.0/3.3.1 are doing it. I'm +1 to change to a single tomcat-util.jar in common, but that requires few fixes in xml-mapper ( actually in startup, to make xml-mapper find the thread loader pointing to container ). It also requires another review of the utils/ from security point of view - whatever is in common must be safe, since it'll be exposed to untrusted apps. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat build.xml
It's not so much having one util jar, but understanding the differences between jakarta-tomcat-connectors' tomcat-util.jar and connectors_util.jar. If they are the same, then I would prefer to use a single name. Cheers, Larry -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]] Sent: Mon 4/8/2002 6:37 PM To: Tomcat Developers List Cc: Subject: RE: cvs commit: jakarta-tomcat build.xml On Mon, 8 Apr 2002, Larry Isaacs wrote: Hi Costin, I'm curious as to the reason to have connectors_util.jar instead of just using the tomcat-utils.jar built by j-t-c/util? We have 2 'sets' of utils - one in j-t-c/util, one in j-t. We also have 2 lib dirs - lib/common and lib/container. The way we used to split the utils - we put minimal stuff in common, and that was core_utils and connector_utils. That's how 3.3.0/3.3.1 are doing it. I'm +1 to change to a single tomcat-util.jar in common, but that requires few fixes in xml-mapper ( actually in startup, to make xml-mapper find the thread loader pointing to container ). It also requires another review of the utils/ from security point of view - whatever is in common must be safe, since it'll be exposed to untrusted apps. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] mailto:[EMAIL PROTECTED] msg24681/bin0.bin Description: application/ms-tnef -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
larryi 02/02/23 19:49:37
Modified:.build.xml
Log:
Update to eliminate fixcrlf warnings. Ant 1.4 or later is now required.
Revision ChangesPath
1.164 +2 -2 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- build.xml 12 Jan 2002 07:19:38 - 1.163
+++ build.xml 24 Feb 2002 03:49:37 - 1.164
@@ -191,8 +191,8 @@
copy tofile=${tomcat.build}/lib/common/servlet.jar
file=${servlet22.jar}/
-fixcrlf srcdir=${tomcat.build}/bin includes=**/*.sh cr=remove/
-fixcrlf srcdir=${tomcat.build}/bin includes=**/*.bat cr=add/
+fixcrlf srcdir=${tomcat.build}/bin includes=**/*.sh eol=lf/
+fixcrlf srcdir=${tomcat.build}/bin includes=**/*.bat eol=crlf/
chmod perm=+x file=${tomcat.build}/bin/tomcat.sh/
chmod perm=+x file=${tomcat.build}/bin/jspc.sh/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
costin 01/12/16 21:31:45
Modified:.build.xml
Log:
EmbededTomcat doesn't depend on jdk12, remove the conditional.
Added a target to build 'embeded' style tomcat, i.e. a single jar containing
everything ( no more lib/container, etc ). It is self-runnable and should start
tomcat
with the defaults settings ( no server.xml, etc ) using the current dir as base.
Just add webapps and shake.
This is nice for people who just need a simple jar with no strings attached (
configs,
dir structure, etc ).
Revision ChangesPath
1.162 +71 -1 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- build.xml 2001/12/07 04:42:23 1.161
+++ build.xml 2001/12/17 05:31:45 1.162
@@ -355,7 +355,6 @@
pathelement location=${tomcat.build}/lib/common/tomcat_core.jar/
/classpath
include name=org/apache/tomcat/startup/**/
- exclude name=**/EmbededTomcat.java unless=jdk12.present/
/javac
jar jarfile=${tomcat.build}/lib/common/etomcat.jar
@@ -596,6 +595,77 @@
target name=sample.add-ons.clean
ant antfile=proposals/PasswordPrompter/build.xml target=clean/
/target
+
+ !-- Embeded tomcat --
+
+ target name=etomcat depends=init
+javac destdir=${tomcat.build}/classes
+ debug=${debug}
+ optimize=${optimize}
+ deprecation=off
+ srcdir=src/share
+ classpath
+pathelement location=${jsse.lib}/jsse.jar/
+pathelement location=${jsse.lib}/jnet.jar/
+pathelement location=${jsse.lib}/jcert.jar/
+pathelement location=${servlet.jar}/
+ /classpath
+ include name=org/apache/**/
+ exclude name=**/util/net/SSLSocketFactory.java
+ unless=jsse.present/
+ exclude name=**/util/net/SSLSocketFactory.java
+ unless=jdk12.present/
+ exclude name=**/util/compat/JSSECertCompat.java
+ unless=jsse.present/
+ exclude name=**/util/compat/JSSECertCompat.java
+ unless=jdk12.present/
+ exclude name=**/util/compat/Jdk12Support.java
+ unless=jdk12.present/
+ exclude name=**/util/depend/DependClassLoader12.java
+ unless=jdk12.present/
+ exclude name=**/util/depend/DependClassLoader12.java
+unless=jdk12.present/
+ exclude name=**/util/compat/Jdk12Support.java
+unless=jdk12.present/
+ exclude name=**/util/compat/JSSECertCompat.java
+ unless=jsse.present/
+ exclude name=**/util/compat/JSSECertCompat.java
+ unless=jdk12.present/
+/javac
+
+javac
+ destdir=${tomcat.build}/classes
+ debug=${debug}
+ optimize=${optimize}
+ deprecation=off
+ srcdir=src/facade22
+ classpath
+pathelement location=${servlet22.jar}/
+pathelement location=${tomcat.build}/classes/
+ /classpath
+ include name=org/apache/tomcat/facade/**/
+/javac
+
+copy todir=${tomcat.build}/classes
+ fileset dir=src/share
+include name=org/apache/tomcat/**/*.properties/
+include name=org/apache/tomcat/**/*.dtd/
+ /fileset
+/copy
+
+property name=etomcat value=${tomcat.build}/../etomcat /
+
+mkdir dir=${etomcat} /
+copy file=${jaxp.home}/crimson.jar todir=${etomcat} /
+copy file=${servlet.jar} todir=${etomcat} /
+
+jar jarfile=${etomcat}/webserver.jar
+ basedir=${tomcat.build}/classes
+ manifest=src/build/manifests/manifest.webserver
+ include name=org/apache/**/
+/jar
+ /target
+
!-- Copy the files to distribution format --
target name=dist depends=dist.prepare,javadoc,dist.war
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
billbarker01/12/06 20:42:23
Modified:.build.xml
Log:
Changes to reflect new PureTLS support.
Submitted by: Eric Rescorla [EMAIL PROTECTED]
Revision ChangesPath
1.161 +13 -13jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- build.xml 2001/10/10 18:45:32 1.160
+++ build.xml 2001/12/07 04:42:23 1.161
@@ -65,6 +65,8 @@
classname=javax.net.ssl.SSLServerSocket/
available property=jsse.present
file=${jsse.lib}/jsse.jar/
+available property=puretls.present
+classname=COM.claymoresystems.ptls.SSLContext/
available property=commons-dbcp.present
file=${jakarta-commons}/dbcp/dist/commons-dbcp.jar /
available property=jdk12.present
@@ -86,12 +88,15 @@
target name=msg.jsse if=jsse.present
echo message=Detected JSSE/
/target
+ target name=msg.puretls if=puretls.present
+echo message=Detected PureTLS/
+ /target
target name=msg.commons-dbcp if=commons-dbcp.present
echo message=Detected commons-DBCP/
/target
- target name=init depends=detect,msg.jdk12,msg.jsse,msg.commons-dbcp
+ target name=init
depends=detect,msg.jdk12,msg.jsse,msg.puretls,msg.commons-dbcp
/target
target name=prepare.jaxp101 depends=detect if=jaxp10-present
@@ -210,14 +215,12 @@
pathelement location=${jsse.lib}/jcert.jar/
/classpath
include name=org/apache/tomcat/util/**/
- exclude name=**/util/net/SSLSocketFactory.java
- unless=jsse.present/
- exclude name=**/util/net/SSLSocketFactory.java
- unless=jdk12.present/
- exclude name=**/util/compat/JSSECertCompat.java
- unless=jsse.present/
- exclude name=**/util/compat/JSSECertCompat.java
- unless=jdk12.present/
+ exclude name=**/util/net/JSSE* unless=jsse.present/
+ exclude name=**/util/net/JSSE* unless=jdk12.present/
+ exclude name=**/util/net/PureTLS* unless=puretls.present/
+ exclude name=**/util/net/PureTLS* unless=jdk12.present/
+ exclude name=**/util/compat/JSSECertCompat.java /
+
exclude name=**/util/compat/Jdk12Support.java
unless=jdk12.present/
exclude name=**/util/depend/DependClassLoader12.java
@@ -268,10 +271,7 @@
unless=jdk12.present/
exclude name=**/util/compat/Jdk12Support.java
unless=jdk12.present/
- exclude name=**/util/compat/JSSECertCompat.java
- unless=jsse.present/
- exclude name=**/util/compat/JSSECertCompat.java
- unless=jdk12.present/
+ exclude name=**/util/compat/JSSECertCompat.java /
include name=org/apache/tomcat/util/IntrospectionUtils.java/
/javac
jar jarfile=${tomcat.build}/lib/tomcat.jar
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
marcsaeg01/10/26 06:59:04
Modified:.Tag: tomcat_32 build.xml
Log:
Changes to support building with different JAXP versions and parsers.
Revision ChangesPath
No revision
No revision
1.53.2.8 +7 -6 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.53.2.7
retrieving revision 1.53.2.8
diff -u -r1.53.2.7 -r1.53.2.8
--- build.xml 2001/07/17 14:25:27 1.53.2.7
+++ build.xml 2001/10/26 13:59:03 1.53.2.8
@@ -5,7 +5,8 @@
property name=ant.home value=../jakarta-ant/
property name=debug value=on/
property name=j2ee.home value=../../j2ee/build/unix/
- property name=jaxp value=../jaxp-1.0.1 /
+ property name=jaxp value=../jaxp-1.1/jaxp.jar /
+ property name=parser value=../jaxp-1.1/crimson.jar /
property name=optimize value=true /
property name=servlet.jar value=../jakarta-servletapi/lib/servlet.jar/
property name=tomcat.build value=../build/tomcat/
@@ -54,10 +55,10 @@
file=${ant.home}/lib/ant.jar/
copy tofile=${tomcat.build}/lib/servlet.jar
file=${servlet.jar}/
-copy tofile=${tomcat.build}/lib/jaxp.jar
-file=${jaxp}/jaxp.jar/
-copy tofile=${tomcat.build}/lib/parser.jar
-file=${jaxp}/parser.jar/
+copy todir=${tomcat.build}/lib
+file=${jaxp}/
+copy todir=${tomcat.build}/lib
+file=${parser}/
!-- Copy golden files for the tests webapp --
copy todir=${tomcat.build}/lib/test/Golden
@@ -89,7 +90,7 @@
!-- Compile the standard Tomcat components --
javac srcdir=src/share destdir=${tomcat.build}/classes
- classpath=${servlet.jar};${jaxp}/jaxp.jar
+ classpath=${servlet.jar};${jaxp};${parser}
debug=${debug}
optimize=${optimize}
deprecation=off
cvs commit: jakarta-tomcat build.xml
larryi 01/09/22 19:13:45
Modified:.build.xml
Log:
Eliminate some javadoc warnings from the changes to the
org.apache.tomcat.util.test classes. Update the copyright year for the
javadoc.
Revision ChangesPath
1.157 +11 -8 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- build.xml 2001/09/22 02:21:33 1.156
+++ build.xml 2001/09/23 02:13:45 1.157
@@ -670,6 +670,9 @@
fileset dir=${java.home}
include name=lib/classes.zip/
/fileset
+fileset dir=${ant.home}
+ include name=lib/ant.jar/
+/fileset
/path
target name=javadoc depends=main,webapps,tomcat-jars
@@ -684,7 +687,7 @@
use=true
windowtitle=Tomcat and Jasper Internal API
doctitle=Tomcat and Jasper Internal API
- bottom=Copyright © 2000 Apache Software Foundation. All Rights
Reserved.
+ bottom=Copyright © 2001 Apache Software Foundation. All Rights
Reserved.
/
/target
target name=javadoc.tomcat depends=main,webapps,tomcat-jars
@@ -697,7 +700,7 @@
use=true
windowtitle=Tomcat API
doctitle=Tomcat API
- bottom=Copyright © 2000 Apache Software Foundation. All Rights
Reserved./
+ bottom=Copyright © 2001 Apache Software Foundation. All Rights
Reserved./
/target
target name=javadoc.tomcat.core depends=main,webapps,tomcat-jars
javadoc packagenames=org.apache.tomcat.core
@@ -709,7 +712,7 @@
use=true
windowtitle=Tomcat Core API
doctitle=Tomcat Core API
- bottom=Copyright © 2000 Apache Software Foundation. All Rights
Reserved./
+ bottom=Copyright © 2001 Apache Software Foundation. All Rights
Reserved./
/target
target name=javadoc.tomcat.facade depends=main,webapps,tomcat-jars
javadoc packagenames=org.apache.tomcat.facade
@@ -721,7 +724,7 @@
use=true
windowtitle=Tomcat Facade API
doctitle=Tomcat Facade API
- bottom=Copyright © 2000 Apache Software Foundation. All Rights
Reserved./
+ bottom=Copyright © 2001 Apache Software Foundation. All Rights
Reserved./
/target
target name=javadoc.tomcat.modules depends=main,webapps,tomcat-jars
javadoc packagenames=org.apache.tomcat.modules.*
@@ -733,7 +736,7 @@
use=true
windowtitle=Tomcat Modules API
doctitle=Tomcat Modules API
- bottom=Copyright © 2000 Apache Software Foundation. All Rights
Reserved./
+ bottom=Copyright © 2001 Apache Software Foundation. All Rights
Reserved./
/target
target name=javadoc.tomcat.startup depends=main,webapps,tomcat-jars
javadoc packagenames=org.apache.tomcat.startup
@@ -745,7 +748,7 @@
use=true
windowtitle=Tomcat Startup API
doctitle=Tomcat Startup API
- bottom=Copyright © 2000 Apache Software Foundation. All Rights
Reserved./
+ bottom=Copyright © 2001 Apache Software Foundation. All Rights
Reserved./
/target
target name=javadoc.tomcat.util depends=main,webapps,tomcat-jars
javadoc packagenames=org.apache.tomcat.util.*
@@ -757,7 +760,7 @@
use=true
windowtitle=Tomcat Utilities API
doctitle=Tomcat Utilities API
- bottom=Copyright © 2000 Apache Software Foundation. All Rights
Reserved./
+ bottom=Copyright © 2001 Apache Software Foundation. All Rights
Reserved./
/target
target name=javadoc.jasper depends=main,webapps,tomcat-jars
javadoc packagenames=org.apache.jasper.*
@@ -769,7 +772,7 @@
use=true
windowtitle=Jasper API
doctitle=Jasper API
- bottom=Copyright © 2000 Apache Software Foundation. All Rights
Reserved./
+ bottom=Copyright © 2001 Apache Software Foundation. All Rights
Reserved./
/target
target name=dist.war depends=dist.prepare
cvs commit: jakarta-tomcat build.xml
jfclere 01/09/21 04:03:41
Modified:.build.xml
Log:
Add exclude for tomcat.jar target. (Otherwise does compile with JDK1.1.8).
Revision ChangesPath
1.155 +16 -6 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- build.xml 2001/09/21 08:29:56 1.154
+++ build.xml 2001/09/21 11:03:41 1.155
@@ -254,12 +254,18 @@
pathelement location=${jsse.lib}/jcert.jar/
/classpath
include name=org/apache/tomcat/util/**/
- exclude name=**/util/net/SSLSocketFactory.java unless=jsse.present/
- exclude name=**/util/net/SSLSocketFactory.java unless=jdk12.present/
- exclude name=**/util/compat/JSSECertCompat.java unless=jsse.present/
- exclude name=**/util/compat/JSSECertCompat.java unless=jdk12.present/
- exclude name=**/util/compat/Jdk12Support.java unless=jdk12.present/
- exclude name=**/util/depend/DependClassLoader12.java
unless=jdk12.present/
+ exclude name=**/util/net/SSLSocketFactory.java
+ unless=jsse.present/
+ exclude name=**/util/net/SSLSocketFactory.java
+ unless=jdk12.present/
+ exclude name=**/util/compat/JSSECertCompat.java
+ unless=jsse.present/
+ exclude name=**/util/compat/JSSECertCompat.java
+ unless=jdk12.present/
+ exclude name=**/util/compat/Jdk12Support.java
+ unless=jdk12.present/
+ exclude name=**/util/depend/DependClassLoader12.java
+ unless=jdk12.present/
/javac
copy todir=${tomcat.build}/classes
@@ -305,6 +311,10 @@
unless=jdk12.present/
exclude name=**/util/compat/Jdk12Support.java
unless=jdk12.present/
+ exclude name=**/util/compat/JSSECertCompat.java
+ unless=jsse.present/
+ exclude name=**/util/compat/JSSECertCompat.java
+ unless=jdk12.present/
include name=org/apache/tomcat/util/IntrospectionUtils.java/
/javac
jar jarfile=${tomcat.build}/lib/tomcat.jar
cvs commit: jakarta-tomcat build.xml
larryi 01/09/21 19:21:33
Modified:.build.xml
Log:
Fix admin based tests to be compatible with Ant 1.4.
Since Ant 1.4's TaskAdapter insists on calling setProject(Project), the Ant
classes must be visible to the org.apache.tomcat.util.test classes.
Removed the test classes from tomcat_util.jar and placed them in a
tomcat_util_test.jar in the admin's WEB-INF/lib directory, which is where
ant.jar lives.
Revision ChangesPath
1.156 +5 -0 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- build.xml 2001/09/21 11:03:41 1.155
+++ build.xml 2001/09/22 02:21:33 1.156
@@ -292,6 +292,7 @@
jar jarfile=${tomcat.build}/lib/container/tomcat_util.jar
basedir=${tomcat.build}/classes
include name=org/apache/tomcat/util/**/
+ exclude name=org/apache/tomcat/util/test/**/
/jar
/target
@@ -589,6 +590,10 @@
/copy
copy tofile=${tomcat.build}/webapps/admin/WEB-INF/lib/ant.jar
file=${ant.lib}/ant.jar/
+jar jarfile=${tomcat.build}/webapps/admin/WEB-INF/lib/tomcat_util_test.jar
+ basedir=${tomcat.build}/classes
+ include name=org/apache/tomcat/util/**/
+/jar
javac srcdir=src/admin/WEB-INF/classes
optimize=${optimize}
destdir=${tomcat.build}/webapps/admin/WEB-INF/classes
cvs commit: jakarta-tomcat build.xml
costin 01/08/23 18:09:31
Modified:.build.xml
Log:
JNIEndpoint is a startup program. It should be moved to tomcat.startup, but
to avoid changes in the native code we can leave it where it is.
But it must be included in tomcat.jar, since the startup classpath must be 'clean',
having modules.jar in the parent class loader is trouble.
Revision ChangesPath
1.150 +4 -2 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- build.xml 2001/08/22 03:01:54 1.149
+++ build.xml 2001/08/24 01:09:31 1.150
@@ -288,7 +288,7 @@
!-- Tomcat.jar ( starter ) --
- target name=tomcat.jar depends=init
+ target name=tomcat.jar depends=init,tomcat_modules
javac destdir=${tomcat.build}/classes
debug=${debug}
optimize=${optimize}
@@ -305,6 +305,8 @@
basedir=${tomcat.build}/classes
manifest=src/build/manifests/manifest
include name=org/apache/tomcat/startup/Main.class/
+ include name=org/apache/tomcat/modules/server/JNIEndpoint**/
+ include name=org/apache/tomcat/modules/server/StartupThread**/
include name=org/apache/tomcat/startup/Main$*.class/
include name=org/apache/tomcat/util/depend/**/
include name=org/apache/tomcat/util/compat/**/
@@ -527,7 +529,7 @@
/jar
/target
- target name=tomcat-jars
depends=prepare,tomcat_util,tomcat.jar,stop-tomcat.jar,tomcat_core,jasper,tomcat_modules,facade22,tomcat-startup
+ target name=tomcat-jars
depends=prepare,tomcat_util,stop-tomcat.jar,tomcat_core,jasper,tomcat_modules,tomcat.jar,facade22,tomcat-startup
/target
target name=tomcat-jars-new depends=tomcat-jars
cvs commit: jakarta-tomcat build.xml
costin 01/08/21 20:01:54
Modified:.build.xml
Log:
Fix the 1.1 compat. Exclude the 1.2 code.
Revision ChangesPath
1.149 +1 -0 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- build.xml 2001/08/21 05:41:35 1.148
+++ build.xml 2001/08/22 03:01:54 1.149
@@ -256,6 +256,7 @@
include name=org/apache/tomcat/util/**/
exclude name=**/util/net/SSLSocketFactory.java unless=jsse.present/
exclude name=**/util/compat/Jdk12Support.java unless=jdk12.present/
+ exclude name=**/util/depend/DependClassLoader12.java
unless=jdk12.present/
/javac
copy todir=${tomcat.build}/classes
cvs commit: jakarta-tomcat build.xml
costin 01/08/20 22:41:35
Modified:.build.xml
Log:
Etomcat.jar goes to common ( that EmbededTomcat )
Revision ChangesPath
1.148 +1 -1 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- build.xml 2001/08/03 02:30:50 1.147
+++ build.xml 2001/08/21 05:41:35 1.148
@@ -387,7 +387,7 @@
include name=org/apache/tomcat/startup/**/
/jar
-jar jarfile=${tomcat.build}/lib/etomcat.jar
+jar jarfile=${tomcat.build}/lib/common/etomcat.jar
basedir=${tomcat.build}/classes
manifest=src/build/manifests/manifest.embedded
include name=org/apache/tomcat/startup/**/
cvs commit: jakarta-tomcat build.xml
costin 01/08/02 19:30:50
Modified:.build.xml
Log:
Changed from internal to modules ( this isn't used in 3.3, the dir is intended for
addon modules )
Revision ChangesPath
1.147 +1 -1 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- build.xml 2001/07/19 17:30:36 1.146
+++ build.xml 2001/08/03 02:30:50 1.147
@@ -158,7 +158,7 @@
mkdir dir=${tomcat.build}/bin/
mkdir dir=${tomcat.build}/doc/
mkdir dir=${tomcat.build}/webapps/
-mkdir dir=${tomcat.build}/internal/
+mkdir dir=${tomcat.build}/modules/
mkdir dir=${tomcat.build}/native/
copy todir=${tomcat.build}/bin
cvs commit: jakarta-tomcat build.xml
larryi 01/07/19 10:30:36
Modified:.build.xml
Log:
Update javadoc build to not require jakarta-tomcat-connectors to be present.
Plus a little clean up.
Revision ChangesPath
1.146 +9 -11 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- build.xml 2001/07/19 06:18:48 1.145
+++ build.xml 2001/07/19 17:30:36 1.146
@@ -45,8 +45,6 @@
!-- External packages we depend on --
!-- Tomcat depends on:
- Ant ( latest 1.3 binary install in jakarta-ant, peer to jakarta-tomcat )
- - jakarta-tomcat-connectors ( latest src, peer to jakarta-tomcat )
- - jakarta-tomcat-jasper ( latest src, peer to jakarta-tomcat )
- jakarta-commons (optional, latest src, peer to jakarta-tomcat )
- Jaxp ( optional, the jar files from ant can be used instead )
- Jsse ( optional )
@@ -242,7 +240,7 @@
/target
!-- Tomcat util --
- !-- Independent ( stand alone ) utilities --
+ !-- Local Tomcat utilities --
target name=tomcat_util depends=init
javac destdir=${tomcat.build}/classes
@@ -659,7 +657,7 @@
!-- Add Tomcat internal javadoc --
mkdir dir=${tomcat.build}/webapps/ROOT/javadoc/
javadoc packagenames=org.apache.*
-
sourcepath=src/share;src/facade22;${jakarta-tomcat-connectors}/util/java
+ sourcepath=src/share;src/facade22
classpathref=javadoc.classpath
destdir=${tomcat.build}/webapps/ROOT/javadoc
author=true
@@ -672,7 +670,7 @@
/target
target name=javadoc.tomcat depends=main,webapps,tomcat-jars
javadoc packagenames=org.apache.tomcat.*
-
sourcepath=src/share;src/facade22;${jakarta-tomcat-connectors}/util/java
+ sourcepath=src/share;src/facade22
classpathref=javadoc.classpath
destdir=${tomcat.build}/webapps/ROOT/javadoc
author=true
@@ -684,7 +682,7 @@
/target
target name=javadoc.tomcat.core depends=main,webapps,tomcat-jars
javadoc packagenames=org.apache.tomcat.core
-
sourcepath=src/share;src/facade22;${jakarta-tomcat-connectors}/util/java
+ sourcepath=src/share;src/facade22
classpathref=javadoc.classpath
destdir=${tomcat.build}/webapps/ROOT/javadoc
author=true
@@ -696,7 +694,7 @@
/target
target name=javadoc.tomcat.facade depends=main,webapps,tomcat-jars
javadoc packagenames=org.apache.tomcat.facade
-
sourcepath=src/share;src/facade22;${jakarta-tomcat-connectors}/util/java
+ sourcepath=src/share;src/facade22
classpathref=javadoc.classpath
destdir=${tomcat.build}/webapps/ROOT/javadoc
author=true
@@ -708,7 +706,7 @@
/target
target name=javadoc.tomcat.modules depends=main,webapps,tomcat-jars
javadoc packagenames=org.apache.tomcat.modules.*
-
sourcepath=src/share;src/facade22;${jakarta-tomcat-connectors}/util/java
+ sourcepath=src/share;src/facade22
classpathref=javadoc.classpath
destdir=${tomcat.build}/webapps/ROOT/javadoc
author=true
@@ -720,7 +718,7 @@
/target
target name=javadoc.tomcat.startup depends=main,webapps,tomcat-jars
javadoc packagenames=org.apache.tomcat.startup
-
sourcepath=src/share;src/facade22;${jakarta-tomcat-connectors}/util/java
+ sourcepath=src/share;src/facade22
classpathref=javadoc.classpath
destdir=${tomcat.build}/webapps/ROOT/javadoc
author=true
@@ -732,7 +730,7 @@
/target
target name=javadoc.tomcat.util depends=main,webapps,tomcat-jars
javadoc packagenames=org.apache.tomcat.util.*
-
sourcepath=src/share;src/facade22;${jakarta-tomcat-connectors}/util/java
+ sourcepath=src/share;src/facade22
classpathref=javadoc.classpath
destdir=${tomcat.build}/webapps/ROOT/javadoc
author=true
@@ -744,7 +742,7 @@
/target
target name=javadoc.jasper depends=main,webapps,tomcat-jars
javadoc packagenames=org.apache.jasper.*
-
sourcepath=src/share;src/facade22;${jakarta-tomcat-connectors}/util/java
+ sourcepath=src/share;src/facade22
classpathref=javadoc.classpath
destdir=${tomcat.build}/webapps/ROOT/javadoc
author=true
cvs commit: jakarta-tomcat build.xml
marcsaeg01/07/17 07:25:30
Modified:.Tag: tomcat_32 build.xml
Log:
Now include RELEASE-NOTES and KEYS in the binary distribution.
Revision ChangesPath
No revision
No revision
1.53.2.7 +2 -0 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.53.2.6
retrieving revision 1.53.2.7
diff -u -r1.53.2.6 -r1.53.2.7
--- build.xml 2001/02/16 15:14:08 1.53.2.6
+++ build.xml 2001/07/17 14:25:27 1.53.2.7
@@ -46,6 +46,8 @@
fileset dir=src/doc/
/copy
copy tofile=${tomcat.build}/LICENSE file=LICENSE/
+copy tofile=${tomcat.build}/RELEASE-NOTES file=RELEASE-NOTES/
+copy tofile=${tomcat.build}/KEYS file=KEYS/
!-- Copy library JAR files --
copy tofile=${tomcat.build}/lib/ant.jar
cvs commit: jakarta-tomcat build.xml
costin 01/07/16 10:54:30
Modified:.build.xml
Log:
Comment out jsse section, it would brake the compile if jsse is not present.
Revision ChangesPath
1.143 +0 -4 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- build.xml 2001/07/15 23:53:10 1.142
+++ build.xml 2001/07/16 17:54:29 1.143
@@ -56,7 +56,6 @@
property name=ant.home value=${install.dir}/jakarta-ant/
property name=jsse.home value=${install.dir}/jsse1.0.2/
property name=jaxp.home location=bin /
- property name=crimson.home value=${install.dir}/jaxp-1.1/
property name=ant.bin value=${ant.home}/bin/
property name=ant.lib value=${ant.home}/lib/
property name=jsse.lib value=${jsse.home}/lib/
@@ -635,9 +634,6 @@
/fileset
fileset dir=${java.home}
include name=lib/classes.zip/
-/fileset
-fileset dir=${jsse.lib}
- include name=*.jar if=jdk12.present/
/fileset
/path
cvs commit: jakarta-tomcat build.xml
costin 01/07/16 19:28:03
Modified:.build.xml
Log:
Watchdog.dist ( from watchdog-web-based ) is now separated, it creates
problems when building tests with some ants.
Since watchdog didn't changed we can just use the current war and stop
building it every time - but that's for the next build cleanup ( if ever )
Revision ChangesPath
1.144 +3 -0 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- build.xml 2001/07/16 17:54:29 1.143
+++ build.xml 2001/07/17 02:28:01 1.144
@@ -591,6 +591,9 @@
jar jarfile=${tomcat.dist}/webapps/test.war
basedir=${tomcat.build}/webapps/test
includes=**/
+ /target
+
+ target name=watchdog.dist depends=tests
jar jarfile=${tomcat.dist}/webapps/jsp-tests.war
basedir=${tomcat.build}/webapps/jsp-tests
includes=**/
cvs commit: jakarta-tomcat build.xml
costin 01/07/15 16:53:11
Modified:.build.xml
Log:
Updated the jaxp to 1.1 ( I checked in the binaries, like all other project
do - I'm not sure the commit mail went through ).
- add the internal/ dir for easier configuration of trusted apps and modules
- remove jasper34 from the default build - since we are close to beta, as
previously discussed. jasper34 will be usable as an add-on module, when
ready.
Revision ChangesPath
1.142 +4 -7 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- build.xml 2001/07/13 02:42:06 1.141
+++ build.xml 2001/07/15 23:53:10 1.142
@@ -55,7 +55,8 @@
!-- set by default if ant command is used --
property name=ant.home value=${install.dir}/jakarta-ant/
property name=jsse.home value=${install.dir}/jsse1.0.2/
- property name=jaxp.home value=${install.dir}/jaxp1.0.1/
+ property name=jaxp.home location=bin /
+ property name=crimson.home value=${install.dir}/jaxp-1.1/
property name=ant.bin value=${ant.home}/bin/
property name=ant.lib value=${ant.home}/lib/
property name=jsse.lib value=${jsse.home}/lib/
@@ -160,6 +161,7 @@
mkdir dir=${tomcat.build}/bin/
mkdir dir=${tomcat.build}/doc/
mkdir dir=${tomcat.build}/webapps/
+mkdir dir=${tomcat.build}/internal/
mkdir dir=${tomcat.build}/native/
copy todir=${tomcat.build}/bin
@@ -512,12 +514,7 @@
/jar
/target
- target name=jasper34 if=jakarta-tomcat-jasper-present
-ant antfile=${jakarta-tomcat-jasper}/jasper34/build.xml
- target=install/
- /target
-
- target name=tomcat-jars
depends=prepare,connector_util,tomcat_util,tomcat.jar,stop-tomcat.jar,tomcat_core,jasper,tomcat_modules,connector,facade22,tomcat-startup,jasper34
+ target name=tomcat-jars
depends=prepare,connector_util,tomcat_util,tomcat.jar,stop-tomcat.jar,tomcat_core,jasper,tomcat_modules,connector,facade22,tomcat-startup
/target
target name=tomcat-jars-new depends=tomcat-jars
cvs commit: jakarta-tomcat build.xml
larryi 01/07/12 19:42:10
Modified:.build.xml
Log:
I believe a classloader bug made building tomcat_test_util.jar necessary.
Removing since the bug has been fixed and tomcat_test_util.jar is no
longer needed.
Revision ChangesPath
1.141 +0 -11 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- build.xml 2001/07/10 13:03:34 1.140
+++ build.xml 2001/07/13 02:42:06 1.141
@@ -571,17 +571,6 @@
destdir=${tomcat.build}/webapps/admin/WEB-INF/classes
classpath=${tomcat.build}/classes;${servlet22.jar}/
-!-- build local jar containing org.apache.tomcat.util.test classes --
-javac srcdir=src/share/org/apache/tomcat/util/test
- optimize=${optimize}
- destdir=${tomcat.build}/webapps/admin/WEB-INF/classes
- classpath=${tomcat.build}/classes/
-jar jarfile=${tomcat.build}/webapps/admin/WEB-INF/lib/tomcat_test_util.jar
- basedir=${tomcat.build}/webapps/admin/WEB-INF/classes
- include name=org/apache/tomcat/util/test/**/
-/jar
-!-- delete dir=${tomcat.build}/webapps/admin/WEB-INF/classes/org / --
-
/target
!-- Build the internal test app === --
cvs commit: jakarta-tomcat build.xml
larryi 01/07/10 06:03:40
Modified:.build.xml
Log:
Update javadoc tasks to avoid most of the error messages
Revision ChangesPath
1.140 +35 -8 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- build.xml 2001/07/02 19:40:54 1.139
+++ build.xml 2001/07/10 13:03:34 1.140
@@ -636,11 +636,31 @@
chmod perm=+x file=${tomcat.dist}/bin/shutdown.sh/
/target
+ path id=javadoc.classpath
+pathelement location=${servlet22.jar}/
+fileset dir=${jaxp.home}
+ include name=jaxp.jar/
+ include name=parser.jar/
+ include name=crimson.jar/
+ include name=xerces.jar/
+/fileset
+fileset dir=${java.home}/..
+ include name=lib/tools.jar/
+/fileset
+fileset dir=${java.home}
+ include name=lib/classes.zip/
+/fileset
+fileset dir=${jsse.lib}
+ include name=*.jar if=jdk12.present/
+/fileset
+ /path
+
target name=javadoc depends=main,webapps,tomcat-jars
!-- Add Tomcat internal javadoc --
mkdir dir=${tomcat.build}/webapps/ROOT/javadoc/
javadoc packagenames=org.apache.*
- sourcepath=src/share;src/facade22
+
sourcepath=src/share;src/facade22;${jakarta-tomcat-connectors}/util/java
+ classpathref=javadoc.classpath
destdir=${tomcat.build}/webapps/ROOT/javadoc
author=true
version=true
@@ -652,7 +672,8 @@
/target
target name=javadoc.tomcat depends=main,webapps,tomcat-jars
javadoc packagenames=org.apache.tomcat.*
- sourcepath=src/share;src/facade22
+
sourcepath=src/share;src/facade22;${jakarta-tomcat-connectors}/util/java
+ classpathref=javadoc.classpath
destdir=${tomcat.build}/webapps/ROOT/javadoc
author=true
version=true
@@ -663,7 +684,8 @@
/target
target name=javadoc.tomcat.core depends=main,webapps,tomcat-jars
javadoc packagenames=org.apache.tomcat.core
- sourcepath=src/share;src/facade22
+
sourcepath=src/share;src/facade22;${jakarta-tomcat-connectors}/util/java
+ classpathref=javadoc.classpath
destdir=${tomcat.build}/webapps/ROOT/javadoc
author=true
version=true
@@ -674,7 +696,8 @@
/target
target name=javadoc.tomcat.facade depends=main,webapps,tomcat-jars
javadoc packagenames=org.apache.tomcat.facade
- sourcepath=src/share;src/facade22
+
sourcepath=src/share;src/facade22;${jakarta-tomcat-connectors}/util/java
+ classpathref=javadoc.classpath
destdir=${tomcat.build}/webapps/ROOT/javadoc
author=true
version=true
@@ -685,7 +708,8 @@
/target
target name=javadoc.tomcat.modules depends=main,webapps,tomcat-jars
javadoc packagenames=org.apache.tomcat.modules.*
- sourcepath=src/share;src/facade22
+
sourcepath=src/share;src/facade22;${jakarta-tomcat-connectors}/util/java
+ classpathref=javadoc.classpath
destdir=${tomcat.build}/webapps/ROOT/javadoc
author=true
version=true
@@ -696,7 +720,8 @@
/target
target name=javadoc.tomcat.startup depends=main,webapps,tomcat-jars
javadoc packagenames=org.apache.tomcat.startup
- sourcepath=src/share;src/facade22
+
sourcepath=src/share;src/facade22;${jakarta-tomcat-connectors}/util/java
+ classpathref=javadoc.classpath
destdir=${tomcat.build}/webapps/ROOT/javadoc
author=true
version=true
@@ -707,7 +732,8 @@
/target
target name=javadoc.tomcat.util depends=main,webapps,tomcat-jars
javadoc packagenames=org.apache.tomcat.util.*
- sourcepath=src/share;src/facade22
+
sourcepath=src/share;src/facade22;${jakarta-tomcat-connectors}/util/java
+ classpathref=javadoc.classpath
destdir=${tomcat.build}/webapps/ROOT/javadoc
author=true
version=true
@@ -718,7 +744,8 @@
/target
target name=javadoc.jasper depends=main,webapps,tomcat-jars
javadoc packagenames=org.apache.jasper.*
- sourcepath=src/share;src/facade22
+
sourcepath=src/share;src/facade22;${jakarta-tomcat-connectors}/util/java
+ classpathref=javadoc.classpath
destdir=${tomcat.build}/webapps/ROOT/javadoc
author=true
version=true
cvs commit: jakarta-tomcat build.xml
costin 01/06/26 12:40:11
Modified:.build.xml
Log:
Fixed ( once again - I hope for the last time ) the jaxp file copying.
Since people have different preferences we'll detect the version instead of
asking the user - this should work for most common cases ( including
xerces - but I haven't tested ). ( ant started to fail if a file to be
copied is not found - which is a good behavior )
Revision ChangesPath
1.138 +38 -10jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- build.xml 2001/06/24 21:53:17 1.137
+++ build.xml 2001/06/26 19:40:08 1.138
@@ -81,6 +81,12 @@
file=${jakarta-tomcat-connectors}/
available property=jakarta-tomcat-jasper-present
file=${jakarta-tomcat-jasper} /
+available property=jaxp10-present
+ file=${jaxp.home}/parser.jar /
+available property=jaxp11-present
+ file=${jaxp.home}/crimson.jar /
+available property=xerces-present
+ file=${jaxp.home}/xerces.jar /
/target
target name=msg.jdk12 if=jdk12.present
@@ -106,10 +112,40 @@
target name=init
depends=detect,msg.jdk12,msg.jsse,msg.jtc,msg.jtj,msg.commons-dbcp
/target
+ target name=prepare.jaxp101 depends=detect if=jaxp10-present
+echo message=Installing JAXP-1.0/
+copy tofile=${tomcat.build}/lib/container/jaxp.jar
+ file=${jaxp.home}/jaxp.jar/
+copy tofile=${tomcat.build}/lib/container/parser.jar
+ file=${jaxp.home}/parser.jar/
+ /target
+
+ target name=prepare.jaxp11 depends=detect if=jaxp11-present
+echo message=Installing JAXP-1.1/
+copy tofile=${tomcat.build}/lib/container/jaxp.jar
+ file=${jaxp.home}/jaxp.jar/
+copy tofile=${tomcat.build}/lib/container/xalan.jar
+ file=${jaxp.home}/xalan.jar/
+copy tofile=${tomcat.build}/lib/container/crimson.jar
+ file=${jaxp.home}/crimson.jar/
+ /target
+
+ target name=prepare.xerces depends=detect if=xerces-present
+echo message=Installing XERCES/
+copy tofile=${tomcat.build}/lib/container/xerces.jar
+ file=${jaxp.home}/xerces.jar/
+copy tofile=${tomcat.build}/lib/container/jaxp.jar
+ file=${jaxp.home}/jaxp.jar/
+ /target
+
+ target name=prepare.jaxp
depends=prepare.jaxp101,prepare.jaxp11,prepare.xerces /
+
!-- Copy static files --
- !-- IF YOU CHANGE, sync dist.prepare !!! --
- target name=prepare depends=init
+ target name=prepare depends=init,prepare.dirs,prepare.jaxp
+ description=Create the directory structure for build and copy binaries /
+
+ target name=prepare.dirs depends=init
mkdir dir=src/doc/ !-- Temp change until dir is not empty --
mkdir dir=${tomcat.build}/
mkdir dir=${tomcat.build}/conf/
@@ -147,14 +183,6 @@
/copy
--
-copy tofile=${tomcat.build}/lib/container/jaxp.jar
- file=${jaxp.home}/jaxp.jar/
-copy tofile=${tomcat.build}/lib/container/parser.jar
- file=${jaxp.home}/parser.jar/
-copy tofile=${tomcat.build}/lib/container/jaxp.jar
- file=${jaxp.home}/jaxp.jar/
-copy tofile=${tomcat.build}/lib/container/crimson.jar
- file=${jaxp.home}/crimson.jar/
copy file =src/build/readme/readme.container
tofile=${tomcat.build}/lib/container/README /
cvs commit: jakarta-tomcat build.xml
costin 01/06/24 14:53:17
Modified:.build.xml
Log:
Use the new build.xml in j-t-c
Revision ChangesPath
1.137 +8 -17 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- build.xml 2001/06/22 05:26:56 1.136
+++ build.xml 2001/06/24 21:53:17 1.137
@@ -433,21 +433,9 @@
/target
target name=connector depends=init
-javac destdir=${tomcat.build}/classes
- debug=${debug}
- optimize=${optimize}
- deprecation=off
- srcdir=${jakarta-tomcat-connectors}/jk/java
- classpath
- /classpath
- include name=org/apache/ajp/tomcat33/**/
-/javac
-
-jar jarfile=${tomcat.build}/lib/container/jk_connector.jar
- basedir=${tomcat.build}/classes
- include name=org/apache/ajp/tomcat33/**/
-/jar
-
+ant antfile=${jakarta-tomcat-connectors}/jk/build.xml
+ target=build-tomcat33
+ dir=${jakarta-tomcat-connectors}/jk /
/target
@@ -500,7 +488,7 @@
target=install/
/target
- target name=tomcat-jars
depends=prepare,connector_util,tomcat_util,tomcat.jar,stop-tomcat.jar,tomcat_core,jasper,connector,tomcat_modules,facade22,tomcat-startup,jasper34
+ target name=tomcat-jars
depends=prepare,connector_util,tomcat_util,tomcat.jar,stop-tomcat.jar,tomcat_core,jasper,tomcat_modules,connector,facade22,tomcat-startup,jasper34
/target
target name=tomcat-jars-new depends=tomcat-jars
@@ -753,12 +741,15 @@
/target
target name=clean-classes depends=init
-delete dir=${tomcat.build}/classes/org/
+delete dir=${tomcat.build}/classes/
+delete dir=${tomcat.build}/lib/
+delete dir=${jakarta-tomcat-jasper}/build /
/target
target name=clean depends=init
delete dir=${tomcat.build}/
delete dir=${tomcat.dist}/
+delete dir=${jakarta-tomcat-jasper}/build /
/target
target name=all depends=clean,dist/
cvs commit: jakarta-tomcat build.xml
larryi 01/06/21 22:26:58
Modified:.build.xml
Log:
Include KEYS file in build
Revision ChangesPath
1.136 +1 -0 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- build.xml 2001/06/19 00:34:37 1.135
+++ build.xml 2001/06/22 05:26:56 1.136
@@ -138,6 +138,7 @@
fileset dir=src/native/
/copy
copy tofile=${tomcat.build}/LICENSE file=LICENSE/
+copy tofile=${tomcat.build}/KEYS file=KEYS/
!-- include ant, it is used for testing and will be used for
configuration and few other tasks
RE: cvs commit: jakarta-tomcat build.xml
doh, thanks Mike..
Saludos ,
Ignacio J. Ortega
-Mensaje original-
De: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
Enviado el: martes 19 de junio de 2001 2:35
Para: [EMAIL PROTECTED]
Asunto: cvs commit: jakarta-tomcat build.xml
mmanders01/06/18 17:34:38
Modified:.build.xml
Log:
Updated conditionals for commons-dbcp. This will now build
properly even if jakarta-commons isn't available.
Revision ChangesPath
1.135 +29 -30jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- build.xml 2001/06/17 18:59:39 1.134
+++ build.xml 2001/06/19 00:34:37 1.135
@@ -38,10 +38,16 @@
property name=jakarta-tomcat-jasper
location=${ws}/jakarta-tomcat-jasper /
+
+ property name=jakarta-commons
+location=${ws}/jakarta-commons /
!-- External packages we depend on --
!-- Tomcat depends on:
- - Ant ( latest binary install in jakarta-ant-1.3 )
+ - Ant ( latest 1.3 binary install in jakarta-ant,
peer to jakarta-tomcat )
+ - jakarta-tomcat-connectors ( latest src, peer to
jakarta-tomcat )
+ - jakarta-tomcat-jasper ( latest src, peer to
jakarta-tomcat )
+ - jakarta-commons (optional, latest src, peer to
jakarta-tomcat )
- Jaxp ( optional, the jar files from ant can be
used instead )
- Jsse ( optional )
--
@@ -54,18 +60,6 @@
property name=ant.lib value=${ant.home}/lib/
property name=jsse.lib value=${jsse.home}/lib/
- path id=commons-dbcp
-fileset dir=../jakarta-commons/dbcp
-include name=**/build/*.jar/
-/fileset
-fileset dir=../jakarta-commons/pool
-include name=**/build/*.jar/
-/fileset
-fileset dir=../jakarta-commons/collections
-include name=**/build/*.jar/
-/fileset
- /path
-
!-- Binaries checked in ( servlet.jar is not likely to change,
the 2.2 spec is final --
property name=servlet22.jar value=bin/servlet22.jar/
@@ -80,8 +74,7 @@
available property=jsse.present
file=${jsse.lib}/jsse.jar/
available property=commons-dbcp.present
-
classname=org.apache.commons.dbcp.DriverManagerConnectionFactory
- classpathref=commons-dbcp/
+
file=${jakarta-commons}/dbcp/dist/commons-dbcp.jar /
available property=jdk12.present
classname=java.security.PrivilegedAction/
available property=jakarta-tomcat-connectors-present
@@ -109,6 +102,7 @@
target name=msg.jtj unless=jakarta-tomcat-jasper-present
fail message=Can't find jakarta-tomcat-jasper
repository, you must check it out before building tomcat /
/target
+
target name=init
depends=detect,msg.jdk12,msg.jsse,msg.jtc,msg.jtj,msg.commons-dbcp
/target
@@ -380,23 +374,26 @@
/target
- target name=commons-prepare if=commons-dbcp.present
-!--
+ target name=commons-prepare depends=prepare
if=commons-dbcp.present
+ !-- Because of way the build.xml files are set up, we
can't call them from
+ inside this file. They need to be run before this
script is executed
+ if you want the PooledJDBCRealm code to be built.
ant
antfile=../jakarta-commons/collections/build.xml target=dist/
ant antfile=../jakarta-commons/pool/build.xml
target=dist/
ant antfile=../jakarta-commons/dbcp/build.xml
target=dist/
---
-copy todir=${tomcat.build}/lib/container flatten=yes
-fileset dir=../jakarta-commons/dbcp
-include name=**/build/*.jar/
-/fileset
-fileset dir=../jakarta-commons/pool
-include name=**/build/*.jar/
-/fileset
-fileset dir=../jakarta-commons/collections
-include name=**/build/*.jar/
-/fileset
-/copy
+--
+echo message=copying commons jars/
+copy todir=${tomcat.build}/lib/container flatten=yes
+fileset dir=../jakarta-commons/dbcp
+include name=**/dist/*.jar/
+/fileset
+fileset dir=../jakarta-commons/pool
+include name=**/dist/*.jar/
+/fileset
+fileset dir=../jakarta-commons/collections
+include name=**/dist/*.jar/
+/fileset
+/copy
/target
!-- Standard interceptors
== --
@@ -410,8 +407,10 @@
pathelement
location=${tomcat.build}/lib/common/connector_util.jar/
pathelement
location
RE: cvs commit: jakarta-tomcat build.xml
No problem. Big fat hairy lie Of course I would never make
a mistake like that /Big fat hairy lie unless of course I
actually try to modify the code :-)
Mike Anderson
[EMAIL PROTECTED] 06/19/01 01:23AM
doh, thanks Mike..
Saludos ,
Ignacio J. Ortega
-Mensaje original-
De: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
Enviado el: martes 19 de junio de 2001 2:35
Para: [EMAIL PROTECTED]
Asunto: cvs commit: jakarta-tomcat build.xml
mmanders01/06/18 17:34:38
Modified:.build.xml
Log:
Updated conditionals for commons-dbcp. This will now build
properly even if jakarta-commons isn't available.
Revision ChangesPath
1.135 +29 -30jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- build.xml 2001/06/17 18:59:39 1.134
+++ build.xml 2001/06/19 00:34:37 1.135
@@ -38,10 +38,16 @@
property name=jakarta-tomcat-jasper
location=${ws}/jakarta-tomcat-jasper /
+
+ property name=jakarta-commons
+location=${ws}/jakarta-commons /
!-- External packages we depend on --
!-- Tomcat depends on:
- - Ant ( latest binary install in jakarta-ant-1.3 )
+ - Ant ( latest 1.3 binary install in jakarta-ant,
peer to jakarta-tomcat )
+ - jakarta-tomcat-connectors ( latest src, peer to
jakarta-tomcat )
+ - jakarta-tomcat-jasper ( latest src, peer to
jakarta-tomcat )
+ - jakarta-commons (optional, latest src, peer to
jakarta-tomcat )
- Jaxp ( optional, the jar files from ant can be
used instead )
- Jsse ( optional )
--
@@ -54,18 +60,6 @@
property name=ant.lib value=${ant.home}/lib/
property name=jsse.lib value=${jsse.home}/lib/
- path id=commons-dbcp
-fileset dir=../jakarta-commons/dbcp
-include name=**/build/*.jar/
-/fileset
-fileset dir=../jakarta-commons/pool
-include name=**/build/*.jar/
-/fileset
-fileset dir=../jakarta-commons/collections
-include name=**/build/*.jar/
-/fileset
- /path
-
!-- Binaries checked in ( servlet.jar is not likely to change,
the 2.2 spec is final --
property name=servlet22.jar value=bin/servlet22.jar/
@@ -80,8 +74,7 @@
available property=jsse.present
file=${jsse.lib}/jsse.jar/
available property=commons-dbcp.present
-
classname=org.apache.commons.dbcp.DriverManagerConnectionFactory
- classpathref=commons-dbcp/
+
file=${jakarta-commons}/dbcp/dist/commons-dbcp.jar /
available property=jdk12.present
classname=java.security.PrivilegedAction/
available property=jakarta-tomcat-connectors-present
@@ -109,6 +102,7 @@
target name=msg.jtj unless=jakarta-tomcat-jasper-present
fail message=Can't find jakarta-tomcat-jasper
repository, you must check it out before building tomcat /
/target
+
target name=init
depends=detect,msg.jdk12,msg.jsse,msg.jtc,msg.jtj,msg.commons-dbcp
/target
@@ -380,23 +374,26 @@
/target
- target name=commons-prepare if=commons-dbcp.present
-!--
+ target name=commons-prepare depends=prepare
if=commons-dbcp.present
+ !-- Because of way the build.xml files are set up, we
can't call them from
+ inside this file. They need to be run before this
script is executed
+ if you want the PooledJDBCRealm code to be built.
ant
antfile=../jakarta-commons/collections/build.xml target=dist/
ant antfile=../jakarta-commons/pool/build.xml
target=dist/
ant antfile=../jakarta-commons/dbcp/build.xml
target=dist/
---
-copy todir=${tomcat.build}/lib/container flatten=yes
-fileset dir=../jakarta-commons/dbcp
-include name=**/build/*.jar/
-/fileset
-fileset dir=../jakarta-commons/pool
-include name=**/build/*.jar/
-/fileset
-fileset dir=../jakarta-commons/collections
-include name=**/build/*.jar/
-/fileset
-/copy
+--
+echo message=copying commons jars/
+copy todir=${tomcat.build}/lib/container flatten=yes
+fileset dir=../jakarta-commons/dbcp
+include name=**/dist/*.jar/
+/fileset
+fileset dir=../jakarta-commons/pool
+include name=**/dist/*.jar/
+/fileset
+fileset dir=../jakarta-commons/collections
+include name=**/dist/*.jar/
+/fileset
+/copy
/target
cvs commit: jakarta-tomcat build.xml
mmanders01/06/18 17:34:38
Modified:.build.xml
Log:
Updated conditionals for commons-dbcp. This will now build properly even if
jakarta-commons isn't available.
Revision ChangesPath
1.135 +29 -30jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- build.xml 2001/06/17 18:59:39 1.134
+++ build.xml 2001/06/19 00:34:37 1.135
@@ -38,10 +38,16 @@
property name=jakarta-tomcat-jasper
location=${ws}/jakarta-tomcat-jasper /
+
+ property name=jakarta-commons
+location=${ws}/jakarta-commons /
!-- External packages we depend on --
!-- Tomcat depends on:
- - Ant ( latest binary install in jakarta-ant-1.3 )
+ - Ant ( latest 1.3 binary install in jakarta-ant, peer to jakarta-tomcat )
+ - jakarta-tomcat-connectors ( latest src, peer to jakarta-tomcat )
+ - jakarta-tomcat-jasper ( latest src, peer to jakarta-tomcat )
+ - jakarta-commons (optional, latest src, peer to jakarta-tomcat )
- Jaxp ( optional, the jar files from ant can be used instead )
- Jsse ( optional )
--
@@ -54,18 +60,6 @@
property name=ant.lib value=${ant.home}/lib/
property name=jsse.lib value=${jsse.home}/lib/
- path id=commons-dbcp
-fileset dir=../jakarta-commons/dbcp
-include name=**/build/*.jar/
-/fileset
-fileset dir=../jakarta-commons/pool
-include name=**/build/*.jar/
-/fileset
-fileset dir=../jakarta-commons/collections
-include name=**/build/*.jar/
-/fileset
- /path
-
!-- Binaries checked in ( servlet.jar is not likely to change,
the 2.2 spec is final --
property name=servlet22.jar value=bin/servlet22.jar/
@@ -80,8 +74,7 @@
available property=jsse.present
file=${jsse.lib}/jsse.jar/
available property=commons-dbcp.present
- classname=org.apache.commons.dbcp.DriverManagerConnectionFactory
- classpathref=commons-dbcp/
+ file=${jakarta-commons}/dbcp/dist/commons-dbcp.jar /
available property=jdk12.present
classname=java.security.PrivilegedAction/
available property=jakarta-tomcat-connectors-present
@@ -109,6 +102,7 @@
target name=msg.jtj unless=jakarta-tomcat-jasper-present
fail message=Can't find jakarta-tomcat-jasper repository, you must check it
out before building tomcat /
/target
+
target name=init
depends=detect,msg.jdk12,msg.jsse,msg.jtc,msg.jtj,msg.commons-dbcp
/target
@@ -380,23 +374,26 @@
/target
- target name=commons-prepare if=commons-dbcp.present
-!--
+ target name=commons-prepare depends=prepare if=commons-dbcp.present
+ !-- Because of way the build.xml files are set up, we can't call them from
+ inside this file. They need to be run before this script is executed
+ if you want the PooledJDBCRealm code to be built.
ant antfile=../jakarta-commons/collections/build.xml target=dist/
ant antfile=../jakarta-commons/pool/build.xml target=dist/
ant antfile=../jakarta-commons/dbcp/build.xml target=dist/
---
-copy todir=${tomcat.build}/lib/container flatten=yes
-fileset dir=../jakarta-commons/dbcp
-include name=**/build/*.jar/
-/fileset
-fileset dir=../jakarta-commons/pool
-include name=**/build/*.jar/
-/fileset
-fileset dir=../jakarta-commons/collections
-include name=**/build/*.jar/
-/fileset
-/copy
+--
+echo message=copying commons jars/
+copy todir=${tomcat.build}/lib/container flatten=yes
+fileset dir=../jakarta-commons/dbcp
+include name=**/dist/*.jar/
+/fileset
+fileset dir=../jakarta-commons/pool
+include name=**/dist/*.jar/
+/fileset
+fileset dir=../jakarta-commons/collections
+include name=**/dist/*.jar/
+/fileset
+/copy
/target
!-- Standard interceptors == --
@@ -410,8 +407,10 @@
pathelement location=${tomcat.build}/lib/common/connector_util.jar/
pathelement location=${tomcat.build}/lib/container/tomcat_util.jar/
pathelement location=${tomcat.build}/lib/common/tomcat_core.jar/
+fileset dir=${tomcat.build}/lib/container
+include name=*.jar/
+/fileset
/classpath
- classpath refid=commons-dbcp/
include name=org/apache/tomcat/modules/**/
exclude
cvs commit: jakarta-tomcat build.xml
costin 01/06/08 17:25:06
Modified:.build.xml
Log:
Initial change for build.xml.
Check if the 2 other repositories are available and give a message if
not.
Build from j-t-c.
Revision ChangesPath
1.132 +71 -18jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- build.xml 2001/06/08 02:55:39 1.131
+++ build.xml 2001/06/09 00:25:05 1.132
@@ -31,7 +31,13 @@
--
property name=install.dir value=.. /
+ !-- External repositories --
+ property name=jakarta-tomcat-connectors
+ location=${ws}/jakarta-tomcat-connectors /
+ property name=jakarta-tomcat-jasper
+ location=${ws}/jakarta-tomcat-jasper /
+
!-- External packages we depend on --
!-- Tomcat depends on:
- Ant ( latest binary install in jakarta-ant-1.3 )
@@ -62,6 +68,10 @@
file=${jsse.lib}/jsse.jar/
available property=jdk12.present
classname=java.security.PrivilegedAction/
+available property=jakarta-tomcat-connectors-present
+file=${jakarta-tomcat-connectors}/
+available property=jakarta-tomcat-jasper-present
+file=${jakarta-tomcat-jasper} /
/target
target name=msg.jdk12 if=jdk12.present
@@ -71,8 +81,16 @@
target name=msg.jsse if=jsse.present
echo message=Detected JSSE/
/target
+
+ target name=msg.jtc unless=jakarta-tomcat-connectors-present
+fail message=Can't find jakarta-tomcat-connectors repository, you must check
it out before building tomcat /
+ /target
+
+ target name=msg.jtj unless=jakarta-tomcat-jasper-present
+fail message=Can't find jakarta-tomcat-jasper repository, you must check it
out before building tomcat /
+ /target
- target name=init depends=detect,msg.jdk12,msg.jsse
+ target name=init depends=detect,msg.jdk12,msg.jsse,msg.jtc,msg.jtj
/target
!-- Copy static files --
@@ -147,6 +165,38 @@
!-- Tomcat util --
!-- Independent ( stand alone ) utilities --
+ target name=connector_util depends=init
+javac destdir=${tomcat.build}/classes
+debug=${debug}
+optimize=${optimize}
+deprecation=off
+srcdir=${jakarta-tomcat-connectors}/util/java
+ classpath
+ /classpath
+ include name=org/apache/tomcat/util/**/
+/javac
+
+copy todir=${tomcat.build}/classes
+ fileset dir=${jakarta-tomcat-connectors}/util/java
+ include name=**/*.properties/
+ include name=**/*.dtd/
+ /fileset
+/copy
+
+jar jarfile=${tomcat.build}/lib/common/connector_util.jar
+ basedir=${tomcat.build}/classes
+ include name=org/apache/tomcat/util/collections/**/
+ include name=org/apache/tomcat/util/http/**/
+ include name=org/apache/tomcat/util/res/**/
+ include name=org/apache/tomcat/util/buf/**/
+ include name=org/apache/tomcat/util/**/
+/jar
+
+ /target
+
+ !-- Tomcat util --
+ !-- Independent ( stand alone ) utilities --
+
target name=tomcat_util depends=init
javac destdir=${tomcat.build}/classes
debug=${debug}
@@ -165,12 +215,8 @@
jar jarfile=${tomcat.build}/lib/common/core_util.jar
basedir=${tomcat.build}/classes
- include name=org/apache/tomcat/util/log/**/
- include name=org/apache/tomcat/util/collections/**/
include name=org/apache/tomcat/util/hooks/**/
- include name=org/apache/tomcat/util/http/**/
- include name=org/apache/tomcat/util/res/**/
- include name=org/apache/tomcat/util/buf/**/
+ include name=org/apache/tomcat/util/log/**/
/jar
jar jarfile=${tomcat.build}/lib/container/tomcat_util.jar
@@ -239,6 +285,7 @@
deprecation=off
srcdir=src/share
classpath
+ pathelement location=${tomcat.build}/lib/common/connector_util.jar/
pathelement location=${tomcat.build}/lib/container/tomcat_util.jar/
/classpath
include name=org/apache/tomcat/core/**/
@@ -265,7 +312,8 @@
deprecation=off
srcdir=src/share
classpath
- pathelement location=${tomcat.build}/lib/container/tomcat_util.jar/
+ pathelement location=${tomcat.build}/lib/common/connector_util.jar/
+ pathelement location=${tomcat.build}/lib/container/tomcat_util.jar/
pathelement location=${tomcat.build}/lib/common/tomcat_core.jar/
/classpath
include name=org/apache/tomcat/startup/**/
cvs commit: jakarta-tomcat build.xml
costin 01/06/08 20:17:39
Modified:.build.xml
Log:
Read build.properties ( as in connector and other projects ) in addition
to our old .ant.properties.
Fix the build of connector-utils ( remove util/** - that would add too much
to common, and confuse the class loader)
Add targets to build the ajp13 connector out of j-t-c.
Add targets to build and add jasper34 ( it'll not be enabled )
Revision ChangesPath
1.133 +29 -8 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- build.xml 2001/06/09 00:25:05 1.132
+++ build.xml 2001/06/09 03:17:39 1.133
@@ -3,6 +3,7 @@
!-- Compilation properties --
property file=${user.home}/.ant.properties /
+ property file=${user.home}/build.properties /
property name=optimize value=false/
property name=debug value=on/
@@ -99,9 +100,9 @@
target name=prepare depends=init
mkdir dir=src/doc/ !-- Temp change until dir is not empty --
mkdir dir=${tomcat.build}/
-mkdir dir=${tomcat.build}/classes/
mkdir dir=${tomcat.build}/conf/
mkdir dir=${tomcat.build}/src/
+mkdir dir=${tomcat.build}/classes/
mkdir dir=${tomcat.build}/lib/
mkdir dir=${tomcat.build}/lib/apps/
mkdir dir=${tomcat.build}/lib/container/
@@ -188,8 +189,7 @@
include name=org/apache/tomcat/util/collections/**/
include name=org/apache/tomcat/util/http/**/
include name=org/apache/tomcat/util/res/**/
- include name=org/apache/tomcat/util/buf/**/
- include name=org/apache/tomcat/util/**/
+ include name=org/apache/tomcat/util/buf/**/
/jar
/target
@@ -368,10 +368,6 @@
pathelement location=${tomcat.build}/lib/common/tomcat_core.jar/
/classpath
include name=org/apache/tomcat/modules/**/
- !-- exclude
- name=org/apache/tomcat/modules/generators/Jdk12Interceptor.java
- unless=jdk12.present/
- --
exclude
name=org/apache/tomcat/modules/config/LoaderInterceptor12.java
unless=jdk12.present/
@@ -387,6 +383,25 @@
/jar
/target
+ target name=connector depends=init
+javac destdir=${tomcat.build}/classes
+debug=${debug}
+optimize=${optimize}
+deprecation=off
+srcdir=${jakarta-tomcat-connectors}/jk/java
+ classpath
+ /classpath
+ include name=org/apache/ajp/tomcat33/**/
+/javac
+
+jar jarfile=${tomcat.build}/lib/container/jk_connector.jar
+ basedir=${tomcat.build}/classes
+ include name=org/apache/ajp/tomcat33/**/
+/jar
+
+ /target
+
+
!-- Jasper ( 1.0 ) == --
target name=jasper depends=init
javac
@@ -430,8 +445,14 @@
--
/jar
/target
+
+ target name=jasper34 if=jakarta-tomcat-jasper-present
+ant antfile=${jakarta-tomcat-jasper}/jasper34/build.xml
+ target=install/
+ /target
+
- target name=tomcat-jars
depends=connector_util,tomcat_util,tomcat.jar,stop-tomcat.jar,tomcat_core,jasper,tomcat_modules,facade22,tomcat-startup
+ target name=tomcat-jars
depends=prepare,connector_util,tomcat_util,tomcat.jar,stop-tomcat.jar,tomcat_core,jasper,connector,tomcat_modules,facade22,tomcat-startup,jasper34
/target
target name=tomcat-jars-new depends=tomcat-jars
cvs commit: jakarta-tomcat build.xml
costin 01/06/07 19:55:45
Modified:.build.xml
Log:
Stop copying ant, or jaxp from ant.
Ant is still included in the /admin app, where it is used for tests and
will be used for various automations.
Revision ChangesPath
1.131 +19 -20jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- build.xml 2001/05/21 06:24:23 1.130
+++ build.xml 2001/06/08 02:55:39 1.131
@@ -109,17 +109,11 @@
copy tofile=${tomcat.build}/LICENSE file=LICENSE/
!-- include ant, it is used for testing and will be used for
-configuration and few other tasks --
+configuration and few other tasks
copy todir=${tomcat.build}/bin
fileset dir=${ant.bin}/
-/copy
-
-!--
-copy tofile=${tomcat.build}/lib/container/jaxp.jar
- file=${ant.lib}/jaxp.jar/
-copy tofile=${tomcat.build}/lib/container/parser.jar
- file=${ant.lib}/parser.jar/
- --
+/copy
+--
copy tofile=${tomcat.build}/lib/container/jaxp.jar
file=${jaxp.home}/jaxp.jar/
@@ -144,8 +138,6 @@
fixcrlf srcdir=${tomcat.build}/bin includes=**/*.sh cr=remove/
fixcrlf srcdir=${tomcat.build}/bin includes=**/*.bat cr=add/
-chmod perm=+x file=${tomcat.build}/bin/ant/
-chmod perm=+x file=${tomcat.build}/bin/antRun/
chmod perm=+x file=${tomcat.build}/bin/tomcat.sh/
chmod perm=+x file=${tomcat.build}/bin/jspc.sh/
chmod perm=+x file=${tomcat.build}/bin/startup.sh/
@@ -247,7 +239,7 @@
deprecation=off
srcdir=src/share
classpath
- pathelement location=${tomcat.build}/lib/tomcat_util.jar/
+ pathelement location=${tomcat.build}/lib/container/tomcat_util.jar/
/classpath
include name=org/apache/tomcat/core/**/
/javac
@@ -273,8 +265,8 @@
deprecation=off
srcdir=src/share
classpath
- pathelement location=${tomcat.build}/lib/tomcat_util.jar/
- pathelement location=${tomcat.build}/lib/tomcat_core.jar/
+ pathelement location=${tomcat.build}/lib/container/tomcat_util.jar/
+ pathelement location=${tomcat.build}/lib/common/tomcat_core.jar/
/classpath
include name=org/apache/tomcat/startup/**/
exclude name=**/EmbededTomcat.java unless=jdk12.present/
@@ -284,6 +276,12 @@
manifest=src/build/manifests/manifest.startup
include name=org/apache/tomcat/startup/**/
/jar
+
+jar jarfile=${tomcat.build}/lib/etomcat.jar
+ basedir=${tomcat.build}/classes
+ manifest=src/build/manifests/manifest.embedded
+ include name=org/apache/tomcat/startup/**/
+/jar
/target
!-- Servlet 22 (default) implementation == --
@@ -296,8 +294,8 @@
srcdir=src/facade22
classpath
pathelement location=${servlet22.jar}/
- pathelement location=${tomcat.build}/lib/tomcat_util.jar/
- pathelement location=${tomcat.build}/lib/tomcat_core.jar/
+ pathelement location=${tomcat.build}/lib/container/tomcat_util.jar/
+ pathelement location=${tomcat.build}/lib/common/tomcat_core.jar/
/classpath
include name=org/apache/tomcat/facade/**/
/javac
@@ -316,8 +314,8 @@
optimize=${optimize}
deprecation=off
classpath
- pathelement location=${tomcat.build}/lib/tomcat_util.jar/
- pathelement location=${tomcat.build}/lib/tomcat_core.jar/
+ pathelement location=${tomcat.build}/lib/container/tomcat_util.jar/
+ pathelement location=${tomcat.build}/lib/common/tomcat_core.jar/
/classpath
include name=org/apache/tomcat/modules/**/
!-- exclude
@@ -370,7 +368,8 @@
/jar
jar jarfile=${tomcat.build}/lib/container/jasper.jar
- basedir=${tomcat.build}/classes
+ basedir=${tomcat.build}/classes
+ manifest=src/build/manifests/manifest.jspc
include name=org/apache/jasper/**/
!--
exclude name=org/apache/jasper/Constants.class/
@@ -442,7 +441,7 @@
basedir=${tomcat.build}/webapps/admin/WEB-INF/classes
include name=org/apache/tomcat/util/test/**/
/jar
-delete dir=${tomcat.build}/webapps/admin/WEB-INF/classes/org /
+!-- delete dir=${tomcat.build}/webapps/admin/WEB-INF/classes/org / --
/target
cvs commit: jakarta-tomcat build.xml
costin 01/05/20 23:24:23
Modified:.build.xml
Log:
Read ant.properties, each user has a different setup.
( that used to be there, I don't know when it got lost - but it's very
difficult to work without something like this )
Revision ChangesPath
1.130 +3 -1 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- build.xml 2001/05/15 13:03:03 1.129
+++ build.xml 2001/05/21 06:24:23 1.130
@@ -2,6 +2,7 @@
project name=Tomcat default=main basedir=.
!-- Compilation properties --
+ property file=${user.home}/.ant.properties /
property name=optimize value=false/
property name=debug value=on/
@@ -626,7 +627,8 @@
!-- The self-test app should be removed in the release, but it's
useful to have it builded by default --
- target name=tomcat depends=prepare,tomcat-jars-new
+ target name=tomcat depends=prepare,tomcat-jars-new
+ description=Build tomcat core only
/target
target name=clean-classes depends=init
cvs commit: jakarta-tomcat build.xml
larryi 01/05/15 06:03:07
Modified:.build.xml
Log:
Remove duplicate copy command for jaxp.jar.
Add a target test.war that adds the test web application to the
distribution build, without including watchdog.
Revision ChangesPath
1.129 +6 -2 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- build.xml 2001/05/15 09:49:35 1.128
+++ build.xml 2001/05/15 13:03:03 1.129
@@ -124,8 +124,6 @@
file=${jaxp.home}/jaxp.jar/
copy tofile=${tomcat.build}/lib/container/parser.jar
file=${jaxp.home}/parser.jar/
-copy tofile=${tomcat.build}/lib/container/jaxp.jar
- file=${jaxp.home}/jaxp.jar/
copy file =src/build/readme/readme.container
tofile=${tomcat.build}/lib/container/README /
@@ -459,6 +457,12 @@
target name=tests depends=main,sanity-test,watchdog-web-based /
+ target name=test.war
+jar jarfile=${tomcat.dist}/webapps/test.war
+ basedir=${tomcat.build}/webapps/test
+ includes=**/
+ /target
+
target name=tests.dist depends=tests
jar jarfile=${tomcat.dist}/webapps/test.war
basedir=${tomcat.build}/webapps/test
cvs commit: jakarta-tomcat build.xml
larryi 01/05/10 05:19:41
Modified:.build.xml
Log:
Update building of the admin webapp to create a local jar
(tomcat_test_util.jar) that includes needed org.apache.tomcat.util.test
classes. I believe a bug had previously allowed access to these classes
in tomcat_util.jar found in the lib/container directory.
Revision ChangesPath
1.127 +11 -0 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- build.xml 2001/05/06 15:23:12 1.126
+++ build.xml 2001/05/10 12:19:39 1.127
@@ -432,6 +432,17 @@
optimize=${optimize}
destdir=${tomcat.build}/webapps/admin/WEB-INF/classes
classpath=${tomcat.build}/classes;${servlet22.jar}/
+
+!-- build local jar containing org.apache.tomcat.util.test classes --
+javac srcdir=src/share/org/apache/tomcat/util/test
+optimize=${optimize}
+destdir=${tomcat.build}/webapps/admin/WEB-INF/classes
+classpath=${tomcat.build}/classes/
+jar jarfile=${tomcat.build}/webapps/admin/WEB-INF/lib/tomcat_test_util.jar
+ basedir=${tomcat.build}/webapps/admin/WEB-INF/classes
+ include name=org/apache/tomcat/util/test/**/
+/jar
+delete dir=${tomcat.build}/webapps/admin/WEB-INF/classes/org /
/target
cvs commit: jakarta-tomcat build.xml
costin 01/03/03 19:27:26
Modified:.build.xml
Log:
Implement the proposed change in lib/ organization.
lib/apps will contain jars shared by web applications ( prev. "share" )
lib/common will contain jars shared by the container and web applications
( same as CLASSPATH )
lib/container will contain jars visible and used by the container (
previously lib/ )
In lib we keep the executable jars used to start/stop tomcat.
Also, integrate this into the prepare target, and generate the jars
in the final place ( instead of copy/move )
Another change is the split of jasper into jasper-runtime and jasper.
Runtime is all you need to run Jsps, jasper is the compiler.
The utils are also split in "core_util" - i.e. what's needed in the
core, and "tomcat_util" - other utils used by various modules.
This makes clear what are the dependencies, and will allow finer
permissions.
Revision ChangesPath
1.119 +68 -43jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- build.xml 2001/02/19 19:45:11 1.118
+++ build.xml 2001/03/04 03:27:25 1.119
@@ -47,6 +47,9 @@
mkdir dir="${tomcat.build}/conf"/
mkdir dir="${tomcat.build}/src"/
mkdir dir="${tomcat.build}/lib"/
+mkdir dir="${tomcat.build}/lib/apps"/
+mkdir dir="${tomcat.build}/lib/container"/
+mkdir dir="${tomcat.build}/lib/common"/
mkdir dir="${tomcat.build}/logs"/
mkdir dir="${tomcat.build}/bin"/
mkdir dir="${tomcat.build}/doc"/
@@ -72,19 +75,33 @@
copy todir="${tomcat.build}/bin"
fileset dir="${ant.home}/bin"/
/copy
-copy tofile="${tomcat.build}/lib/jaxp.jar"
+copy tofile="${tomcat.build}/lib/container/jaxp.jar"
file="${ant.home}/lib/jaxp.jar"/
-copy tofile="${tomcat.build}/lib/parser.jar"
+copy tofile="${tomcat.build}/lib/container/parser.jar"
file="${ant.home}/lib/parser.jar"/
-copy tofile="${tomcat.build}/lib/jaxp.jar" file="${jaxp}/jaxp.jar"/
-copy tofile="${tomcat.build}/lib/parser.jar" file="${jaxp}/parser.jar"/
-copy tofile="${tomcat.build}/lib/jaxp.jar" file="${jaxp}/jaxp.jar"/
-copy tofile="${tomcat.build}/lib/crimson.jar" file="${jaxp}/crimson.jar"/
+copy tofile="${tomcat.build}/lib/container/jaxp.jar"
+ file="${jaxp}/jaxp.jar"/
+copy tofile="${tomcat.build}/lib/container/parser.jar"
+ file="${jaxp}/parser.jar"/
+copy tofile="${tomcat.build}/lib/container/jaxp.jar"
+ file="${jaxp}/jaxp.jar"/
+copy tofile="${tomcat.build}/lib/container/crimson.jar"
+ file="${jaxp}/crimson.jar"/
+copy file ="src/build/readme.container"
+ tofile="${tomcat.build}/lib/container/README" /
+
+copy file ="src/build/readme.shared"
+ tofile="${tomcat.build}/lib/apps/README" /
+
+copy file ="src/build/readme.common"
+ tofile="${tomcat.build}/lib/common/README" /
+
!-- This act as a "default", Tomcat3.3 will not load it in
classpath, just a hack to ease the transition
--
-copy tofile="${tomcat.build}/lib/servlet.jar" file="${servlet22.jar}"/
+copy tofile="${tomcat.build}/lib/common/servlet.jar"
+ file="${servlet22.jar}"/
fixcrlf srcdir="${tomcat.build}/bin" includes="**/*.sh" cr="remove"/
fixcrlf srcdir="${tomcat.build}/bin" includes="**/*.bat" cr="add"/
@@ -111,10 +128,20 @@
exclude name="**/util/net/SSLSocketFactory.java" unless="jsse.present"/
exclude name="**/util/compat/Jdk12Support.java" unless="jdk12.present"/
/javac
-jar jarfile="${tomcat.build}/lib/tomcat_util.jar"
+
+jar jarfile="${tomcat.build}/lib/common/core_util.jar"
+ basedir="${tomcat.build}/classes"
+ include name="org/apache/tomcat/util/log/**"/
+ include name="org/apache/tomcat/util/collections/**"/
+ include name="org/apache/tomcat/util/hooks/**"/
+ include name="org/apache/tomcat/util/http/**"/
+ include name="org/apache/tomcat/util/res/**"/
+ include name="org/apache/tomcat/util/buf/**"/
+/jar
+
+jar jarfile="${tomcat.build}/lib/container/tomcat_util.jar"
basedir="${tomcat.build}/classes"
include name="org/apache/tomcat/util/**"/
- include name="org/apache/tomcat/logging/**"/
/jar
/target
@@ -158,11 +185,12 @@
include name="**/*.dtd"/
/fileset
/copy
+
jar jarfile="${tomcat.build}/lib/stop-tomcat.jar"
basedir="${tomcat.build}/classes"
manifest="src/build/manifest.stop-tomcat"
include
cvs commit: jakarta-tomcat build.xml
costin 01/02/19 11:45:14
Modified:.build.xml
Log:
- removed unused target ( modules.xml auto-generation experiment, too much work
for this release )
- stop-tomcat.jar includes IntrospectionUtils, guess TOMCAT_HOME ( no need
to set it in the command line, can start from any dir )
Revision ChangesPath
1.118 +4 -25 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- build.xml 2001/02/16 05:37:50 1.117
+++ build.xml 2001/02/19 19:45:11 1.118
@@ -129,7 +129,8 @@
!-- no dependencies --
include name="org/apache/tomcat/startup/Main.java"/
include name="org/apache/tomcat/util/compat/**"/
- exclude name="**/util/compat/Jdk12Support.java" unless="jdk12.present"/
include name="org/apache/tomcat/util/IntrospectionUtils.java"/
+ exclude name="**/util/compat/Jdk12Support.java" unless="jdk12.present"/
+ include name="org/apache/tomcat/util/IntrospectionUtils.java"/
/javac
jar jarfile="${tomcat.build}/lib/tomcat.jar"
basedir="${tomcat.build}/classes"
@@ -149,6 +150,7 @@
srcdir="src/share"
!-- no dependencies --
include name="org/apache/tomcat/startup/StopTomcat.java"/
+ include name="org/apache/tomcat/util/IntrospectionUtils.java"/
/javac
copy todir="${tomcat.build}/classes/org/apache/tomcat/resources"
fileset dir="src/share/org/apache/tomcat/resources"
@@ -162,6 +164,7 @@
include name="org/apache/tomcat/startup/StopTomcat.class"/
include name="org/apache/tomcat/util/StringManager.class"/
include name="org/apache/tomcat/resources/LocalStrings*"/
+ include name="org/apache/tomcat/util/IntrospectionUtils**"/
/jar
/target
@@ -431,30 +434,6 @@
chmod perm="+x" file="${tomcat.dist}/bin/startup.sh"/
chmod perm="+x" file="${tomcat.dist}/bin/shutdown.sh"/
/target
-
- target name="modulesDoc.xml"
-!-- using alexandria'x XMLDoclet --
-javac srcdir="src/build"
-destdir="${tomcat.build}/classes"
-debug="${debug}"
-optimize="${optimize}"
-deprecation="off"
- classpath
- pathelement location="${java.home}/../lib/tools.jar"/
- /classpath
-/javac
-javadoc packagenames="org.apache.tomcat.modules.*,org.apache.tomcat.facade.*"
- sourcepath="src/share;src/facade22"
- destdir="${tomcat.dist}/webapps/ROOT/javadoc"
- author="true"
- version="true"
-doclet name="XMLDoclet" path="${tomcat.build}/classes"
- param name="-file" value="${tomcat.build}/conf/modulesDoc.xml" /
-/doclet
-/javadoc
- /target
-
-
!-- === --
!-- Packages the distribution with ZIP --
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
larryi 01/02/16 07:14:09 Modified:.Tag: tomcat_32 build.xml Log: Port Costin's change from Tomcat 3.3. Fix bug #482 ( build fails on certain JDKs, build.compiler is wrong ). There is no reason to force a compiler. Revision ChangesPath No revision No revision 1.53.2.6 +0 -1 jakarta-tomcat/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat/build.xml,v retrieving revision 1.53.2.5 retrieving revision 1.53.2.6 diff -u -r1.53.2.5 -r1.53.2.6 --- build.xml 2000/11/12 01:19:27 1.53.2.5 +++ build.xml 2001/02/16 15:14:08 1.53.2.6 @@ -3,7 +3,6 @@ !-- Initialization properties = -- property name="ant.home" value="../jakarta-ant"/ - property name="build.compiler" value="classic"/ property name="debug" value="on"/ property name="j2ee.home" value="../../j2ee/build/unix"/ property name="jaxp" value="../jaxp-1.0.1" / - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
costin 01/02/15 15:36:27 Modified:.build.xml Log: Fixed the wrong path that caused /admin build problems. Revision ChangesPath 1.116 +1 -1 jakarta-tomcat/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat/build.xml,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- build.xml 2001/02/13 03:13:45 1.115 +++ build.xml 2001/02/15 23:36:25 1.116 @@ -25,7 +25,7 @@ !-- External packages we depend on -- property name="ant.home" value="../jakarta-ant"/ - property name="watchdog.home" value="../../build/watchdog"/ + property name="watchdog.home" value="../build/watchdog"/ property name="jaxp" value="../jaxp-1.0.1"/ property name="servlet22.jar" value="bin/servlet22.jar"/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
costin 01/02/12 16:47:46
Modified:.build.xml
Log:
2 small fixes to generate the correct build
Revision ChangesPath
1.114 +9 -3 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- build.xml 2001/02/12 23:09:32 1.113
+++ build.xml 2001/02/13 00:47:43 1.114
@@ -151,6 +151,12 @@
!-- no dependencies --
include name="org/apache/tomcat/startup/StopTomcat.java"/
/javac
+copy todir="${tomcat.build}/classes/org/apache/tomcat/resources"
+fileset dir="src/share/org/apache/tomcat/resources"
+include name="**/*.properties"/
+include name="**/*.dtd"/
+/fileset
+/copy
jar jarfile="${tomcat.build}/lib/stop-tomcat.jar"
basedir="${tomcat.build}/classes"
manifest="src/build/manifest.stop-tomcat"
@@ -384,10 +390,10 @@
copy tofile="${tomcat.dist}/lib/servlet.jar" file="${servlet22.jar}"/
!-- Add Tomcat internal javadoc --
-mkdir dir="${tomcat.dist}/webapps/ROOT/javadoc"/
+mkdir dir="${tomcat.build}/webapps/ROOT/javadoc"/
javadoc packagenames="org.apache.tomcat.core"
sourcepath="src/share;src/facade22"
- destdir="${tomcat.dist}/webapps/ROOT/javadoc"
+ destdir="${tomcat.build}/webapps/ROOT/javadoc"
author="true"
version="true"
use="true"
@@ -397,7 +403,7 @@
javadoc packagenames="org.apache.tomcat.modules.*"
sourcepath="src/share;src/facade22"
- destdir="${tomcat.dist}/webapps/ROOT/javadoc"
+ destdir="${tomcat.build}/webapps/ROOT/javadoc"
author="true"
version="true"
use="true"
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
costin 01/02/12 19:13:45
Modified:.build.xml
Log:
Fixed another build problem.
Nacho - I think we need a bit more work on the class loader, like spliting
jasper into runtime and compiler and something similar with some of the utils.
Revision ChangesPath
1.115 +1 -1 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- build.xml 2001/02/13 00:47:43 1.114
+++ build.xml 2001/02/13 03:13:45 1.115
@@ -478,7 +478,7 @@
!-- XXX extract only the run-time component of jasper --
copy file ="${tomcat.build}/lib/servlet.jar"
-todir="${tomcat.build}/lib/shared" /
+todir="${tomcat.build}/lib/common" /
copy file ="${tomcat.build}/lib/jasper.jar"
todir="${tomcat.build}/lib/shared" /
copy file ="${tomcat.build}/lib/tomcat_util.jar"
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
costin 01/02/10 08:13:02
Modified:.build.xml
Log:
Include compat in Main.java's starter ( repleaces the hack using introspection
to find and load URLClassLoader ).
( also added the target I use to build modulesDoc.xml - it's very early
code, it still needs a lot of work - but it would be nice to have userdoc
syncyhronized with the sources )
Revision ChangesPath
1.111 +28 -3 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- build.xml 2001/02/10 00:55:36 1.110
+++ build.xml 2001/02/10 16:13:02 1.111
@@ -128,7 +128,7 @@
srcdir="src/share"
!-- no dependencies --
include name="org/apache/tomcat/startup/Main.java"/
- include name="org/apache/tomcat/util/SimpleClassLoader.java"/
+ include name="org/apache/tomcat/util/compat/**"/
include name="org/apache/tomcat/util/IntrospectionUtils.java"/
/javac
jar jarfile="${tomcat.build}/lib/tomcat.jar"
@@ -136,7 +136,7 @@
manifest="src/build/manifest"
include name="org/apache/tomcat/startup/Main.class"/
include name="org/apache/tomcat/startup/Main$*.class"/
- include name="org/apache/tomcat/util/SimpleClassLoader**"/
+ include name="org/apache/tomcat/util/compat/**"/
include name="org/apache/tomcat/util/IntrospectionUtils**"/
/jar
/target
@@ -372,9 +372,10 @@
!-- Add Tomcat internal javadoc --
mkdir dir="${tomcat.dist}/webapps/ROOT/javadoc"/
-!--javadoc packagenames="org.apache.tomcat.*"--
javadoc packagenames="org.apache.tomcat.core"
sourcepath="src/share;src/facade22" destdir="${tomcat.dist}/webapps/ROOT/javadoc"
author="true" version="true" use="true" windowtitle="Tomcat internal API"
doctitle="Tomcat internal" bottom="Copyright © 2000 Apache Software Foundation. All
Rights Reserved."/
+javadoc packagenames="org.apache.tomcat.modules"
sourcepath="src/share;src/facade22" destdir="${tomcat.dist}/webapps/ROOT/javadoc"
author="true" version="true" use="true" windowtitle="Tomcat modules" doctitle="Tomcat
modules" bottom="Copyright © 2000 Apache Software Foundation. All Rights Reserved."/
+
delete dir="${tomcat.dist}/classes"/
@@ -395,6 +396,30 @@
chmod perm="+x" file="${tomcat.dist}/bin/startup.sh"/
chmod perm="+x" file="${tomcat.dist}/bin/shutdown.sh"/
/target
+
+ target name="modulesDoc.xml"
+!-- using alexandria'x XMLDoclet --
+javac srcdir="src/build"
+destdir="${tomcat.build}/classes"
+debug="${debug}"
+optimize="${optimize}"
+deprecation="off"
+ classpath
+ pathelement location="${java.home}/../lib/tools.jar"/
+ /classpath
+/javac
+javadoc packagenames="org.apache.tomcat.modules.*,org.apache.tomcat.facade.*"
+ sourcepath="src/share;src/facade22"
+ destdir="${tomcat.dist}/webapps/ROOT/javadoc"
+ author="true"
+ version="true"
+doclet name="XMLDoclet" path="${tomcat.build}/classes"
+ param name="-file" value="${tomcat.build}/conf/modulesDoc.xml" /
+/doclet
+/javadoc
+ /target
+
+
!-- === --
!-- Packages the distribution with ZIP --
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
costin 01/02/10 18:23:20
Modified:.build.xml
Log:
Build error ( again - I forgot to exclude the URLLoader and 1.2 )
Revision ChangesPath
1.112 +1 -1 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- build.xml 2001/02/10 16:13:02 1.111
+++ build.xml 2001/02/11 02:23:20 1.112
@@ -129,7 +129,7 @@
!-- no dependencies --
include name="org/apache/tomcat/startup/Main.java"/
include name="org/apache/tomcat/util/compat/**"/
- include name="org/apache/tomcat/util/IntrospectionUtils.java"/
+ exclude name="**/util/compat/Jdk12Support.java" unless="jdk12.present"/
include name="org/apache/tomcat/util/IntrospectionUtils.java"/
/javac
jar jarfile="${tomcat.build}/lib/tomcat.jar"
basedir="${tomcat.build}/classes"
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
nacho 01/02/06 10:16:00 Modified:.build.xml Log: Build now builds with the new directory structure under lib Revision ChangesPath 1.108 +2 -2 jakarta-tomcat/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat/build.xml,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- build.xml 2001/02/06 02:46:24 1.107 +++ build.xml 2001/02/06 18:15:59 1.108 @@ -448,7 +448,7 @@ /target - target name="all" depends="clean,dist"/ - target name="main" depends="tomcat,webapps,sanity-test"/ + target name="all" depends="clean,dist,dist-new"/ + target name="main" depends="tomcat,webapps,sanity-test,new"/ /project - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
nacho 01/02/06 10:17:55
Modified:.build.xml
Log:
Oops, a circular dependency ..
Revision ChangesPath
1.109 +2 -2 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- build.xml 2001/02/06 18:15:59 1.108
+++ build.xml 2001/02/06 18:17:55 1.109
@@ -403,7 +403,7 @@
zip zipfile="${Name}-${version}.zip" basedir="${tomcat.dist}" includes="**"/
/target
- target name="dist-new" depends="dist"
+ target name="dist-new"
mkdir dir="${tomcat.dist}/lib/shared"/
mkdir dir="${tomcat.dist}/lib/common"/
copy file ="${tomcat.dist}/lib/servlet.jar"
@@ -414,7 +414,7 @@
todir="${tomcat.dist}/lib/shared" /
/target
- target name="new" depends="main"
+ target name="new"
mkdir dir="${tomcat.build}/lib/shared"/
mkdir dir="${tomcat.build}/lib/common"/
copy file ="${tomcat.build}/lib/servlet.jar"
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
costin 00/12/24 20:43:15
Modified:.build.xml
Log:
Removed any reference to other facades - non-servlet22 facades will not
be part of the standard distribution.
Removed webdav - it was a new feature for 3.3, and no new features should
be part of 3.3. The code will be reintroduced as part of the independent
"tomcat extensions" project.
Revision ChangesPath
1.97 +4 -51 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- build.xml 2000/11/30 06:17:11 1.96
+++ build.xml 2000/12/25 04:43:15 1.97
@@ -28,17 +28,8 @@
property name="j2ee.home" value="../j2ee/build/unix"/
property name="jaxp" value="../jaxp-1.0.1"/
- !-- == Hack for building 2.2 and 2.3 versions == --
- !-- both servlet-2.2.jar and servlet-2.3.jar are checked in
- as binaries - checking out 2 revisions of servletapi and
- building is too complex ( plus they use the same directories ).
---
-
property name="servlet22.jar" value="bin/servlet22.jar"/
-
- !-- default servlet.jar, used to compile webapps --
- !-- we use 2.2 because the api is backward compatible, but it
- may have problems in the reverse direction --
+
property name="servlet.jar" value="${servlet22.jar}"/
!-- Initialization - guessing config == --
@@ -89,11 +80,8 @@
!-- This act as a "default", Tomcat3.3 will not load it in
classpath, just a hack to ease the transition
--
-copy tofile="${tomcat.build}/lib/servlet.jar" file="${servlet.jar}"/
+copy tofile="${tomcat.build}/lib/servlet.jar" file="${servlet22.jar}"/
-!-- new dir struct for running both 2.2 and 2.3 --
-mkdir dir="${tomcat.build}/lib/servlet22"/
-copy tofile="${tomcat.build}/lib/servlet22/servlet22.jar"
file="${servlet22.jar}"/
fixcrlf srcdir="${tomcat.build}/bin" includes="**/*.sh" cr="remove"/
fixcrlf srcdir="${tomcat.build}/bin" includes="**/*.bat" cr="add"/
@@ -192,38 +180,12 @@
include name="org/apache/tomcat/facade/**"/
include name="org/apache/tomcat/modules/facade22/**"/
/javac
-jar jarfile="${tomcat.build}/lib/servlet22/facade22.jar"
basedir="${tomcat.build}/classes"
- include name="org/apache/tomcat/facade/**"/
- include name="org/apache/tomcat/modules/facade22/**"/
-/jar
-!-- Copy the file in lib/ too, for tomcat.sh use ( until this is
- fixed for multiple facades
- --
jar jarfile="${tomcat.build}/lib/facade22.jar"
basedir="${tomcat.build}/classes"
include name="org/apache/tomcat/facade/**"/
include name="org/apache/tomcat/modules/facade22/**"/
/jar
/target
- !-- Webdav == --
- target depends="init" if="jdk12.present" name="dav"
-javac destdir="${tomcat.build}/classes" debug="${debug}"
optimize="${optimize}" deprecation="off" srcdir="src/webdav"
- classpath
- pathelement location="${servlet22.jar}"/
- /classpath
- include name="org/apache/tomcat/webdav/**"/
-/javac
-copy todir="${tomcat.build}/classes/org/apache/tomcat"
-fileset dir="src/webdav/org/apache/tomcat"
-include name="**/*.properties"/
-/fileset
-/copy
-jar jarfile="${tomcat.build}/lib/webdav.jar"
basedir="${tomcat.build}/classes"
- include name="org/apache/tomcat/webdav/**"/
- include name="org/apache/tomcat/webdav/**/*.properties"/
-/jar
- /target
-
!-- "Standard" interceptors == --
target name="tomcat_modules" depends="init"
javac destdir="${tomcat.build}/classes" srcdir="src/share" debug="${debug}"
optimize="${optimize}" deprecation="off"
@@ -269,7 +231,7 @@
jar jarfile="${tomcat.build}/lib/jasper.jar" basedir="${tomcat.build}/classes"
includes="org/apache/jasper/**"/
/target
- target name="tomcat-jars-new"
depends="tomcat_util,tomcat.jar,tomcat_core,jasper,tomcat_modules,facade22,tomcat_config,dav"
+ target name="tomcat-jars-new"
depends="tomcat_util,tomcat.jar,tomcat_core,jasper,tomcat_modules,facade22,tomcat_config"
/target
!-- J2EE integration == --
@@ -290,12 +252,6 @@
classpath="${tomcat.build}/classes;${servlet22.jar}"/
javac srcdir="src/examples/jsp/plugin/applet" optimize="${optimize}"
destdir="${tomcat.build}/webapps/examples/jsp/plugin/applet"/
-!-- webdav --
-mkdir dir="${tomcat.build}/webapps/webdav"/
-copy todir="${tomcat.build}/webapps/webdav"
-fileset dir="src/webdav/webdav"/
-
cvs commit: jakarta-tomcat build.xml
craigmcc00/11/11 17:19:27
Modified:.Tag: tomcat_32 build.xml
Log:
Update build.xml for Tomcat 3.2 to run under Ant 1.2 with no deprecation
warnings.
Revision ChangesPath
No revision
No revision
1.53.2.5 +174 -128 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.53.2.4
retrieving revision 1.53.2.5
diff -u -r1.53.2.4 -r1.53.2.5
--- build.xml 2000/11/11 01:08:56 1.53.2.4
+++ build.xml 2000/11/12 01:19:27 1.53.2.5
@@ -1,81 +1,95 @@
project name="Tomcat" default="main" basedir="."
- target name="init"
-!-- Ant.home is set automatically by ant. If you set it here it will not
- work --
-property name="ant.home" value="../jakarta-ant" /
-property name="build.compiler" value="classic"/
-property name="servlet.jar"
- value="../jakarta-servletapi/lib/servlet.jar"/
-property name="tomcat.build" value="../build/tomcat"/
-property name="tomcat.home" value="../dist/tomcat"/
-property name="j2ee.home" value="../../j2ee/build/unix"/
-property name="optimize" value="true" /
-property name="jaxp" value="../jaxp-1.0.1" /
- /target
+
+ !-- Initialization properties = --
+ property name="ant.home" value="../jakarta-ant"/
+ property name="build.compiler" value="classic"/
+ property name="debug" value="on"/
+ property name="j2ee.home" value="../../j2ee/build/unix"/
+ property name="jaxp" value="../jaxp-1.0.1" /
+ property name="optimize" value="true" /
+ property name="servlet.jar" value="../jakarta-servletapi/lib/servlet.jar"/
+ property name="tomcat.build" value="../build/tomcat"/
+ property name="tomcat.dist" value="../dist/tomcat"/
+
- !-- Copy static files --
- !-- IF YOU CHANGE, sync dist.prepare !!! --
+ !-- Copy static files = --
+ target name="prepare"
- target name="prepare" depends="init"
-mkdir dir="src/doc"/ !-- Temp change until dir is not empty --
+!-- Create destination directories --
mkdir dir="${tomcat.build}"/
+mkdir dir="${tomcat.build}/bin"/
mkdir dir="${tomcat.build}/classes"/
mkdir dir="${tomcat.build}/conf"/
-mkdir dir="${tomcat.build}/src"/
-mkdir dir="${tomcat.build}/lib"/
-mkdir dir="${tomcat.build}/logs"/
-mkdir dir="${tomcat.build}/bin"/
mkdir dir="${tomcat.build}/doc"/
-mkdir dir="${tomcat.build}/webapps"/
-
-copydir src="src/shell" dest="${tomcat.build}/bin" /
-copydir src="src/etc" dest="${tomcat.build}/conf"/
-copydir src="src/doc" dest="${tomcat.build}/doc"/
-
-copyfile src="build.xml" dest="${tomcat.build}/conf/build.xml"/
+mkdir dir="${tomcat.build}/lib"/
mkdir dir="${tomcat.build}/lib/test"/
mkdir dir="${tomcat.build}/lib/test/Golden"/
-copydir src="src/tests/share/tests/jsp/Golden"
- dest="${tomcat.build}/lib/test/Golden"/
+mkdir dir="${tomcat.build}/logs"/
+mkdir dir="${tomcat.build}/src"/
+mkdir dir="${tomcat.build}/webapps"/
-!-- include ant, it is used for testing and will be used for
- configuration and few other tasks --
-copydir src="${ant.home}/bin" dest="${tomcat.build}/bin"/
-copyfile src="${ant.home}/lib/ant.jar"
- dest="${tomcat.build}/lib/ant.jar"/
-copyfile src="${servlet.jar}" dest="${tomcat.build}/lib/servlet.jar"/
-copyfile src="LICENSE" dest="${tomcat.build}/LICENSE"/
+!-- Copy executables and scripts --
+copy todir="${tomcat.build}/bin"
+ fileset dir="${ant.home}/bin" includes="ant*"/
+ fileset dir="src/shell"/
+/copy
+
+!-- Copy configuation files --
+copy todir="${tomcat.build}/conf"
+ fileset dir="src/etc"/
+/copy
+copy tofile="${tomcat.build}/conf/build.xml"
+file="build.xml"/
+
+!-- Copy documentation and other miscellaneous files --
+copy todir="${tomcat.build}/doc"
+ fileset dir="src/doc"/
+/copy
+copy tofile="${tomcat.build}/LICENSE" file="LICENSE"/
+
+!-- Copy library JAR files --
+copy tofile="${tomcat.build}/lib/ant.jar"
+file="${ant.home}/lib/ant.jar"/
+copy tofile="${tomcat.build}/lib/servlet.jar"
+file="${servlet.jar}"/
+copy tofile="${tomcat.build}/lib/jaxp.jar"
+file="${jaxp}/jaxp.jar"/
+copy tofile="${tomcat.build}/lib/parser.jar"
+file="${jaxp}/parser.jar"/
+
+!-- Copy golden files for the tests webapp --
+copy todir="${tomcat.build}/lib/test/Golden"
+ fileset
cvs commit: jakarta-tomcat build.xml
jon 00/11/10 16:11:32 Modified:.build.xml Log: put a - in it cause that is how it comes from Sun. this is also more "standard" imho Revision ChangesPath 1.94 +1 -1 jakarta-tomcat/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat/build.xml,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- build.xml 2000/11/06 18:17:04 1.93 +++ build.xml 2000/11/11 00:11:32 1.94 @@ -28,7 +28,7 @@ property name="ant.home" value="../jakarta-ant" / property name="j2ee.home" value="../j2ee/build/unix"/ - property name="jaxp" value="../jaxp1.0.1" / + property name="jaxp" value="../jaxp-1.0.1" / !-- == Hack for building 2.2 and 2.3 versions == -- !-- both servlet-2.2.jar and servlet-2.3.jar are checked in - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
