cvs commit: jakarta-tomcat-5 build2.xml
costin 2002/10/28 11:27:53 Removed: .build2.xml Log: Remove the experimental file, all relevant logic has been merged. Use 'ant build' to do a quick(er) build ( that uses the original ant files ! ). The 'run' target is merged into catalina.xml next to launcher. -- 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-5 build2.xml
costin 2002/10/14 10:00:09
Modified:.build2.xml
Log:
Update for the recent changes.
Revision ChangesPath
1.6 +3 -20 jakarta-tomcat-5/build2.xml
Index: build2.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build2.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build2.xml20 Aug 2002 19:02:40 - 1.5
+++ build2.xml14 Oct 2002 17:00:09 - 1.6
@@ -6,6 +6,7 @@
!-- See build.properties.sample in the top level directory for all --
!-- property values you must customize for successful building!!!--
+
property file=${user.home}/build.properties/
property file=build.properties/
property file=build.properties.default/
@@ -47,7 +48,7 @@
pathelement location=${activation.jar}/
pathelement location=${jta.jar}/
-pathelement location=${optit.jar}/
+pathelement location=${jasper.home}/lib/jsp20el.jar/
/path
patternset id=static.res
@@ -98,7 +99,7 @@
path location=${commons.home}/logging/src/java /
path location=${commons.home}/discovery/src/java /
/src
- exclude name=org/apache/tomcat/util/net/PureTLS* /
+ exclude name=org/apache/tomcat/util/net/puretls/PureTLS* /
exclude name=org/apache/commons/logging/impl/LogKitLogger.java /
exclude name=org/apache/commons/modeler/impl/IntrospectionModeler.java /
@@ -282,24 +283,6 @@
/target
target name=discovery
-path id=discoveryCP
- path refid=alljars/
- path refid=jasperjars/
- pathelement location=${build.dir}/classes/
- pathelement location=${ant.home}/lib/xercesImpl.jar/
- pathelement location=${ant.home}/lib/xml-apis.jar/
- pathelement location=${ant.home}/lib/ant.jar/
- pathelement location=${tools.jar}/
- pathelement location=/usr/share/java/xalan-j_2_3_1/bin/xercesImpl.jar/
- /path
-
-taskdef name=discovery
- classname=org.apache.commons.discovery.ServiceDiscoveryTask
- classpathref=discoveryCP/
-
-discovery debug=1 id=myDiscovery
- serviceName=javax.xml.parsers.SAXParserFactory /
-echo message=Found ${jxpath:/references[@name='myDiscovery']} /
/target
target name=jdepend description=Document the dependency graph
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build2.xml
costin 2002/08/20 12:02:40
Modified:.build2.xml
Log:
Update the paths for servletapi.
rename 'checkout' to update.
Add discovery and a small test for it.
Revision ChangesPath
1.5 +44 -15jakarta-tomcat-5/build2.xml
Index: build2.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build2.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build2.xml10 Aug 2002 16:32:10 - 1.4
+++ build2.xml20 Aug 2002 19:02:40 - 1.5
@@ -10,8 +10,8 @@
property file=build.properties/
property file=build.properties.default/
- property name=basedir location=. /
-
+ property name=basedir location=./
+
!-- Source dependencies --
property name=api.home
value=${basedir}/../jakarta-servletapi-5/
@@ -31,7 +31,8 @@
property name=build.dir value=${basedir}/build/
property name=log4j.jar value=${base.path}/log4j/log4j.jar/
-
+
+
path id=alljars
pathelement location=${jmx.jar}/
@@ -95,6 +96,7 @@
path location=${commons.home}/collections/src/java /
path location=${commons.home}/beanutils/src/java /
path location=${commons.home}/logging/src/java /
+path location=${commons.home}/discovery/src/java /
/src
exclude name=org/apache/tomcat/util/net/PureTLS* /
exclude name=org/apache/commons/logging/impl/LogKitLogger.java /
@@ -103,6 +105,9 @@
!-- Fail with GCJ --
exclude name=org/apache/commons/collections/DoubleOrderedMap.java /
exclude name=org/apache/tomcat/util/log/CommonLogHandler.java /
+
+ exclude name=org/apache/commons/discovery/D** /
+ exclude name=org/apache/commons/discovery/*/** /
/javac
copy toDir=${build.dir}/classes
fileset dir=${commons.home}/modeler/src/java
@@ -128,7 +133,8 @@
debug=on
classpathref=alljars
src
-path location=${api.home}/src/share /
+path location=${api.home}/jsr152/src/share /
+path location=${api.home}/jsr154/src/share /
path location=${catalina.home}/catalina/src/share /
path location=${jtc.home}/coyote/src/java /
path location=${jtc.home}/jk/java /
@@ -161,24 +167,25 @@
/copy
copy toDir=${build.dir}/classes
-fileset dir=${api.home}/src/share
+fileset dir=${api.home}/jsr154/src/share
+ include name=**/*.properties/
+/fileset
+fileset dir=${api.home}/jsr152/src/share
include name=**/*.properties/
/fileset
/copy
!-- Servlet/JSP resources - work around stupid src layout --
copy todir=${build.dir}/classes/javax/servlet/resources
-fileset dir=${api.home}/src/share/dtd
- include name=web-app**/
- include name=j2ee*.xsd/
- include name=xml.xsd/
+fileset dir=${api.home}/jsr154/src/share/dtd
+ include name=*.xsd/
+ include name=*.dtd/
/fileset
/copy
copy todir=${build.dir}/classes/javax/servlet/jsp/resources
- fileset dir=${api.home}/src/share/dtd
-include name=web-jsptaglibrary**/
-include name=jspxml**/
-include name=jsp*.xsd/
+ fileset dir=${api.home}/jsr152/src/share/dtd
+include name=*.xsd/
+include name=*.dtd/
/fileset
/copy
/target
@@ -252,8 +259,9 @@
path refid=alljars /
path refid=jasperjars /
pathelement location=${build.dir}/classes/
- pathelement location=${ant.home}/lib/xercesImpl.jar /
+ !-- pathelement location=${ant.home}/lib/xercesImpl.jar /
pathelement location=${ant.home}/lib/xml-apis.jar /
+ --
pathelement location=${ant.home}/lib/ant.jar /
pathelement location=${tools.jar} /
/path
@@ -273,6 +281,27 @@
echo message= Tomcat5 up and running
/
/target
+ target name=discovery
+path id=discoveryCP
+ path refid=alljars/
+ path refid=jasperjars/
+ pathelement location=${build.dir}/classes/
+ pathelement location=${ant.home}/lib/xercesImpl.jar/
+ pathelement location=${ant.home}/lib/xml-apis.jar/
+ pathelement location=${ant.home}/lib/ant.jar/
+ pathelement location=${tools.jar}/
+ pathelement location=/usr/share/java/xalan-j_2_3_1/bin/xercesImpl.jar/
+ /path
+
+taskdef name=discovery
+ classname=org.apache.commons.discovery.ServiceDiscoveryTask
+ classpathref=discoveryCP/
+
+discovery debug=1 id=myDiscovery
+ serviceName=javax.xml.parsers.SAXParserFactory /
+echo message=Found
cvs commit: jakarta-tomcat-5 build2.xml
costin 2002/08/10 09:32:10
Modified:.build2.xml
Log:
Added a checkout target ( used it more to update the workspaces )
Use the tomcat5 task. If you turn off wait you should see the
message ( and you can run tests, etc ).
The ant task returns when tomcat is completely started and listening.
Other minor changes ( optit.jar is from optimizeit, not needed to compile).
Update to match the current code.
Revision ChangesPath
1.4 +55 -15jakarta-tomcat-5/build2.xml
Index: build2.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build2.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build2.xml4 Aug 2002 03:48:50 - 1.3
+++ build2.xml10 Aug 2002 16:32:10 - 1.4
@@ -24,7 +24,7 @@
property name=catalina.home
value=${basedir}/../jakarta-tomcat-catalina/
property name=jasper.home
- value=${basedir}/../jakarta-tomcat-jasper-5/jasper2/
+ value=${basedir}/../jakarta-tomcat-jasper/jasper2/
property name=jtc.home
value=${basedir}/../jakarta-tomcat-connectors/
@@ -35,6 +35,9 @@
path id=alljars
pathelement location=${jmx.jar}/
+pathelement location=${jmx-tools.jar}/
+pathelement location=${log4j.jar}/
+
pathelement location=${mail.jar}/
pathelement location=${regexp.jar}/
pathelement location=${jsse.jar}/
@@ -42,7 +45,8 @@
pathelement location=${jcert.jar}/
pathelement location=${activation.jar}/
pathelement location=${jta.jar}/
-pathelement location=${log4j.jar}/
+
+pathelement location=${optit.jar}/
/path
patternset id=static.res
@@ -94,6 +98,7 @@
/src
exclude name=org/apache/tomcat/util/net/PureTLS* /
exclude name=org/apache/commons/logging/impl/LogKitLogger.java /
+ exclude name=org/apache/commons/modeler/impl/IntrospectionModeler.java /
!-- Fail with GCJ --
exclude name=org/apache/commons/collections/DoubleOrderedMap.java /
@@ -132,8 +137,10 @@
/src
exclude name=org/apache/ajp/** /
exclude name=org/apache/jasper/** /
+ exclude name=org/apache/coyote/tomcat4/** /
exclude name=org/apache/naming/factory/Tyrex* /
exclude name=org/apache/tomcat/ant/Tomcat3Precompiler.java /
+ exclude name=org/apache/catalina/launcher/** /
exclude name=org/apache/catalina/startup/BootstrapService.java /
/javac
@@ -150,6 +157,7 @@
fileset dir=${jtc.home}/jk/java
patternset refid=static.res /
/fileset
+ fileset dir=resources includes=log4j.properties/
/copy
copy toDir=${build.dir}/classes
@@ -161,13 +169,16 @@
!-- Servlet/JSP resources - work around stupid src layout --
copy todir=${build.dir}/classes/javax/servlet/resources
fileset dir=${api.home}/src/share/dtd
- include name=web-app*.dtd/
+ include name=web-app**/
+ include name=j2ee*.xsd/
+ include name=xml.xsd/
/fileset
/copy
copy todir=${build.dir}/classes/javax/servlet/jsp/resources
fileset dir=${api.home}/src/share/dtd
-include name=web-jsptaglibrary*.dtd/
-include name=jspxml.*/
+include name=web-jsptaglibrary**/
+include name=jspxml**/
+include name=jsp*.xsd/
/fileset
/copy
/target
@@ -237,21 +248,29 @@
target name=run
property name=tools.jar location=${java.home}/../lib/tools.jar /
-echo message=Tools.jar = ${tools.jar}/
-java classname=org.apache.catalina.startup.Catalina fork=true
- classpath location=${build.dir}/classes/
- classpath refid=alljars /
- classpath refid=jasperjars /
- classpath location=${ant.home}/lib/xercesImpl.jar /
- classpath location=${ant.home}/lib/xml-apis.jar /
- classpath location=${ant.home}/lib/ant.jar /
- classpath location=${java.home}/lib/rt.jar /
- classpath location=${tools.jar} /
+path id=tomcatcp
+ path refid=alljars /
+ path refid=jasperjars /
+ pathelement location=${build.dir}/classes/
+ pathelement location=${ant.home}/lib/xercesImpl.jar /
+ pathelement location=${ant.home}/lib/xml-apis.jar /
+ pathelement location=${ant.home}/lib/ant.jar /
+ pathelement location=${tools.jar} /
+/path
+
+taskdef name=tomcat5 classname=org.apache.catalina.startup.CatalinaService
+ classpathref=tomcatcp /
+tomcat5 do=start home=${build.dir} wait=true compiler=jikes/
+!--
+java classname=org.apache.catalina.startup.CatalinaService fork=false
+ classpath refid=tomcatcp /
arg value=start /
sysproperty
Re: cvs commit: jakarta-tomcat-5 build2.xml
On Sat, 03 Aug 2002 21:00:17 -0700, Patrick Luby wrote:
Costin,
If it helps, you can exclude org/apache/catalina/launcher/** from the
build if you are not using commons-launcher. This package is only used
by the Launcher's XML files and has no other packages depend on this
package.
It may be a good idea to move the ant tasks/types that you need from
sandbox into oac.launcher. I think they should be in either tomcat
or ant ( preferably).
Later on, after things stabilise we can propose it for commons proper.
Also, I noticed that you are compiling the ${taglibs.home}/standard/src
directory. If it helps, you don't need to do this as the expression
language classes are already compiled and checked into the
jakarta-tomcat-jasper/jasper2/lib/jsp20el.jar.
My goal was is have all the source that directly affects tomcat compiled.
Not necesarily complete gump-style, but at least 'our' code.
Costin
Patrick
[EMAIL PROTECTED] wrote:
costin 2002/08/03 20:48:50
Modified:.build2.xml
Log:
A more functional build file.
It now creates a fully functional tomcat ( there are few problems
with jasper tough ).
Also added a task that starts tomcat from ant - with 1.4 you need
fork=true ( I'll try to make few changes to ant classloader to avoid
this ).
I'm also trying 'everything in a jar' model - there are cases when
you don't need the complex hierarchy.
Note that the generated tomcat.jar is 2.8M, out of which 1.6 is
tomcat. That's not very bad - if we move backward compat stuff into
tomcat-compat and split some 'optional' functionality we can get well
bellow 1M.
( that includes tomcat33 code - i.e. 300k, most of it not used at the
moment, only some non-duplicated modules will be ported )
Revision ChangesPath
1.3 +120 -3jakarta-tomcat-5/build2.xml
Index: build2.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build2.xml,v retrieving revision
1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build2.xml 1 Aug 2002 20:31:15 - 1.2 +++ build2.xml 4 Aug
2002 03:48:50 -1.3 @@ -28,7 +28,7 @@
property name=jtc.home
value=${basedir}/../jakarta-tomcat-connectors/
- property name=build.dir value=${basedir}/build/tomcat5/
+ property name=build.dir value=${basedir}/build/
property name=log4j.jar
value=${base.path}/log4j/log4j.jar/
@@ -44,6 +44,14 @@
pathelement location=${jta.jar}/
pathelement location=${log4j.jar}/
/path
+
+ patternset id=static.res
+include name=**/*.properties / +include name=**/*.dtd
/
+include name=**/*.tld /
+include name=**/*.xsd /
+include name=**/*.xml /
+ /patternset
path id=jasperjars
pathelement location=${jaxen.jar}/
@@ -86,8 +94,25 @@
/src
exclude name=org/apache/tomcat/util/net/PureTLS* /
exclude
name=org/apache/commons/logging/impl/LogKitLogger.java /
- exclude name=org/apache/commons/modeler/Modeler.java / + +
!-- Fail with GCJ --
+ exclude
name=org/apache/commons/collections/DoubleOrderedMap.java / +
exclude name=org/apache/tomcat/util/log/CommonLogHandler.java /
/javac
+copy toDir=${build.dir}/classes + fileset
dir=${commons.home}/modeler/src/java +patternset
refid=static.res / + /fileset + fileset
dir=${jtc.home}/util/java +patternset refid=static.res
/ + /fileset + fileset
dir=${commons.home}/digester/src/java + patternset
refid=static.res / + /fileset + fileset
dir=${commons.home}/logging/src/java + patternset
refid=static.res / + /fileset +/copy
/target
target name=tomcat
@@ -111,6 +136,40 @@
exclude name=org/apache/tomcat/ant/Tomcat3Precompiler.java
/ exclude
name=org/apache/catalina/startup/BootstrapService.java /
/javac
+
+copy toDir=${build.dir}/classes + fileset
dir=${catalina.home}/catalina/src/share +patternset
refid=static.res / + /fileset + fileset
dir=${jtc.home}/coyote/src/java + patternset refid=static.res
/ + /fileset + fileset
dir=${jtc.home}/http11/src/java + patternset refid=static.res
/ + /fileset + fileset dir=${jtc.home}/jk/java +
patternset refid=static.res / + /fileset +/copy
+
+copy toDir=${build.dir}/classes +fileset
dir=${api.home}/src/share + include
name=**/*.properties/ +/fileset +/copy
+
+!-- Servlet/JSP resources - work around stupid src layout --
+copy todir=${build.dir}/classes/javax/servlet/resources +
fileset dir=${api.home}/src/share/dtd + include
name=web-app*.dtd/ +
Re: cvs commit: jakarta-tomcat-5 build2.xml
Costin, Costin Manolache wrote: It may be a good idea to move the ant tasks/types that you need from sandbox into oac.launcher. I think they should be in either tomcat or ant ( preferably). Later on, after things stabilise we can propose it for commons proper. I would like to see the syspropertyset, argset, and jvmargset data types and the conditional sysproperty, arg, and jvmarg elements moved to Ant. Also, I should be able to integrate the launch task attributes into Ant's java task. I just won't be able to do it for a few weeks since my employer has squeezed my spare time down to nothing. But I intend to post patches for this code so that it can go in Ant 1.6. The other half of the Launcher code is merely the bootstrapping of ant.jar (which is where the enhanced data types listed above would be). This code be added to Ant 1.6 very easily as all it does is instantiate a ClassLoader and classload ant.jar. This piece of code deserves more explanation. In the launcher, this bootstrapper is called LauncherBootstrap.class and resides in the same directory as the shell script that users use. Then, in Windows batch scripts, you put %0\..;%PATH% as the classpath when invoking Java. Since Windows sometimes makes %0 meaningless, %PATH% is used as the classpath. Since LauncherBootstrap.class is an unjarred class in %PATH% (since it is in the same directory as the script), it will get included in the classpath. LauncherBootstrap.class then just loads ant.jar since Java can reliably determine which directory LauncherBootstrap.class was loaded from. In essence, the whole bootstrapping process is a hack to get around the %0 problem on Windows 95, 98, ME, and sometimes 2000. So, it might be useful to include this bootstrapper in Ant so that the Ant batch scripts can find its classes. There were a few other things that are in the Launcher which may be useful if ported to Ant: - Catching of uncaught Errors (e.g. OutOfMemoryError) and gracefully exiting - Syncronized starting and stopping of the build process so that other applications (e.g. commons-daemon) can start Ant and kill Ant directly. - Retrieve localized strings so that we can localize BuildExceptions and echo and fail messages. If the Ant committers accept my patches, effectively moving all of the Launcher functionality into Ant 1.6, then I think the commons-launcher portion of commons-daemon can be made obsolete and commons-daemon could just use Ant 1.6 directly. Right now, commons-daemon needs both commons-launcher.jar *and* ant.jar. Let me know what you think of this approach. Thanks, Patrick -- Patrick Luby Email: [EMAIL PROTECTED] Sun Microsystems Phone: 408-276-7471 901 San Antonio Road, USCA14-303 Palo Alto, CA 94303-4900 -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-5 build2.xml
On Sun, 4 Aug 2002, Patrick Luby wrote: I would like to see the syspropertyset, argset, and jvmargset data types and the conditional sysproperty, arg, and jvmarg elements moved to Ant. You'll have to submit patches to ant-dev. But you can very well do the same thing with the current ant1.5 types - the syntax may be a bit more complicated, but using multiple sysproperty instead of syspropertyset is not that critical. Same for the conditionals - you can do most of that in the current syntax ( using conditional targets ). Not the cleanest way - but it works. Also, I should be able to integrate the launch task attributes into Ant's java task. I just won't be able to do it for a few weeks since my employer has squeezed my spare time down to nothing. But I intend to post patches for this code so that it can go in Ant 1.6. I have more work than I can handle - probably we're all in the same situation. You can just move launcher into tomcat CVS for now, and use it as a custom tomcat ant task. This piece of code deserves more explanation. In the launcher, this bootstrapper is called LauncherBootstrap.class and resides in the same directory as the shell script that users use. Then, in Windows batch scripts, you put %0\..;%PATH% as the classpath when invoking Java. Since Windows sometimes makes %0 meaningless, %PATH% is used as the classpath. Since LauncherBootstrap.class is an unjarred class in %PATH% (since it is in the same directory as the script), it will get included in the classpath. LauncherBootstrap.class then just loads ant.jar since Java can reliably determine which directory LauncherBootstrap.class was loaded from. Can't you just do 'java -jar ./bootstrap.jar' ? In essence, the whole bootstrapping process is a hack to get around the %0 problem on Windows 95, 98, ME, and sometimes 2000. So, it might be useful to include this bootstrapper in Ant so that the Ant batch scripts can find its classes. Or we can require TOMCAT_HOME/ANT_HOME env to be set. Or a registry key. Or use a small C program. Or we can 'install' a small bootstrap.jar in java's lib/ext. There are many hacks - what's important is to not let the hack affect the design and other platforms. There were a few other things that are in the Launcher which may be useful if ported to Ant: - Catching of uncaught Errors (e.g. OutOfMemoryError) and gracefully exiting - Syncronized starting and stopping of the build process so that other applications (e.g. commons-daemon) can start Ant and kill Ant directly. Not sure what that means. Other application can start and kill ant - there is no need for anything special. I'm trying to enhance the API for embeding ant - including wrapping it as an MBean ( with start/stop lifecycle methods ), it isn't difficult ( except finding time ). And I'll try to wrap the ant tasks/targets using modeler ( after I get the introspection-based code moved from util.mx to modeler ) - so individual tasks can be easier to execute. - Retrieve localized strings so that we can localize BuildExceptions and echo and fail messages. That would require a lot of work in ant, but I think it's a good idea. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build2.xml
costin 2002/08/03 20:48:50
Modified:.build2.xml
Log:
A more functional build file.
It now creates a fully functional tomcat ( there are few problems with
jasper tough ).
Also added a task that starts tomcat from ant - with 1.4 you need
fork=true ( I'll try to make few changes to ant classloader to avoid
this ).
I'm also trying 'everything in a jar' model - there are cases when
you don't need the complex hierarchy.
Note that the generated tomcat.jar is 2.8M, out of which 1.6 is
tomcat. That's not very bad - if we move backward compat stuff
into tomcat-compat and split some 'optional' functionality we
can get well bellow 1M.
( that includes tomcat33 code - i.e. 300k, most of it not used at
the moment, only some non-duplicated modules will be ported )
Revision ChangesPath
1.3 +120 -3jakarta-tomcat-5/build2.xml
Index: build2.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build2.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build2.xml1 Aug 2002 20:31:15 - 1.2
+++ build2.xml4 Aug 2002 03:48:50 - 1.3
@@ -28,7 +28,7 @@
property name=jtc.home
value=${basedir}/../jakarta-tomcat-connectors/
- property name=build.dir value=${basedir}/build/tomcat5/
+ property name=build.dir value=${basedir}/build/
property name=log4j.jar value=${base.path}/log4j/log4j.jar/
@@ -44,6 +44,14 @@
pathelement location=${jta.jar}/
pathelement location=${log4j.jar}/
/path
+
+ patternset id=static.res
+include name=**/*.properties /
+include name=**/*.dtd /
+include name=**/*.tld /
+include name=**/*.xsd /
+include name=**/*.xml /
+ /patternset
path id=jasperjars
pathelement location=${jaxen.jar}/
@@ -86,8 +94,25 @@
/src
exclude name=org/apache/tomcat/util/net/PureTLS* /
exclude name=org/apache/commons/logging/impl/LogKitLogger.java /
- exclude name=org/apache/commons/modeler/Modeler.java /
+
+ !-- Fail with GCJ --
+ exclude name=org/apache/commons/collections/DoubleOrderedMap.java /
+ exclude name=org/apache/tomcat/util/log/CommonLogHandler.java /
/javac
+copy toDir=${build.dir}/classes
+ fileset dir=${commons.home}/modeler/src/java
+patternset refid=static.res /
+ /fileset
+ fileset dir=${jtc.home}/util/java
+patternset refid=static.res /
+ /fileset
+ fileset dir=${commons.home}/digester/src/java
+patternset refid=static.res /
+ /fileset
+ fileset dir=${commons.home}/logging/src/java
+patternset refid=static.res /
+ /fileset
+/copy
/target
target name=tomcat
@@ -111,6 +136,40 @@
exclude name=org/apache/tomcat/ant/Tomcat3Precompiler.java /
exclude name=org/apache/catalina/startup/BootstrapService.java /
/javac
+
+copy toDir=${build.dir}/classes
+ fileset dir=${catalina.home}/catalina/src/share
+patternset refid=static.res /
+ /fileset
+ fileset dir=${jtc.home}/coyote/src/java
+patternset refid=static.res /
+ /fileset
+ fileset dir=${jtc.home}/http11/src/java
+patternset refid=static.res /
+ /fileset
+ fileset dir=${jtc.home}/jk/java
+patternset refid=static.res /
+ /fileset
+/copy
+
+copy toDir=${build.dir}/classes
+fileset dir=${api.home}/src/share
+ include name=**/*.properties/
+/fileset
+/copy
+
+!-- Servlet/JSP resources - work around stupid src layout --
+copy todir=${build.dir}/classes/javax/servlet/resources
+fileset dir=${api.home}/src/share/dtd
+ include name=web-app*.dtd/
+/fileset
+/copy
+copy todir=${build.dir}/classes/javax/servlet/jsp/resources
+ fileset dir=${api.home}/src/share/dtd
+include name=web-jsptaglibrary*.dtd/
+include name=jspxml.*/
+ /fileset
+/copy
/target
@@ -129,11 +188,69 @@
exclude name=org/apache/taglibs/standard/lang/jstl/test/** /
exclude
name=org/apache/taglibs/standard/lang/jstl/parser/jsp20/ELParser.java /
/javac
+copy toDir=${build.dir}/classes
+ fileset dir=${jasper.home}/src/share
+patternset refid=static.res /
+ /fileset
+ fileset dir=${taglibs.home}/standard/src
+patternset refid=static.res /
+ /fileset
+/copy
+ /target
+
+ target name=jar
+ description=Create jars
+mkdir dir=${build.dir}/lib /
+jar file=${build.dir}/lib/servlet.jar
+ fileset dir=${build.dir}/classes
+include name=javax/servlet/**/
+ /fileset
+
Re: cvs commit: jakarta-tomcat-5 build2.xml
Costin,
If it helps, you can exclude org/apache/catalina/launcher/** from the
build if you are not using commons-launcher. This package is only used
by the Launcher's XML files and has no other packages depend on this
package.
Also, I noticed that you are compiling the ${taglibs.home}/standard/src
directory. If it helps, you don't need to do this as the expression
language classes are already compiled and checked into the
jakarta-tomcat-jasper/jasper2/lib/jsp20el.jar.
Patrick
[EMAIL PROTECTED] wrote:
costin 2002/08/03 20:48:50
Modified:.build2.xml
Log:
A more functional build file.
It now creates a fully functional tomcat ( there are few problems with
jasper tough ).
Also added a task that starts tomcat from ant - with 1.4 you need
fork=true ( I'll try to make few changes to ant classloader to avoid
this ).
I'm also trying 'everything in a jar' model - there are cases when
you don't need the complex hierarchy.
Note that the generated tomcat.jar is 2.8M, out of which 1.6 is
tomcat. That's not very bad - if we move backward compat stuff
into tomcat-compat and split some 'optional' functionality we
can get well bellow 1M.
( that includes tomcat33 code - i.e. 300k, most of it not used at
the moment, only some non-duplicated modules will be ported )
Revision ChangesPath
1.3 +120 -3jakarta-tomcat-5/build2.xml
Index: build2.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build2.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build2.xml 1 Aug 2002 20:31:15 - 1.2
+++ build2.xml 4 Aug 2002 03:48:50 - 1.3
@@ -28,7 +28,7 @@
property name=jtc.home
value=${basedir}/../jakarta-tomcat-connectors/
- property name=build.dir value=${basedir}/build/tomcat5/
+ property name=build.dir value=${basedir}/build/
property name=log4j.jar value=${base.path}/log4j/log4j.jar/
@@ -44,6 +44,14 @@
pathelement location=${jta.jar}/
pathelement location=${log4j.jar}/
/path
+
+ patternset id=static.res
+include name=**/*.properties /
+include name=**/*.dtd /
+include name=**/*.tld /
+include name=**/*.xsd /
+include name=**/*.xml /
+ /patternset
path id=jasperjars
pathelement location=${jaxen.jar}/
@@ -86,8 +94,25 @@
/src
exclude name=org/apache/tomcat/util/net/PureTLS* /
exclude name=org/apache/commons/logging/impl/LogKitLogger.java /
- exclude name=org/apache/commons/modeler/Modeler.java /
+
+ !-- Fail with GCJ --
+ exclude name=org/apache/commons/collections/DoubleOrderedMap.java /
+ exclude name=org/apache/tomcat/util/log/CommonLogHandler.java /
/javac
+copy toDir=${build.dir}/classes
+ fileset dir=${commons.home}/modeler/src/java
+patternset refid=static.res /
+ /fileset
+ fileset dir=${jtc.home}/util/java
+patternset refid=static.res /
+ /fileset
+ fileset dir=${commons.home}/digester/src/java
+patternset refid=static.res /
+ /fileset
+ fileset dir=${commons.home}/logging/src/java
+patternset refid=static.res /
+ /fileset
+/copy
/target
target name=tomcat
@@ -111,6 +136,40 @@
exclude name=org/apache/tomcat/ant/Tomcat3Precompiler.java /
exclude name=org/apache/catalina/startup/BootstrapService.java /
/javac
+
+copy toDir=${build.dir}/classes
+ fileset dir=${catalina.home}/catalina/src/share
+patternset refid=static.res /
+ /fileset
+ fileset dir=${jtc.home}/coyote/src/java
+patternset refid=static.res /
+ /fileset
+ fileset dir=${jtc.home}/http11/src/java
+patternset refid=static.res /
+ /fileset
+ fileset dir=${jtc.home}/jk/java
+patternset refid=static.res /
+ /fileset
+/copy
+
+copy toDir=${build.dir}/classes
+fileset dir=${api.home}/src/share
+ include name=**/*.properties/
+/fileset
+/copy
+
+!-- Servlet/JSP resources - work around stupid src layout --
+copy todir=${build.dir}/classes/javax/servlet/resources
+fileset dir=${api.home}/src/share/dtd
+ include name=web-app*.dtd/
+/fileset
+/copy
+copy todir=${build.dir}/classes/javax/servlet/jsp/resources
+ fileset dir=${api.home}/src/share/dtd
+include name=web-jsptaglibrary*.dtd/
+include name=jspxml.*/
+ /fileset
+/copy
/target
@@ -129,11 +188,69 @@
exclude name=org/apache/taglibs/standard/lang/jstl/test/** /
Re: cvs commit: jakarta-tomcat-5 build2.xml
[EMAIL PROTECTED] wrote: costin 2002/08/01 10:35:12 Added: .build2.xml Log: I am totally lost with all the directories/build.properties/depenencies/jars. I don't know if everyone else is as stupid as I am, but if so this build file might help. It builds everything that it can from source - with minimal indirections and overhead. Om my system ( 900MHz linux ) it builds all files ( 1058 ) in 19 secs ( using jikes ). There are 11 jars that it needs. That looks simpler for building. If people agree this is a better build script, we'll need to add the special purpose targets also (for downloading and packaging). Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build2.xml
costin 2002/08/01 10:35:12
Added: .build2.xml
Log:
I am totally lost with all the directories/build.properties/depenencies/jars.
I don't know if everyone else is as stupid as I am, but if so this
build file might help.
It builds everything that it can from source - with minimal indirections
and overhead.
Om my system ( 900MHz linux ) it builds all files ( 1058 ) in 19 secs
( using jikes ).
There are 11 jars that it needs.
Revision ChangesPath
1.1 jakarta-tomcat-5/build2.xml
Index: build2.xml
===
project name=Tomcat 5.0-nobin default=all basedir=.
!--
Build 5.0 from sources. No apache binary is used.
--
!-- See build.properties.sample in the top level directory for all --
!-- property values you must customize for successful building!!!--
property file=${user.home}/build.properties/
property file=build.properties/
property file=build.properties.default/
property name=basedir location=. /
!-- Source dependencies --
property name=api.home
value=${basedir}/../jakarta-servletapi-5/
property name=taglibs.home
value=${basedir}/../jakarta-taglibs/
property name=commons.home
value=${basedir}/../jakarta-commons/
property name=catalina.home
value=${basedir}/../jakarta-tomcat-catalina/
property name=jasper.home
value=${basedir}/../jakarta-tomcat-jasper-5/jasper2/
property name=jtc.home
value=${basedir}/../jakarta-tomcat-connectors/
property name=build.dir value=${basedir}/build/tomcat5/
property name=log4j.jar value=${base.path}/log4j/log4j.jar/
path id=alljars
pathelement location=${jmx.jar}/
pathelement location=${mail.jar}/
pathelement location=${regexp.jar}/
pathelement location=${jsse.jar}/
pathelement location=${jnet.jar}/
pathelement location=${jcert.jar}/
pathelement location=${activation.jar}/
pathelement location=${jta.jar}/
pathelement location=${log4j.jar}/
pathelement location=${jaxen.jar}/
pathelement location=${saxpath.jar}/
/path
!-- === DETECT: Display configuration == --
target name=detect
description=Display configuration and conditional compilation flags
echo message=Path: ${toString:alljars}/
/target
!-- == COMBO: Clean All Directories --
target name=clean
description=Clean all components
delete dir=${build.dir}/
/target
!-- === COMBO: Build All Components --
target name=all
description=Clean, build, and deploy all components
depends=detect
mkdir dir=${build.dir}/classes /
javac destdir=${build.dir}/classes
optimize=off
debug=on
classpathref=alljars
src
path location=${api.home}/src/share /
path location=${jasper.home}/src/share /
path location=${taglibs.home}/standard/src /
path location=${catalina.home}/catalina/src/share /
path location=${jtc.home}/util/java /
path location=${jtc.home}/coyote/src/java /
path location=${jtc.home}/jk/java /
path location=${jtc.home}/http11/src/java /
path location=${commons.home}/modeler/src/java /
path location=${commons.home}/digester/src/java /
path location=${commons.home}/collections/src/java /
path location=${commons.home}/beanutils/src/java /
path location=${commons.home}/logging/src/java /
/src
exclude name=org/apache/coyote/tomcat3/** /
exclude name=org/apache/ajp/** /
exclude name=org/apache/tomcat/util/net/PureTLS* /
exclude name=org/apache/naming/factory/Tyrex* /
exclude name=org/apache/commons/logging/impl/LogKitLogger.java /
exclude name=org/apache/taglibs/standard/tag/common/xml/** /
exclude name=org/apache/commons/modeler/Modeler.java /
exclude name=org/apache/catalina/startup/BootstrapService.java /
exclude name=org/apache/taglibs/standard/lang/jstl/test/** /
exclude
name=org/apache/taglibs/standard/lang/jstl/parser/jsp20/ELParser.java /
/javac
/target
/project
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build2.xml
costin 2002/08/01 13:31:15
Modified:.build2.xml
Log:
Ok, split it in 3 ( utils, tomcat, jasper ).
Add a jdepend target.
The main reason for having multiple targets each building a small
component is to keep dependencies under control. JDepend will
at least display those deps - while the build system can be used
for building..
Note that I also added the 3.3 core into the mix - I'll try to
port few things ( the Mapper, the random generator, etc ) and
work on the adapter. You can exclude it if you want.
Revision ChangesPath
1.2 +89 -14jakarta-tomcat-5/build2.xml
Index: build2.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build2.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build2.xml1 Aug 2002 17:35:12 - 1.1
+++ build2.xml1 Aug 2002 20:31:15 - 1.2
@@ -19,6 +19,8 @@
value=${basedir}/../jakarta-taglibs/
property name=commons.home
value=${basedir}/../jakarta-commons/
+ property name=tomcat.home
+ value=${basedir}/../jakarta-tomcat/
property name=catalina.home
value=${basedir}/../jakarta-tomcat-catalina/
property name=jasper.home
@@ -41,13 +43,17 @@
pathelement location=${activation.jar}/
pathelement location=${jta.jar}/
pathelement location=${log4j.jar}/
+ /path
+
+ path id=jasperjars
pathelement location=${jaxen.jar}/
pathelement location=${saxpath.jar}/
/path
!-- === DETECT: Display configuration == --
- target name=detect
+ target name=init
description=Display configuration and conditional compilation flags
+mkdir dir=${build.dir}/classes /
echo message=Path: ${toString:alljars}/
/target
@@ -61,38 +67,107 @@
!-- === COMBO: Build All Components --
target name=all
description=Clean, build, and deploy all components
- depends=detect
-mkdir dir=${build.dir}/classes /
+ depends=init,utils,tomcat,jasper /
+
+ target name=utils
+ description=Utils build
+
javac destdir=${build.dir}/classes
optimize=off
debug=on
classpathref=alljars
src
-path location=${api.home}/src/share /
-path location=${jasper.home}/src/share /
-path location=${taglibs.home}/standard/src /
-path location=${catalina.home}/catalina/src/share /
path location=${jtc.home}/util/java /
-path location=${jtc.home}/coyote/src/java /
-path location=${jtc.home}/jk/java /
-path location=${jtc.home}/http11/src/java /
path location=${commons.home}/modeler/src/java /
path location=${commons.home}/digester/src/java /
path location=${commons.home}/collections/src/java /
path location=${commons.home}/beanutils/src/java /
path location=${commons.home}/logging/src/java /
/src
- exclude name=org/apache/coyote/tomcat3/** /
- exclude name=org/apache/ajp/** /
exclude name=org/apache/tomcat/util/net/PureTLS* /
- exclude name=org/apache/naming/factory/Tyrex* /
exclude name=org/apache/commons/logging/impl/LogKitLogger.java /
- exclude name=org/apache/taglibs/standard/tag/common/xml/** /
exclude name=org/apache/commons/modeler/Modeler.java /
+/javac
+ /target
+
+ target name=tomcat
+ description=Tomcat build
+
+javac destdir=${build.dir}/classes
+ optimize=off
+ debug=on
+ classpathref=alljars
+ src
+path location=${api.home}/src/share /
+path location=${catalina.home}/catalina/src/share /
+path location=${jtc.home}/coyote/src/java /
+path location=${jtc.home}/jk/java /
+path location=${jtc.home}/http11/src/java /
+path location=${tomcat.home}/src/share /
+ /src
+ exclude name=org/apache/ajp/** /
+ exclude name=org/apache/jasper/** /
+ exclude name=org/apache/naming/factory/Tyrex* /
+ exclude name=org/apache/tomcat/ant/Tomcat3Precompiler.java /
exclude name=org/apache/catalina/startup/BootstrapService.java /
+/javac
+ /target
+
+
+ target name=jasper
+ description=Jasper build
+javac destdir=${build.dir}/classes
+ optimize=off
+ debug=on
+ classpathref=alljars
+ classpath refid=jasperjars/
+ src
+path location=${jasper.home}/src/share /
+path location=${taglibs.home}/standard/src /
+ /src
+ exclude name=org/apache/taglibs/standard/tag/common/xml/** /
exclude
