cvs commit: jakarta-tomcat-connectors/webapp build.xml
yoavs 2004/08/29 11:14:18
Modified:jk build.xml
naming build.xml
util build.xml
webapp build.xml
Log:
Made compile.debug and compile.deprecation consistent and used in all javac tasks.
Revision ChangesPath
1.76 +6 -4 jakarta-tomcat-connectors/jk/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- build.xml 16 Jun 2004 18:05:05 - 1.75
+++ build.xml 29 Aug 2004 18:14:17 - 1.76
@@ -20,7 +20,8 @@
!-- Compile options --
property name=optimize value=off /
-property name=debug value=on /
+property name=compile.debug value=true /
+property name=compile.deprecation value=false /
!-- default locations, overrident by properties --
property name=base.path location=/usr/share/java/
@@ -170,8 +171,8 @@
description=Build java side of the connector
javac srcdir=java
destdir=${jk.build}/classes
- deprecation=off
- debug=${debug}
+ deprecation=${compile.deprecation}
+ debug=${compile.debug}
optimize=${optimize}
verbose=off
exclude name=org/apache/ajp/** if=tomcat5.detect/
@@ -248,7 +249,8 @@
mkdir dir=${jk.build}/lib/
javac srcdir=jkant/java
destdir=${jk.build}/classes
-debug=${debug}
+debug=${compile.debug}
+ deprecation=${compile.deprecation}
optimize=${optimize}
verbose=off
/javac
1.4 +2 -2 jakarta-tomcat-connectors/naming/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/naming/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 26 Feb 2003 18:52:11 - 1.3
+++ build.xml 29 Aug 2004 18:14:17 - 1.4
@@ -38,8 +38,8 @@
mkdir dir=${naming.build.dir}/classes/
javac srcdir=src
destdir=${naming.build.dir}/classes
- deprecation=off
- debug=${debug}
+ deprecation=${compile.deprecation}
+ debug=${compile.debug}
optimize=${optimize}
verbose=off
exclude name=org/apache/ajp/tomcat4/** unless=tomcat40.detect/
1.28 +2 -2 jakarta-tomcat-connectors/util/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/util/build.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- build.xml 23 Jul 2004 22:43:48 - 1.27
+++ build.xml 29 Aug 2004 18:14:17 - 1.28
@@ -59,8 +59,8 @@
echo message=-- JDK14 = ${jdk1.4.present}/
javac srcdir=java
destdir=${tomcat-util.build}/classes
-deprecation=off
-debug=on
+deprecation=${compile.deprecation}
+debug=${compile.debug}
optimize=off
verbose=off
excludes=**/CVS/**
1.15 +3 -1 jakarta-tomcat-connectors/webapp/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 21 Aug 2002 14:33:48 - 1.14
+++ build.xml 29 Aug 2004 18:14:18 - 1.15
@@ -133,7 +133,9 @@
!-- Compile our sources --
javac
srcdir=${source.java}
-destdir=${build.classes}
+destdir=${build.classes}
+debug=${compile.debug}
+deprecation=${compile.deprecation}
classpath refid=classpath/
/javac
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp build.xml
bobh2002/08/21 07:33:48
Modified:webapp build.xml
Log:
fix for bug 11895. Namely Tomcat4.x uses servlet.jar, Tomcat5.x uses servlet-api.jar
Revision ChangesPath
1.14 +1 -0 jakarta-tomcat-connectors/webapp/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 14 Aug 2002 20:54:57 - 1.13
+++ build.xml 21 Aug 2002 14:33:48 - 1.14
@@ -30,6 +30,7 @@
path id=classpath
pathelement location=${build.classes.dir}/
pathelement location=${catalina.home}/server/lib/catalina.jar/
+pathelement location=${catalina.home}/common/lib/servlet.jar/
pathelement location=${catalina.home}/common/lib/servlet-api.jar/
/path
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp build.xml
bobh2002/08/14 13:54:58
Modified:webapp build.xml
Log:
- servlet.jar changed to servlet-api.jar
Revision ChangesPath
1.13 +1 -1 jakarta-tomcat-connectors/webapp/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 14 May 2002 22:15:30 - 1.12
+++ build.xml 14 Aug 2002 20:54:57 - 1.13
@@ -30,7 +30,7 @@
path id=classpath
pathelement location=${build.classes.dir}/
pathelement location=${catalina.home}/server/lib/catalina.jar/
-pathelement location=${catalina.home}/common/lib/servlet.jar/
+pathelement location=${catalina.home}/common/lib/servlet-api.jar/
/path
!-- === PREPARATION AND GLOBAL TASKS --
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp build.xml
remm02/05/14 13:48:30 Modified:webapp build.xml Log: - Fix the build (again). Revision ChangesPath 1.10 +3 -0 jakarta-tomcat-connectors/webapp/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/build.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- build.xml 14 May 2002 00:20:21 - 1.9 +++ build.xml 14 May 2002 20:48:30 - 1.10 @@ -34,6 +34,9 @@ /path + target name=clean + /target + !-- === PREPARATION AND GLOBAL TASKS -- target -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/webapp build.xml
[EMAIL PROTECTED] [EMAIL PROTECTED] wrote: remm02/05/14 13:48:30 Modified:webapp build.xml Log: - Fix the build (again). Thanks remy.. Was about to fix it tonight... Pier -- I think that it's extremely foolish to name a server after the current U.S. President. B.W. Fitzpatrick -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp build.xml
pier02/05/14 15:15:31
Modified:webapp build.xml
Log:
Added some real clean targets.
Revision ChangesPath
1.12 +35 -1 jakarta-tomcat-connectors/webapp/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 14 May 2002 22:06:20 - 1.11
+++ build.xml 14 May 2002 22:15:30 - 1.12
@@ -84,7 +84,9 @@
Clean up all we generated using ANT (and nothing more)
--
target
- name=clean/
+ name=clean
+ description=Clean up what we built
+ depends=compile.clean,docs.clean,javadoc.clean/
!-- === COMPILATION TASKS === --
@@ -104,6 +106,17 @@
/target
!--
+Delete the generated classes and JAR file.
+ --
+ target
+ name=compile.clean
+ description=Clean up the JAR file and all classes
+delete file=${build.jar}/
+delete dir=${build.classes}/
+ /target
+
+
+ !--
Create the directory where classes will be compiled into, then compile
our sources, copy over all non-java files, and build up the final JAR.
--
@@ -156,6 +169,18 @@
fail message=Cannot find the Apache Xalan XSLT processor/
/target
+ !--
+Delete the generated documentation
+ --
+ target
+ name=docs.clean
+ description=Clean up the generated docs directory
+delete dir=${build.docs}/
+ /target
+
+ !--
+Generate documentation from the XML sources.
+ --
target
name=docs
depends=docs.check
@@ -198,6 +223,15 @@
!-- Just output a simple warning message --
echo message=Cannot find Tomcat 4.0. Warnings in JavaDOC are ok/
+ /target
+
+ !--
+Delete the generated JavaDOC output
+ --
+ target
+ name=javadoc.clean
+ description=Clean up the generated javadoc directory
+delete dir=${build.javadoc}/
/target
!--
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp build.xml
pier02/05/13 16:26:35
Modified:webapp build.xml
Log:
Now, this is how I like it (well indented AND commented).
Revision ChangesPath
1.8 +183 -211 jakarta-tomcat-connectors/webapp/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 13 May 2002 00:18:36 - 1.7
+++ build.xml 13 May 2002 23:26:35 - 1.8
@@ -1,249 +1,221 @@
-project name=Webapp default=compile basedir=.
+?xml version=1.0?
+project name=Webapp Module default=all basedir=.
-!--
-Coyote connector framework for Jakarta Tomcat
-$Id: build.xml,v 1.7 2002/05/13 00:18:36 pier Exp $
---
+!-- === BUILD ENVIRONMENT === --
+ !-- ANT FIX: basedir is alwats relative to build.xml --
+ property name=basedirvalue=${basedir}/
+ property name=targdirvalue=${user.dir}/
-!-- == Initialize Properties = --
+ !-- The properties file which will override what's written below --
+ property file=${targdir}/build.properties/
+ !-- The WebApp version string --
+ property name=versionvalue=unknown/
- property file=build.properties/!-- Component local --
- property file=../build.properties/ !-- Commons local --
- property file=${user.home}/build.properties/ !-- User local--
+ !-- The layout of the build directory (shared with Makefile(s) --
+ property name=build.home value=${targdir}/build/
+ property name=build.jar value=${build.home}/tomcat-warp.jar/
+ property name=build.classes value=${build.home}/classes/
+ property name=build.docs value=${build.home}/docs/
+ property name=build.javadoc value=${build.home}/api-java/
+ !-- The layout of the sources directory --
+ property name=source.homevalue=${basedir}/
+ property name=source.javavalue=${source.home}/java/
+ property name=source.docsvalue=${source.home}/docs/
-!-- == External Dependencies = --
-
-
- !-- The directories corresponding to your necessary dependencies --
- property name=junit.home value=/usr/local/junit3.5/
-
-
-!-- == Derived Values --
-
-
- !-- The locations of necessary jar files --
- property name=tomcat-util.jar value=../util/build/lib/tomcat-util.jar/
- property name=junit.jarvalue=${junit.home}/junit.jar/
-
-
-!-- == Component Declarations --
-
-
- !-- The name of this component --
- property name=component.name value=webapp/
-
- !-- The title of this component --
- property name=component.title value=Webapp/
-
- !-- The current version number of this component --
- property name=component.version value=1.0/
-
- !-- The base directory for compilation targets --
- property name=build.home value=build/
-
- !-- The base directory for component configuration files --
- property name=conf.home value=conf/
-
- !-- The base directory for component sources --
- property name=source.home value=java/
-
- !-- The base directory for unit test sources --
- property name=test.home value=test/
-
-!-- == Compiler Defaults = --
-
-
- !-- Should Java compilations set the 'debug' compiler option? --
- property name=compile.debug value=true/
-
- !-- Should Java compilations set the 'deprecation' compiler option? --
- property name=compile.deprecation value=false/
-
- !-- 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}/
+ !-- Classpath where we need to find stuff (no matter what) --
+ path id=classpath
+pathelement location=${build.classes.dir}/
pathelement location=${catalina.home}/server/lib/catalina.jar/
pathelement location=${catalina.home}/common/lib/servlet.jar/
/path
-!-- == Test Execution Defaults === --
-
-
- !-- Construct unit test classpath --
- path id=test.classpath
-
cvs commit: jakarta-tomcat-connectors/webapp build.xml
pier02/05/13 17:20:21
Modified:webapp build.xml
Log:
Split the prepare part (it's just nicer both when running ant from
make and when running it standalone)
Revision ChangesPath
1.9 +10 -5 jakarta-tomcat-connectors/webapp/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 13 May 2002 23:26:35 - 1.8
+++ build.xml 14 May 2002 00:20:21 - 1.9
@@ -36,6 +36,16 @@
!-- === PREPARATION AND GLOBAL TASKS --
+ target
+ name=init
+ description=Dump some messages for Make
+
+!-- Dump some messages about what we're going to do --
+echo message=Building ${ant.project.name} (version ${version})/
+echo message=- source path: ${basedir}/
+echo message=- target path: ${targdir}/
+ /target
+
!--
Prepare the build directory creating all its subdirectories
and check for Tomcat 4 and Xalan in the classpath
@@ -43,11 +53,6 @@
target
name=prepare
description=Prepare the build tree and check classes
-
-!-- Dump some messages about what we're going to do --
-echo message=Building ${ant.project.name} (version ${version})/
-echo message=- source path: ${basedir}/
-echo message=- target path: ${targdir}/
!-- Create some directories --
mkdir dir=${build.home}/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp build.xml
pier02/05/12 17:18:36 Modified:webapp build.xml Log: Don't copy the images originals directory. Revision ChangesPath 1.7 +2 -1 jakarta-tomcat-connectors/webapp/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/build.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- build.xml 10 May 2002 01:16:38 - 1.6 +++ build.xml 13 May 2002 00:18:36 - 1.7 @@ -3,7 +3,7 @@ !-- Coyote connector framework for Jakarta Tomcat -$Id: build.xml,v 1.6 2002/05/10 01:16:38 pier Exp $ +$Id: build.xml,v 1.7 2002/05/13 00:18:36 pier Exp $ -- @@ -210,6 +210,7 @@ exclude name=**.xml/ exclude name=**.xsl/ exclude name=**.idx/ +exclude name=**/images/originals/**/ /fileset /copy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp build.xml
pier02/05/09 18:16:38
Modified:webapp build.xml
Log:
Committing change to rename tomcat-webapp.jar to tomcat-warp.jar as
posted last week on the mailing list.
(still need to hammer down this file reducing it to a manageable state)
Revision ChangesPath
1.6 +2 -2 jakarta-tomcat-connectors/webapp/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 5 May 2002 03:30:42 - 1.5
+++ build.xml 10 May 2002 01:16:38 - 1.6
@@ -3,7 +3,7 @@
!--
Coyote connector framework for Jakarta Tomcat
-$Id: build.xml,v 1.5 2002/05/05 03:30:42 pier Exp $
+$Id: build.xml,v 1.6 2002/05/10 01:16:38 pier Exp $
--
@@ -158,7 +158,7 @@
copytodir=${build.home}/classes filtering=on
fileset dir=${source.home} excludes=**/*.java/
/copy
-jarjarfile=${build.home}/lib/tomcat-${component.name}.jar
+jarjarfile=${build.home}/lib/tomcat-warp.jar
basedir=${build.home}/classes /
/target
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp build.xml
pier02/05/04 19:02:17
Modified:webapp build.xml
Log:
Added the docs target to build.xml (still have to modify it A LOT).
This file is a mess.
Revision ChangesPath
1.3 +20 -2 jakarta-tomcat-connectors/webapp/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 31 Jan 2002 18:47:43 - 1.2
+++ build.xml 5 May 2002 02:02:17 - 1.3
@@ -3,7 +3,7 @@
!--
Coyote connector framework for Jakarta Tomcat
-$Id: build.xml,v 1.2 2002/01/31 18:47:43 remm Exp $
+$Id: build.xml,v 1.3 2002/05/05 02:02:17 pier Exp $
--
@@ -203,6 +203,24 @@
/javadoc
/target
+ target name=docs depends=prepare
+copy todir=${build.home}/docs
+ fileset dir=./docs
+exclude name=**.xml/
+exclude name=**.xsl/
+exclude name=**.idx/
+ /fileset
+/copy
+
+style
+ basedir=./docs
+ destdir=${build.home}/docs
+ style=./docs/style.xsl
+ includes=**.xml
+/
+ /target
+
+
!-- == Unit Test Targets = --
@@ -226,4 +244,4 @@
/target
-/project
\ No newline at end of file
+/project
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
