cvs commit: jakarta-tomcat-connectors/coyote build.xml
remm2005/01/06 04:42:13
Modified:.build.xml
coyote build.xml
Log:
- Don't create the coyote JAR for TC 5.
Revision ChangesPath
1.220 +1 -4 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- build.xml 14 Oct 2004 07:40:34 - 1.219
+++ build.xml 6 Jan 2005 12:42:13 - 1.220
@@ -239,13 +239,10 @@
depends=init description=Build j-t-c/coyote
echo== Building: tomcat-coyote /echo
-ant dir=${jtc.home}/coyote target=jar.tomcat5
+ant dir=${jtc.home}/coyote target=compile.tomcat5
property name=catalina.home value=${tomcat.build}/
property name=build.home value=${tomcat.build}/
property name=tomcat5.detect value=true/
- !--
- property name=tomcat-coyote.jar
value=${tomcat.build}/server/lib/tomcat-coyote.jar /
- --
property name=tomcat-util.jar
value=${tomcat.build}/server/lib/tomcat-util.jar/
property name=servlet.jar value=${servlet-api.jar}/
1.31 +3 -2 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- build.xml 1 Sep 2004 10:10:48 - 1.30
+++ build.xml 6 Jan 2005 12:42:13 - 1.31
@@ -214,6 +214,7 @@
target name=compile.tomcat5 if=tomcat5.detect
+ depends=static,compile.shared
description=Compile Tomcat 5.x Adapter
javac srcdir=${source.home}
destdir=${build.home}/classes
@@ -225,7 +226,7 @@
/javac
/target
- target name=jar.tomcat5 depends=static,compile.shared,compile.tomcat5
+ target name=jar.tomcat5 depends=compile.tomcat5
jar jarfile=${tomcat-coyote.jar}
index=true
basedir=${build.home}/classes
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote build.xml
billbarker2004/08/16 20:16:59
Modified:coyote build.xml
Log:
Splitting the adapter jars from the shared jar in the build.
This is so I can inch the Tomcat Gump builds a bit closer to sanity, and it won't
take so long to test changes to the project files.
Revision ChangesPath
1.29 +21 -12jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- build.xml 16 Mar 2004 19:48:38 - 1.28
+++ build.xml 17 Aug 2004 03:16:59 - 1.29
@@ -271,13 +271,9 @@
/copy
/target
- target name=compile
- depends=static,report,compile.shared,compile.tomcat4,compile.tomcat33
- description=Compile Coyote and its Adapters
+ target name=shared.jar depends=static,compile.shared
+ description=Build shared Coyote jar
property name=tomcat-coyote.jar
value=${build.home}/lib/tomcat-${component.name}.jar /
-property name=tomcat33-coyote.jar
value=${build.home}/lib/tomcat33-${component.name}.jar /
-property name=tomcat4-coyote.jar
value=${build.home}/lib/tomcat4-${component.name}.jar /
-
jarjarfile=${tomcat-coyote.jar}
index=true
manifest=${build.home}/conf/MANIFEST.MF
@@ -288,18 +284,31 @@
include name=org/apache/coyote/**/
/fileset
/jar
-
-jar jarfile=${tomcat33-coyote.jar}
+ /target
+
+ target name=tomcat4.jar depends=static,compile.shared,compile.tomcat4
+ description=Build Tomcat 4 Adapter jar if=tomcat4.detect
+property name=tomcat4-coyote.jar
value=${build.home}/lib/tomcat4-${component.name}.jar /
+jar jarfile=${tomcat4-coyote.jar}
index=true
basedir=${build.home}/classes
manifest=${build.home}/conf/MANIFEST.MF
- includes=org/apache/coyote/tomcat3/** /
+ includes=org/apache/coyote/tomcat4/** /
+ /target
-jar jarfile=${tomcat4-coyote.jar}
+ target name=tomcat33.jar depends=static,compile.shared,compile.tomcat33
+ description=Build Tomcat 3.3 Adapter jar if=tomcat33.detect
+property name=tomcat33-coyote.jar
value=${build.home}/lib/tomcat33-${component.name}.jar /
+jar jarfile=${tomcat33-coyote.jar}
index=true
basedir=${build.home}/classes
manifest=${build.home}/conf/MANIFEST.MF
- includes=org/apache/coyote/tomcat4/** /
+ includes=org/apache/coyote/tomcat3/** /
+ /target
+
+ target name=compile
+ depends=static,report,shared.jar,tomcat4.jar,tomcat33.jar
+ description=Compile Coyote and its Adapters
/target
target name=compile.tests depends=compile
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote build.xml
kinman 2004/03/16 11:48:39
Modified:coyote build.xml
Log:
- Fix the build
Revision ChangesPath
1.28 +2 -2 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- build.xml 10 Mar 2004 22:35:10 - 1.27
+++ build.xml 16 Mar 2004 19:48:38 - 1.28
@@ -228,7 +228,7 @@
/copy
/target
- target name=jar.tomcat5 depends=compile.shared,compile.tomcat5
+ target name=jar.tomcat5 depends=static,compile.shared,compile.tomcat5
jar jarfile=${tomcat-coyote.jar}
index=true
basedir=${build.home}/classes
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote build.xml
costin 2003/03/15 23:05:44
Modified:coyote build.xml
Log:
Added a flag to disable javadoc.
I also inserted index=true - it seems that may speed up some things
in jdk1.4+ ( and it doesn't hurt otherwise )
Revision ChangesPath
1.23 +9 -6 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build.xml 13 Mar 2003 18:00:51 - 1.22
+++ build.xml 16 Mar 2003 07:05:44 - 1.23
@@ -226,6 +226,7 @@
target name=jar.tomcat5 depends=compile.shared,compile.tomcat5
jar jarfile=${tomcat-coyote.jar}
+ index=true
basedir=${build.home}/classes
manifest=${conf.home}/MANIFEST.MF
excludes=**/tomcat3/*
@@ -269,15 +270,17 @@
depends=static,report,compile.shared,compile.tomcat5,compile.tomcat4,compile.tomcat33
description=Compile Coyote and its Adapters
jarjarfile=${build.home}/lib/tomcat-${component.name}.jar
+index=true
basedir=${build.home}/classes
manifest=${build.home}/conf/MANIFEST.MF
includes=org/apache/coyote/**
excludes=**/tomcat3/* /
jarjarfile=${build.home}/lib/tomcat33-${component.name}.jar
-basedir=${build.home}/classes
- manifest=${build.home}/conf/MANIFEST.MF
- includes=org/apache/coyote/**
-excludes=**/tomcat4/* /
+ index=true
+ basedir=${build.home}/classes
+ manifest=${build.home}/conf/MANIFEST.MF
+ includes=org/apache/coyote/**
+ excludes=**/tomcat4/* /
/target
target name=compile.tests depends=compile
@@ -305,7 +308,7 @@
description=Clean and compile all components/
- target name=javadoc
+ target name=javadoc unless=docs-uptodate
description=Create component Javadoc documentation
mkdir dir=${build.home}/docs/api/
javadoc sourcepath=${source.home}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote build.xml
costin 2003/02/16 17:03:50
Modified:coyote build.xml
Log:
Make the dir - if this is the first to be built.
Revision ChangesPath
1.20 +2 -1 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build.xml 16 Jan 2003 22:31:00 - 1.19
+++ build.xml 17 Feb 2003 01:03:49 - 1.20
@@ -189,6 +189,7 @@
target name=compile.shared
description=Compile shareable components
+mkdir dir=${build.home}/classes/
javac srcdir=${source.home}
destdir=${build.home}/classes
debug=${compile.debug}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote build.xml
larryi 2003/02/16 17:47:36
Modified:coyote build.xml
Log:
Allow some independence from the version of util.
Revision ChangesPath
1.21 +6 -3 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- build.xml 17 Feb 2003 01:03:49 - 1.20
+++ build.xml 17 Feb 2003 01:47:36 - 1.21
@@ -21,6 +21,9 @@
!-- The directories corresponding to your necessary dependencies --
property name=junit.home value=/usr/local/junit3.5/
+ !-- Dependencies within jakarta-tomcat-connectors --
+ property name=util.home value=../util/
+
!-- == Derived Values --
@@ -81,7 +84,7 @@
!-- Construct compile classpath --
path id=compile.classpath
pathelement location=${build.home}/classes/
-pathelement location=../util/build/classes/
+pathelement location=${util.home}/build/classes/
pathelement location=${commons-logging.jar}/
pathelement location=${commons-modeler.jar}/
pathelement location=${jmx.jar}/
@@ -91,7 +94,7 @@
/path
path id=compile.classpath.tomcat33
pathelement location=${build.home}/classes/
-pathelement location=../util/build/classes/
+pathelement location=${util.home}/build/classes/
pathelement location=${tomcat33.home}/lib/container/container_util.jar/
pathelement location=${tomcat33.home}/lib/container/tomcat_modules.jar/
pathelement location=${tomcat33.home}/lib/common/tomcat_core.jar/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote build.xml
larryi 2003/02/16 17:48:08
Modified:coyote Tag: coyote_10 build.xml
Log:
Allow some independence from the version of util.
Revision ChangesPath
No revision
No revision
1.16.2.1 +6 -3 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -r1.16 -r1.16.2.1
--- build.xml 11 Jan 2003 00:03:01 - 1.16
+++ build.xml 17 Feb 2003 01:48:08 - 1.16.2.1
@@ -21,6 +21,9 @@
!-- The directories corresponding to your necessary dependencies --
property name=junit.home value=/usr/local/junit3.5/
+ !-- Dependencies within jakarta-tomcat-connectors --
+ property name=util.home value=../util/
+
!-- == Derived Values --
@@ -77,7 +80,7 @@
!-- Construct compile classpath --
path id=compile.classpath
pathelement location=${build.home}/classes/
-pathelement location=../util/build/classes/
+pathelement location=${util.home}/build/classes/
pathelement location=${jmx.jar}/
pathelement location=${tomcat-util.jar}/
pathelement location=${catalina.home}/server/lib/catalina.jar/
@@ -85,7 +88,7 @@
/path
path id=compile.classpath.tomcat33
pathelement location=${build.home}/classes/
-pathelement location=../util/build/classes/
+pathelement location=${util.home}/build/classes/
pathelement location=${tomcat33.home}/lib/container/container_util.jar/
pathelement location=${tomcat33.home}/lib/container/tomcat_modules.jar/
pathelement location=${tomcat33.home}/lib/common/tomcat_core.jar/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote build.xml
remm2003/01/16 14:05:04
Modified:coyote build.xml
Log:
- Include memory adapter.
Revision ChangesPath
1.17 +2 -1 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 11 Jan 2003 00:03:01 - 1.16
+++ build.xml 16 Jan 2003 22:05:04 - 1.17
@@ -220,6 +220,7 @@
manifest=${conf.home}/MANIFEST.MF
excludes=**/tomcat3/*
include name=org/apache/coyote/*.class /
+ include name=org/apache/coyote/memory/*.class /
include name=org/apache/coyote/tomcat5/** /
/jar
/target
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote build.xml
remm2003/01/16 14:11:48
Modified:coyote build.xml
Log:
- Add needed JARs.
Revision ChangesPath
1.18 +3 -1 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- build.xml 16 Jan 2003 22:05:04 - 1.17
+++ build.xml 16 Jan 2003 22:11:48 - 1.18
@@ -78,6 +78,8 @@
path id=compile.classpath
pathelement location=${build.home}/classes/
pathelement location=../util/build/classes/
+pathelement location=${commons-logging.jar}/
+pathelement location=${commons-modeler.jar}/
pathelement location=${jmx.jar}/
pathelement location=${tomcat-util.jar}/
pathelement location=${catalina.home}/server/lib/catalina.jar/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote build.xml
costin 2003/01/16 14:31:01
Modified:coyote build.xml
Log:
Add commons-modeler.
Revision ChangesPath
1.19 +5 -1 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.xml 16 Jan 2003 22:11:48 - 1.18
+++ build.xml 16 Jan 2003 22:31:00 - 1.19
@@ -29,6 +29,10 @@
property name=tomcat-util.jar value=../util/build/lib/tomcat-util.jar/
property name=junit.jarvalue=${junit.home}/junit.jar/
+ property name=commons-modeler.jar
location=../../jakarta-commons/modeler/dist/commons-modeler.jar /
+
+ property name=jmx.jar location=../lib/mx4j.jar /
+
!-- == Component Declarations --
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote build.xml
costin 2003/01/10 16:03:01
Modified:coyote build.xml
Log:
Add the jmx dependency.
Add a separate target that just builds for tomcat5, to avoid
all the detection.
Revision ChangesPath
1.16 +12 -1 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml 6 Jan 2003 18:35:20 - 1.15
+++ build.xml 11 Jan 2003 00:03:01 - 1.16
@@ -78,6 +78,7 @@
path id=compile.classpath
pathelement location=${build.home}/classes/
pathelement location=../util/build/classes/
+pathelement location=${jmx.jar}/
pathelement location=${tomcat-util.jar}/
pathelement location=${catalina.home}/server/lib/catalina.jar/
pathelement location=${servlet.jar}/
@@ -211,6 +212,16 @@
copytodir=${build.home}/classes filtering=on
fileset dir=${source.home} excludes=**/*.java/
/copy
+ /target
+
+ target name=jar.tomcat5 depends=compile.shared,compile.tomcat5
+jar jarfile=${tomcat-coyote.jar}
+ basedir=${build.home}/classes
+ manifest=${conf.home}/MANIFEST.MF
+ excludes=**/tomcat3/*
+ include name=org/apache/coyote/*.class /
+ include name=org/apache/coyote/tomcat5/** /
+/jar
/target
target name=compile.tomcat4 if=tomcat4.detect
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote build.xml
remm2003/01/06 10:35:20
Modified:coyote build.xml
Log:
- Fix javadoc task.
Revision ChangesPath
1.15 +2 -2 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 13 Aug 2002 15:41:02 - 1.14
+++ build.xml 6 Jan 2003 18:35:20 - 1.15
@@ -287,7 +287,7 @@
description=Create component Javadoc documentation
javadoc sourcepath=${source.home}
destdir=${build.home}/docs/api
- packagenames=org.apache.coyote.*
+ packagenames=org.apache.coyote
author=true
private=true
version=true
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote build.xml
remm2002/08/13 08:41:02
Modified:coyote build.xml
Log:
- Use servlet.jar property.
Revision ChangesPath
1.14 +7 -4 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 9 Aug 2002 16:24:22 - 1.13
+++ build.xml 13 Aug 2002 15:41:02 - 1.14
@@ -71,13 +71,16 @@
property name=catalina.home
location=../../jakarta-tomcat-4.0/build /
+property name=servlet.jar
+ value=${catalina.home}/common/lib/servlet.jar /
+
!-- Construct compile classpath --
path id=compile.classpath
pathelement location=${build.home}/classes/
pathelement location=../util/build/classes/
pathelement location=${tomcat-util.jar}/
pathelement location=${catalina.home}/server/lib/catalina.jar/
-pathelement location=${catalina.home}/common/lib/servlet.jar/
+pathelement location=${servlet.jar}/
/path
path id=compile.classpath.tomcat33
pathelement location=${build.home}/classes/
@@ -149,7 +152,7 @@
available file=${catalina.home}/server/lib/catalina.jar /
available
classname=javax.servlet.ServletRequestEvent
- classpath=${catalina.home}/common/lib/servlet.jar
+ classpath=${servlet.jar}
/
/and
/condition
@@ -159,7 +162,7 @@
not
available
classname=javax.servlet.ServletRequestEvent
-classpath=${catalina.home}/common/lib/servlet.jar
+classpath=${servlet.jar}
/
/not
/and
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote build.xml
larryi 2002/08/09 05:55:02
Modified:coyote build.xml
Log:
Exclude tomcat5 from compile.shared too.
Revision ChangesPath
1.12 +2 -1 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 4 Aug 2002 19:39:49 - 1.11
+++ build.xml 9 Aug 2002 12:55:01 - 1.12
@@ -185,6 +185,7 @@
deprecation=${compile.deprecation}
optimize=${compile.optimize}
classpath refid=compile.classpath/
+ exclude name=org/apache/coyote/tomcat5/** /
exclude name=org/apache/coyote/tomcat4/** /
exclude name=org/apache/coyote/tomcat3/** /
/javac
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote build.xml
patrickl2002/08/09 09:24:22
Modified:coyote build.xml
Log:
A change made last night to coyote/build.xml stopped the tomcat5 directory of coyote
from building. This change fixes this. (Thanks to Ryan Lubke for pointing this out.)
Submitted by: Bob Herrmann ([EMAIL PROTECTED])
Revision ChangesPath
1.13 +2 -2 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 9 Aug 2002 12:55:01 - 1.12
+++ build.xml 9 Aug 2002 16:24:22 - 1.13
@@ -241,7 +241,7 @@
/target
target name=compile
- depends=static,report,compile.shared,compile.tomcat4,compile.tomcat33
+
depends=static,report,compile.shared,compile.tomcat5,compile.tomcat4,compile.tomcat33
description=Compile Coyote and its Adapters
jarjarfile=${build.home}/lib/tomcat-${component.name}.jar
basedir=${build.home}/classes
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote build.xml
remm2002/06/24 12:32:39
Modified:coyote build.xml
Log:
- Revert change (that would require having TC 3.3 to build the HTTP/1.1
protocol handler).
Revision ChangesPath
1.10 +6 -6 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 19 Jun 2002 18:21:24 - 1.9
+++ build.xml 24 Jun 2002 19:32:39 - 1.10
@@ -200,11 +200,6 @@
copytodir=${build.home}/classes filtering=on
fileset dir=${source.home} excludes=**/*.java/
/copy
-jarjarfile=${build.home}/lib/tomcat33-${component.name}.jar
-basedir=${build.home}/classes
- manifest=${build.home}/conf/MANIFEST.MF
- includes=org/apache/coyote/**
-excludes=**/tomcat4/* /
/target
target name=compile
@@ -215,6 +210,11 @@
manifest=${build.home}/conf/MANIFEST.MF
includes=org/apache/coyote/**
excludes=**/tomcat3/* /
+jarjarfile=${build.home}/lib/tomcat33-${component.name}.jar
+basedir=${build.home}/classes
+ manifest=${build.home}/conf/MANIFEST.MF
+ includes=org/apache/coyote/**
+excludes=**/tomcat4/* /
/target
target name=compile.tests depends=compile
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote build.xml
larryi 02/04/15 03:45:12
Modified:coyote build.xml
Log:
Fix name of container utilities jar. Remve jtc.jar since I don't see where
it is created
Revision ChangesPath
1.8 +2 -3 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 5 Apr 2002 19:11:05 - 1.7
+++ build.xml 15 Apr 2002 10:45:12 - 1.8
@@ -3,7 +3,7 @@
!--
Coyote connector framework for Jakarta Tomcat
-$Id: build.xml,v 1.7 2002/04/05 19:11:05 costin Exp $
+$Id: build.xml,v 1.8 2002/04/15 10:45:12 larryi Exp $
--
@@ -82,8 +82,7 @@
path id=compile.classpath.tomcat33
pathelement location=${build.home}/classes/
pathelement location=../util/build/classes/
-pathelement location=${tomcat33.home}/lib/container/tomcat_util.jar/
-pathelement location=${tomcat33.home}/lib/container/jtc.jar/
+pathelement location=${tomcat33.home}/lib/container/container_util.jar/
pathelement location=${tomcat33.home}/lib/container/tomcat_modules.jar/
pathelement location=${tomcat33.home}/lib/common/tomcat_core.jar/
pathelement location=${tomcat33.home}/lib/common/core_util.jar/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote build.xml
costin 02/04/05 11:11:05
Modified:.build.xml
coyote build.xml
Log:
Few small fixes.
I build all the stuff in one jar for easier testing. I'm also experimenting
with the order and with removing util from 3.3.
Revision ChangesPath
1.2 +11 -0 jakarta-tomcat-connectors/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 4 Apr 2002 20:25:03 - 1.1
+++ build.xml 5 Apr 2002 19:11:05 - 1.2
@@ -25,4 +25,15 @@
/jar
/target
+
+ target name=clean
+ description=Compile Coyote and all related protocols
+ant dir=util target=clean /
+ant dir=coyote target=clean /
+ant dir=http11 target=clean/
+ant dir=jk target=clean /
+
+delete file=jtc.jar /
+ /target
+
/project
1.7 +5 -2 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 10 Mar 2002 06:15:47 - 1.6
+++ build.xml 5 Apr 2002 19:11:05 - 1.7
@@ -3,7 +3,7 @@
!--
Coyote connector framework for Jakarta Tomcat
-$Id: build.xml,v 1.6 2002/03/10 06:15:47 billbarker Exp $
+$Id: build.xml,v 1.7 2002/04/05 19:11:05 costin Exp $
--
@@ -74,15 +74,19 @@
!-- Construct compile classpath --
path id=compile.classpath
pathelement location=${build.home}/classes/
+pathelement location=../util/build/classes/
pathelement location=${tomcat-util.jar}/
pathelement location=${catalina.home}/server/lib/catalina.jar/
pathelement location=${catalina.home}/common/lib/servlet.jar/
/path
path id=compile.classpath.tomcat33
pathelement location=${build.home}/classes/
+pathelement location=../util/build/classes/
pathelement location=${tomcat33.home}/lib/container/tomcat_util.jar/
+pathelement location=${tomcat33.home}/lib/container/jtc.jar/
pathelement location=${tomcat33.home}/lib/container/tomcat_modules.jar/
pathelement location=${tomcat33.home}/lib/common/tomcat_core.jar/
+pathelement location=${tomcat33.home}/lib/common/core_util.jar/
/path
@@ -212,7 +216,6 @@
includes=org/apache/coyote/**
excludes=**/tomcat4/* /
/target
-
target name=compile.tests depends=compile
description=Compile unit test cases
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote build.xml
billbarker02/03/09 22:15:47
Modified:coyote build.xml
Log:
Update to allow us to build both the 4.x and the 3.3.x jars.
Revision ChangesPath
1.6 +35 -5 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 31 Jan 2002 18:42:29 - 1.5
+++ build.xml 10 Mar 2002 06:15:47 - 1.6
@@ -3,7 +3,7 @@
!--
Coyote connector framework for Jakarta Tomcat
-$Id: build.xml,v 1.5 2002/01/31 18:42:29 remm Exp $
+$Id: build.xml,v 1.6 2002/03/10 06:15:47 billbarker Exp $
--
@@ -35,7 +35,6 @@
!-- The name of this component --
property name=component.name value=coyote/
-
!-- The title of this component --
property name=component.title value=Coyote/
@@ -79,6 +78,12 @@
pathelement location=${catalina.home}/server/lib/catalina.jar/
pathelement location=${catalina.home}/common/lib/servlet.jar/
/path
+ path id=compile.classpath.tomcat33
+pathelement location=${build.home}/classes/
+pathelement location=${tomcat33.home}/lib/container/tomcat_util.jar/
+pathelement location=${tomcat33.home}/lib/container/tomcat_modules.jar/
+pathelement location=${tomcat33.home}/lib/common/tomcat_core.jar/
+ /path
!-- == Test Execution Defaults === --
@@ -106,8 +111,11 @@
target name=report-tc4 if=tomcat4.detect
echo message=Tomcat4 detected /
/target
+target name=report-tc33 if=tomcat33.detect
+ echo message=Tomcat3.3 detected /
+/target
-target name=report depends=report-tc4 /
+target name=report depends=report-tc4, report-tc33 /
!-- == Executable Targets --
@@ -131,6 +139,7 @@
mkdir dir=${build.home}/lib/
mkdir dir=${build.home}/tests/
available property=tomcat4.detect
file=${catalina.home}/server/lib/catalina.jar /
+available property=tomcat33.detect
file=${tomcat33.home}/lib/common/tomcat_core.jar /
/target
@@ -152,6 +161,7 @@
optimize=${compile.optimize}
classpath refid=compile.classpath/
exclude name=org/apache/coyote/tomcat4/** /
+ exclude name=org/apache/coyote/tomcat3/** /
/javac
copytodir=${build.home}/classes filtering=on
fileset dir=${source.home} excludes=**/*.java/
@@ -173,14 +183,34 @@
fileset dir=${source.home} excludes=**/*.java/
/copy
/target
+ target name=compile.tomcat33 if=tomcat33.detect
+ description=Compile Tomcat 3.3.x Adapter
+javac srcdir=${source.home}
+ destdir=${build.home}/classes
+ debug=${compile.debug}
+ deprecation=${compile.deprecation}
+ optimize=${compile.optimize}
+ classpath refid=compile.classpath.tomcat33/
+ include name=org/apache/coyote/tomcat3/** /
+/javac
+copytodir=${build.home}/classes filtering=on
+ fileset dir=${source.home} excludes=**/*.java/
+/copy
+ /target
target name=compile
- depends=static,report,compile.shared,compile.tomcat4
+ depends=static,report,compile.shared,compile.tomcat4,compile.tomcat33
description=Compile Coyote and its Adapters
jarjarfile=${build.home}/lib/tomcat-${component.name}.jar
basedir=${build.home}/classes
manifest=${build.home}/conf/MANIFEST.MF
- includes=org/apache/coyote/** /
+ includes=org/apache/coyote/**
+excludes=**/tomcat3/* /
+jarjarfile=${build.home}/lib/tomcat33-${component.name}.jar
+basedir=${build.home}/classes
+ manifest=${build.home}/conf/MANIFEST.MF
+ includes=org/apache/coyote/**
+excludes=**/tomcat4/* /
/target
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote build.xml
remm01/12/04 12:27:55
Modified:coyote build.xml
Log:
- Add a placeholder for the Catalina adapter.
Revision ChangesPath
1.3 +49 -3 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 2001/09/17 17:35:12 1.2
+++ build.xml 2001/12/04 20:27:55 1.3
@@ -3,7 +3,7 @@
!--
Coyote connector framework for Jakarta Tomcat
-$Id: build.xml,v 1.2 2001/09/17 17:35:12 remm Exp $
+$Id: build.xml,v 1.3 2001/12/04 20:27:55 remm Exp $
--
@@ -66,10 +66,18 @@
!-- Should Java compilations set the 'optimize' compiler option? --
property name=compile.optimizevalue=true/
+!-- default locations --
+property name=tomcat33.home
+ location=../../jakarta-tomcat/build/tomcat /
+property name=catalina.home
+ location=../../jakarta-tomcat-4.0/build /
+
!-- Construct compile classpath --
path id=compile.classpath
pathelement location=${build.home}/classes/
pathelement location=${tomcat-util.jar}/
+pathelement location=${catalina.home}/server/lib/catalina.jar/
+pathelement location=${catalina.home}/common/lib/servlet.jar/
/path
@@ -92,6 +100,16 @@
property name=test.entry value=org.apache.coyote.TestAll/
+!-- == Detection and Reports = --
+
+
+target name=report-tc4 if=tomcat4.detect
+ echo message=Tomcat4 detected /
+/target
+
+target name=report depends=report-tc4 /
+
+
!-- == Executable Targets --
@@ -112,6 +130,7 @@
mkdir dir=${build.home}/docs/api/
mkdir dir=${build.home}/lib/
mkdir dir=${build.home}/tests/
+available property=tomcat4.detect
file=${catalina.home}/server/lib/catalina.jar /
/target
@@ -124,7 +143,7 @@
/target
- target name=compile depends=static,javadoc
+ target name=compile.shared
description=Compile shareable components
javac srcdir=${source.home}
destdir=${build.home}/classes
@@ -132,13 +151,40 @@
deprecation=${compile.deprecation}
optimize=${compile.optimize}
classpath refid=compile.classpath/
+ exclude name=org/apache/coyote/tomcat4/** /
/javac
copytodir=${build.home}/classes filtering=on
fileset dir=${source.home} excludes=**/*.java/
/copy
jarjarfile=${build.home}/lib/tomcat-${component.name}.jar
+basedir=${build.home}/classes
+ manifest=${build.home}/conf/MANIFEST.MF
+ excludes=org/apache/coyote/tomcat4/** /
+ /target
+
+
+ target name=compile.tomcat4 if=tomcat4.detect
+ description=Compile Tomcat 4.x Adapter
+javac srcdir=${source.home}
+ destdir=${build.home}/classes
+ debug=${compile.debug}
+ deprecation=${compile.deprecation}
+ optimize=${compile.optimize}
+ classpath refid=compile.classpath/
+ include name=org/apache/coyote/tomcat4/** /
+/javac
+copytodir=${build.home}/classes filtering=on
+ fileset dir=${source.home} excludes=**/*.java/
+/copy
+jarjarfile=${build.home}/lib/tomcat-${component.name}-catalina.jar
basedir=${build.home}/classes
- manifest=${build.home}/conf/MANIFEST.MF/
+ manifest=${build.home}/conf/MANIFEST.MF
+ includes=org/apache/coyote/tomcat4/** /
+ /target
+
+ target name=compile
+ depends=static,javadoc,report,compile.shared,compile.tomcat4
+ description=Compile Coyote and its Adapters
/target
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
