cvs commit: jakarta-tomcat-5 build.xml
costin 2005/09/28 23:07:24
Modified:.build.xml
Log:
Add a target to build the standalone jar - in case anyone wants to play with
it.
Revision ChangesPath
1.239 +87 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- build.xml 22 Sep 2005 10:39:37 - 1.238
+++ build.xml 29 Sep 2005 06:07:24 - 1.239
@@ -192,6 +192,7 @@
property name=tomcat-util.build value=${tomcat.build} /
property name=tomcat-util.lib value=${tomcat.build}/server/lib /
/ant
+
/target
target name=build-tomcatjk unless=tomcatjk.build.notrequired
@@ -658,7 +659,7 @@
!-- antcall target=build-commons-modeler / --
!-- antcall target=build-commons-daemon / --
- antcall target=downloadgz
+antcall target=downloadgz
param name=sourcefile value=${commons-collections-src.loc}/
param name=destfile value=${tomcat-dbcp.jar} /
/antcall
@@ -1167,6 +1168,90 @@
/ant
/target
+ !-- === Single-jar tomcat === --
+ target name=prepare-runtime-once
+ description=Do once before single jar tomcat
+mkdir dir=runtime/deps /
+mkdir dir=runtime/classes /
+unjar dest=runtime/deps
src=${base.path}/servlet-api-2.4/lib/servlet-api.jar /
+!-- unjar dest=runtime/deps
src=${base.path}/commons-logging-1.0.4/commons-logging.jar/ --
+unjar dest=runtime/deps
src=${base.path}/commons-modeler-1.1/commons-modeler.jar/
+unjar dest=runtime/deps
src=${base.path}/jsp-api-2.0/lib/jsp-api.jar/
+ /target
+
+
+ target name=compile-runtime
+ description=Build single jar tomcat
+
+ javac destdir=runtime/classes deprecation=false debug=false
+!-- classpath
path=${base.path}/commons-beanutils-1.6.1/commons-beanutils.jar/ --
+!-- classpath
path=${base.path}/commons-logging-1.0.4/commons-logging.jar/ --
+classpath
path=${base.path}/commons-modeler-1.1/commons-modeler.jar/
+classpath path=${base.path}/jsp-api-2.0/lib/jsp-api.jar/
+classpath
path=${base.path}/servlet-api-2.4/lib/servlet-api.jar/
+classpath path=${base.path}/jmxri-1.2.1.jar/
+
+src
+pathelement path=${jtc.home}/util/java/
+pathelement path=${jtc.home}/mini/java /
+!-- pathelement path=${jtc.home}/naming/src/ --
+pathelement path=${jtc.home}/coyote/src/java/
+pathelement path=${jtc.home}/http11/src/java/
+pathelement path=${catalina.home}/catalina/src/share/
+/src
+exclude name=org/apache/naming/*.java/
+exclude name=org/apache/naming/ant/**/
+exclude name=org/apache/tomcat/util/net/puretls/**/
+exclude
name=org/apache/tomcat/util/net/jsse/JSSE15SocketFactory.java/
+exclude
name=org/apache/tomcat/util/net/jsse/JSSE15Factory.java/
+exclude name=org/apache/tomcat/util/net/AprEndpoint.java/
+exclude name=org/apache/coyote/tomcat3/**/
+exclude name=org/apache/coyote/tomcat4/**/
+exclude name=org/apache/coyote/memory/**/
+exclude name=org/apache/coyote/standalone/**/
+exclude
name=org/apache/coyote/http11/Http11AprProcessor.java/
+exclude name=org/apache/coyote/http11/Http11AprProtocol.java/
+exclude
name=org/apache/coyote/http11/InternalAprInputBuffer.java/
+exclude
name=org/apache/coyote/http11/InternalAprOutputBuffer.java/
+exclude name=**/CatalinaLaunchFilter.java/
+exclude name=**/MailSessionFactory.java/
+exclude name=**/SendMailFactory.java/
+exclude name=**/SemaphoreValve.java/
+exclude name=org/apache/catalina/ant/**/
+exclude name=org/apache/catalina/ssi/**/
+exclude
name=org/apache/catalina/loader/CatalinaModuleListener.java/
+/javac
+
+copy todir=runtime/classes
+fileset dir=${jtc.home}/util/java includes=**/*.properties
**/*.xml/
+fileset dir=${jtc.home}/naming/src includes=**/*.properties
**/*.xml/
+fileset dir=${jtc.home}/coyote/src/java
includes=**/*.properties **/*.xml
+ exclude name=org/apache/coyote/tomcat4/**/
+/fileset
+fileset dir=${jtc.home}/http11/src/java
includes=**/*.properties **/*.xml/
+fileset dir=${catalina.home}/catalina/src/share
includes=**/*.properties **/*.xml/
+/copy
+
+jar jarfile=runtime/tomcat-runtime.jar
Re: cvs commit: jakarta-tomcat-5 build.xml
BTW - there are still few files missing, but the end result is a 1.2M
jar containing all deps, that can be run with java -jar and only
requires a webapps/ dir in the current dir.
Costin
[EMAIL PROTECTED] wrote:
costin 2005/09/28 23:07:24
Modified:.build.xml
Log:
Add a target to build the standalone jar - in case anyone wants to play with
it.
Revision ChangesPath
1.239 +87 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- build.xml 22 Sep 2005 10:39:37 - 1.238
+++ build.xml 29 Sep 2005 06:07:24 - 1.239
@@ -192,6 +192,7 @@
property name=tomcat-util.build value=${tomcat.build} /
property name=tomcat-util.lib value=${tomcat.build}/server/lib /
/ant
+
/target
target name=build-tomcatjk unless=tomcatjk.build.notrequired
@@ -658,7 +659,7 @@
!-- antcall target=build-commons-modeler / --
!-- antcall target=build-commons-daemon / --
- antcall target=downloadgz
+antcall target=downloadgz
param name=sourcefile value=${commons-collections-src.loc}/
param name=destfile value=${tomcat-dbcp.jar} /
/antcall
@@ -1167,6 +1168,90 @@
/ant
/target
+ !-- === Single-jar tomcat === --
+ target name=prepare-runtime-once
+ description=Do once before single jar tomcat
+mkdir dir=runtime/deps /
+mkdir dir=runtime/classes /
+unjar dest=runtime/deps
src=${base.path}/servlet-api-2.4/lib/servlet-api.jar /
+!-- unjar dest=runtime/deps
src=${base.path}/commons-logging-1.0.4/commons-logging.jar/ --
+unjar dest=runtime/deps
src=${base.path}/commons-modeler-1.1/commons-modeler.jar/
+unjar dest=runtime/deps
src=${base.path}/jsp-api-2.0/lib/jsp-api.jar/
+ /target
+
+
+ target name=compile-runtime
+ description=Build single jar tomcat
+
+ javac destdir=runtime/classes deprecation=false debug=false
+!-- classpath
path=${base.path}/commons-beanutils-1.6.1/commons-beanutils.jar/ --
+!-- classpath
path=${base.path}/commons-logging-1.0.4/commons-logging.jar/ --
+classpath
path=${base.path}/commons-modeler-1.1/commons-modeler.jar/
+classpath path=${base.path}/jsp-api-2.0/lib/jsp-api.jar/
+classpath
path=${base.path}/servlet-api-2.4/lib/servlet-api.jar/
+classpath path=${base.path}/jmxri-1.2.1.jar/
+
+src
+pathelement path=${jtc.home}/util/java/
+pathelement path=${jtc.home}/mini/java /
+!-- pathelement path=${jtc.home}/naming/src/ --
+pathelement path=${jtc.home}/coyote/src/java/
+pathelement path=${jtc.home}/http11/src/java/
+pathelement path=${catalina.home}/catalina/src/share/
+/src
+exclude name=org/apache/naming/*.java/
+exclude name=org/apache/naming/ant/**/
+exclude name=org/apache/tomcat/util/net/puretls/**/
+exclude
name=org/apache/tomcat/util/net/jsse/JSSE15SocketFactory.java/
+exclude
name=org/apache/tomcat/util/net/jsse/JSSE15Factory.java/
+exclude name=org/apache/tomcat/util/net/AprEndpoint.java/
+exclude name=org/apache/coyote/tomcat3/**/
+exclude name=org/apache/coyote/tomcat4/**/
+exclude name=org/apache/coyote/memory/**/
+exclude name=org/apache/coyote/standalone/**/
+exclude
name=org/apache/coyote/http11/Http11AprProcessor.java/
+exclude name=org/apache/coyote/http11/Http11AprProtocol.java/
+exclude
name=org/apache/coyote/http11/InternalAprInputBuffer.java/
+exclude
name=org/apache/coyote/http11/InternalAprOutputBuffer.java/
+exclude name=**/CatalinaLaunchFilter.java/
+exclude name=**/MailSessionFactory.java/
+exclude name=**/SendMailFactory.java/
+exclude name=**/SemaphoreValve.java/
+exclude name=org/apache/catalina/ant/**/
+exclude name=org/apache/catalina/ssi/**/
+exclude
name=org/apache/catalina/loader/CatalinaModuleListener.java/
+/javac
+
+copy todir=runtime/classes
+fileset dir=${jtc.home}/util/java includes=**/*.properties
**/*.xml/
+fileset dir=${jtc.home}/naming/src includes=**/*.properties
**/*.xml/
+fileset dir=${jtc.home}/coyote/src/java includes=**/*.properties
**/*.xml
+ exclude name=org/apache/coyote/tomcat4/**/
+/fileset
+fileset
cvs commit: jakarta-tomcat-5 build.xml
costin 2005/09/29 08:28:20
Modified:.build.xml
Log:
Added the target to build coyote standalone. ( there are missing files - the
j-t-c/mini directory in particular - don't try to build until
after svn transition, or whenever the rest of the files land )
This is 200K, coyote-http11 only, compared with tomcat runtime which is 1.2M
Revision ChangesPath
1.240 +45 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- build.xml 29 Sep 2005 06:07:24 - 1.239
+++ build.xml 29 Sep 2005 15:28:20 - 1.240
@@ -1252,6 +1252,51 @@
target name=runtime depends=prepare-runtime-once,compile-runtime/
+!-- === Coyote standalone === --
+!--
+This is only the http connector, for testing/experimental purposes.
+ --
+
+target name=tomcat-http11
+mkdir dir=runtime/http11/
+javac destdir=runtime/http11 debug=false
+src
+pathelement path=${jtc.home}/util/java/
+pathelement path=${jtc.home}/util/loader/
+pathelement path=${jtc.home}/mini/java/
+pathelement path=${jtc.home}/coyote/src/java/
+pathelement path=${jtc.home}/http11/src/java/
+/src
+exclude name=org/apache/coyote/http11/Http11Protocol.java/
+exclude
name=org/apache/coyote/http11/Http11AprProcessor.java/
+exclude name=org/apache/coyote/http11/Http11AprProtocol.java/
+exclude
name=org/apache/coyote/http11/InternalAprInputBuffer.java/
+exclude
name=org/apache/coyote/http11/InternalAprOutputBuffer.java/
+exclude name=org/apache/tomcat/util/net/puretls/**/
+exclude
name=org/apache/tomcat/util/net/jsse/JSSE15SocketFactory.java/
+exclude
name=org/apache/tomcat/util/net/jsse/JSSE15Factory.java/
+exclude name=org/apache/tomcat/util/net/AprEndpoint.java/
+exclude name=org/apache/tomcat/util/digester/**/
+exclude name=org/apache/tomcat/util/compat/**/
+exclude name=org/apache/tomcat/util/jmx/**/
+exclude name=org/apache/tomcat/util/log/**/
+exclude name=org/apache/tomcat/util/IntrospectionUtils.java/
+exclude name=org/apache/coyote/tomcat3/**/
+exclude name=org/apache/coyote/tomcat4/**/
+exclude name=org/apache/coyote/memory/**/
+/javac
+copy todir=runtime/http11
+fileset dir=${jtc.home}/http11/src/java
includes=**/*.properties **/*.xml/
+fileset dir=${jtc.home}/util/java includes=**/*.properties
**/*.xml/
+/copy
+
+jar jarfile=runtime/tomcat-http11.jar
manifest=resources/coyote-http11.MF
+ basedir=runtime/http11
+ includes=** /
+
+/target
+
+
!-- === TESTER: Run Catalina Tester Tests===
--
target name=dist-tester
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2005/09/22 03:39:37
Modified:.build.xml
Log:
- Fix build by excluding tagPlugins.xml.
- This file shouldn't be in the standard examples, but rather copied there
before precompiling (once it works again, of course).
Revision ChangesPath
1.238 +3 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- build.xml 1 Sep 2005 18:28:24 - 1.237
+++ build.xml 22 Sep 2005 10:39:37 - 1.238
@@ -779,7 +779,9 @@
mkdir dir=${tomcat.build}/webapps/jsp-examples/
copy todir=${tomcat.build}/webapps/jsp-examples
- fileset dir=${api.home}/jsr152/build/examples includes=**/
+ fileset dir=${api.home}/jsr152/build/examples
+exclude name=WEB-INF/tagPlugins.xml /
+ /fileset
/copy
ant dir=${catalina.home}/webapps/ROOT target=build-main
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-5 build.xml
[EMAIL PROTECTED] wrote: remm2005/09/22 03:39:37 Modified:.build.xml Log: - Fix build by excluding tagPlugins.xml. - This file shouldn't be in the standard examples, but rather copied there before precompiling (once it works again, of course). This should be unnecessary. Bill has already removed the file from SVN. For the record, all members of the tomcat pmc have karma for all modules including the specs. This allows us to fix issues with the examples. Mark - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-5 build.xml
Mark Thomas wrote: [EMAIL PROTECTED] wrote: remm2005/09/22 03:39:37 Modified:.build.xml Log: - Fix build by excluding tagPlugins.xml. - This file shouldn't be in the standard examples, but rather copied there before precompiling (once it works again, of course). This should be unnecessary. Bill has already removed the file from SVN. Yes, I saw it after my commit, you're completely right. I'm still using the CVS repository however, and it doesn't hurt much ;) Will Yoav tag the CVS or SVN for the upcoming release ? For the record, all members of the tomcat pmc have karma for all modules including the specs. This allows us to fix issues with the examples. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-5 build.xml
Hi, Will Yoav tag the CVS or SVN for the upcoming release ? I was going to tag both repositories this one time. For the record, all members of the tomcat pmc have karma for all modules including the specs. This allows us to fix issues with the examples. This is great. Yoav - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-5 build.xml
Yoav Shapira wrote: Hi, Will Yoav tag the CVS or SVN for the upcoming release ? I was going to tag both repositories this one time. I am 99% sure that you will not be able to tag the CVS repositories that have already migrated since they will be locked. This will only affect servletapi for TC5. Mark - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2005/08/23 05:40:51
Modified:.build.xml
Log:
- Cleanup: remove a number of (apparently) useless files from conf.
Revision ChangesPath
1.235 +11 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- build.xml 2 Aug 2005 19:08:07 - 1.234
+++ build.xml 23 Aug 2005 12:40:51 - 1.235
@@ -1295,6 +1295,17 @@
copy todir=${tomcat.dist}/conf
fileset dir=${tomcat.build}/conf
exclude name=MANIFEST.MF /
+exclude name=jk2.manifest /
+exclude name=jk2.properties /
+exclude name=jkconf.ant.xml /
+exclude name=jkconfig.manifest /
+exclude name=shm.manifest /
+exclude name=tomcat-jk2.manifest /
+exclude name=uriworkermap.properties /
+exclude name=workers2.properties /
+exclude name=workers2.properties.minimal /
+exclude name=workers.properties /
+exclude name=workers.properties.minimal /
/fileset
/copy
copy todir=${tomcat.dist}/server/lib
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml build.properties.default
remm2005/08/02 08:33:08
Modified:.build.xml build.properties.default
Log:
- Update to the soon-to-be new location for native.
Revision ChangesPath
1.233 +2 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- build.xml 30 Jul 2005 21:22:24 - 1.232
+++ build.xml 2 Aug 2005 15:33:07 - 1.233
@@ -158,7 +158,8 @@
copy todir=${tomcat.build}/bin file=${commons-daemon.jsvc.tar.gz}
failonerror=false /
-copy todir=${tomcat.build}/bin file=${tomcat-native.tar.gz} /
+copy tofile=${tomcat.build}/bin/tomcat-native.tar.gz
+ file=${tomcat-native.tar.gz} /
!-- copy todir=${tomcat.build}/common/lib file=${ant.jar}/
copy todir=${tomcat.build}/common/lib file=${ant-launcher.jar}/ --
1.156 +3 -3 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- build.properties.default 2 Aug 2005 14:01:58 - 1.155
+++ build.properties.default 2 Aug 2005 15:33:07 - 1.156
@@ -150,9 +150,9 @@
# - Tomcat native library -
-tomcat-native.home=${base.path}/tomcat-native-1.0
+tomcat-native.home=${base.path}/tomcat-native-1.1.0
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
-tomcat-native.loc=${base-jakarta.loc}/tomcat-connectors/jni/tomcat-native.tar.gz
+tomcat-native.loc=${base-jakarta.loc}/tomcat-connectors/native/tomcat-native-1.1.0.tar.gz
# --
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml build.properties.default tomcat.nsi
remm2005/08/02 12:08:07
Modified:.build.xml build.properties.default tomcat.nsi
Log:
- Add placeholder code to download Windows .dll.
Revision ChangesPath
1.234 +2 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- build.xml 2 Aug 2005 15:33:07 - 1.233
+++ build.xml 2 Aug 2005 19:08:07 - 1.234
@@ -1445,6 +1445,7 @@
/copy
copy file=${nsis.installoptions.dll} todir=${tomcat.dist} /
copy file=${nsis.nsexec.dll} todir=${tomcat.dist} /
+copy file=${nsis.nsisdl.dll} todir=${tomcat.dist} /
copy file=${jtc.home}/procrun/bin/tomcat5.exe
tofile=${tomcat.dist}/bin/tomcat5.exe /
copy file=${jtc.home}/procrun/bin/tomcat5w.exe
@@ -1581,6 +1582,7 @@
available file=${nsis.exe} /
available file=${nsis.installoptions.dll} /
available file=${nsis.nsexec.dll} /
+available file=${nsis.nsisdl.dll} /
/and
/condition
1.157 +2 -1 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- build.properties.default 2 Aug 2005 15:33:07 - 1.156
+++ build.properties.default 2 Aug 2005 19:08:07 - 1.157
@@ -220,6 +220,7 @@
nsis.exe=${nsis.home}/makensis.exe
nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
+nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
nsis.loc=${base-sf.loc}/nsis/nsis-2.08.exe
1.80 +18 -1 jakarta-tomcat-5/tomcat.nsi
Index: tomcat.nsi
===
RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- tomcat.nsi2 Aug 2005 18:35:15 - 1.79
+++ tomcat.nsi2 Aug 2005 19:08:07 - 1.80
@@ -83,6 +83,7 @@
LangString DESC_SecTomcat ${LANG_ENGLISH} Install the Tomcat Servlet
container.
LangString DESC_SecTomcatCore ${LANG_ENGLISH} Install the Tomcat
Servlet container core.
LangString DESC_SecTomcatService ${LANG_ENGLISH} Automatically start
Tomcat when the computer is started. This requires Windows NT 4.0, Windows 2000
or Windows XP.
+LangString DESC_SecTomcatNative ${LANG_ENGLISH} Downloads and installs
Tomcat native .dll for better performance and scalability in production
environments.
;LangString DESC_SecTomcatSource ${LANG_ENGLISH} Install the Tomcat
source code.
LangString DESC_SecMenu ${LANG_ENGLISH} Create a Start Menu program
group for Tomcat.
LangString DESC_SecDocs ${LANG_ENGLISH} Install the Tomcat
documentation bundle. This include documentation on the servlet container and
its configuration options, on the Jasper JSP page compiler, as well as on the
native webserver connectors.
@@ -198,6 +199,21 @@
SectionEnd
+Section Native SecTomcatNative
+
+ SectionIn 3
+
+ NSISdl::download /TIMEOUT=3 http://blabla/tcnative-1-1.1.0.dll
$INSTDIR\bin\tcnative-1.dll
+ Pop $0
+ StrCmp $0 success success
+SetDetailsView show
+DetailPrint download failed from http://blabla/tcnative-1-1.1.0.dll: $0
+ success:
+
+ ClearErrors
+
+SectionEnd
+
;Section Source Code SecTomcatSource
;
; SectionIn 3
@@ -355,6 +371,7 @@
!insertmacro MUI_DESCRIPTION_TEXT ${SecTomcat} $(DESC_SecTomcat)
!insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatCore} $(DESC_SecTomcatCore)
!insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatService}
$(DESC_SecTomcatService)
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatNative}
$(DESC_SecTomcatNative)
; !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatSource}
$(DESC_SecTomcatSource)
; !insertmacro MUI_DESCRIPTION_TEXT ${SecCompat} $(DESC_SecCompat)
!insertmacro MUI_DESCRIPTION_TEXT ${SecMenu} $(DESC_SecMenu)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml tomcat.nsi
remm2005/03/03 07:13:39
Modified:catalina/src/bin catalina.bat catalina.sh
.build.xml tomcat.nsi
Log:
- Add some script magic for Juli.
Revision ChangesPath
1.12 +5 -1 jakarta-tomcat-catalina/catalina/src/bin/catalina.bat
Index: catalina.bat
===
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.bat,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- catalina.bat 23 Sep 2004 20:14:48 - 1.11
+++ catalina.bat 3 Mar 2005 15:13:39 - 1.12
@@ -77,6 +77,10 @@
set CATALINA_TMPDIR=%CATALINA_BASE%\temp
:gotTmpdir
+if not exist %CATALINA_HOME%\bin\tomcat-juli.jar goto noJuli
+set JAVA_OPTS=%JAVA_OPTS%
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
+:noJuli
+
rem - Execute The Requested Command
---
echo Using CATALINA_BASE: %CATALINA_BASE%
1.19 +6 -1 jakarta-tomcat-catalina/catalina/src/bin/catalina.sh
Index: catalina.sh
===
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- catalina.sh 10 Jan 2005 18:16:10 - 1.18
+++ catalina.sh 3 Mar 2005 15:13:39 - 1.19
@@ -114,6 +114,11 @@
fi
fi
+# Set juli LogManager if it is present
+if [ -r $CATALINA_HOME/bin/tomcat-juli.jar ]; then
+ JAVA_OPTS=$JAVA_OPTS
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
+fi
+
# Add on extra jar files to CLASSPATH
if [ -n $JSSE_HOME ]; then
CLASSPATH=$CLASSPATH:$JSSE_HOME/lib/jcert.jar:$JSSE_HOME/lib/jnet.jar:$JSSE_HOME/lib/jsse.jar
1.226 +0 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- build.xml 3 Mar 2005 13:34:17 - 1.225
+++ build.xml 3 Mar 2005 15:13:39 - 1.226
@@ -1229,7 +1229,6 @@
exclude name=*-using-launcher.*/
exclude name=LauncherBootstrap.class/
exclude name=launcher.properties/
- exclude name=tomcat-juli.jar/
/fileset
/copy
copy todir=${tomcat.dist}/common/classes
1.70 +3 -2 jakarta-tomcat-5/tomcat.nsi
Index: tomcat.nsi
===
RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- tomcat.nsi15 Feb 2005 15:32:32 - 1.69
+++ tomcat.nsi3 Mar 2005 15:13:39 - 1.70
@@ -131,6 +131,7 @@
SetOutPath $INSTDIR\bin
File bin\bootstrap.jar
File bin\commons-logging-api.jar
+ File bin\tomcat-juli.jar
File bin\*.exe
SetOutPath $INSTDIR\conf
File conf\*.*
@@ -307,7 +308,7 @@
Section -post
nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //US//Tomcat5 --Classpath
$INSTDIR\bin\bootstrap.jar --StartClass org.apache.catalina.startup.Bootstrap
--StopClass org.apache.catalina.startup.Bootstrap --StartParams start
--StopParams stop --StartMode jvm --StopMode jvm'
- nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //US//Tomcat5 --JvmOptions
-Dcatalina.home=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Djava.io.tmpdir=$INSTDIR\temp
--StdOutput auto --StdError auto'
+ nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //US//Tomcat5 --JvmOptions
-Dcatalina.home=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
--StdOutput auto --StdError auto'
WriteUninstaller $INSTDIR\Uninstall.exe
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2005/03/02 10:36:29
Modified:.build.xml
Log:
- Don't include juli in dist.
Revision ChangesPath
1.224 +1 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- build.xml 2 Mar 2005 18:30:45 - 1.223
+++ build.xml 2 Mar 2005 18:36:29 - 1.224
@@ -1226,6 +1226,7 @@
exclude name=*-using-launcher.*/
exclude name=LauncherBootstrap.class/
exclude name=launcher.properties/
+ exclude name=tomcat-juli.jar/
/fileset
/copy
copy todir=${tomcat.dist}/common/classes
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml build.properties.default
remm2005/01/20 04:00:20
Modified:.build.xml build.properties.default
Log:
- Better handling of MX4J downloading.
Revision ChangesPath
1.222 +1 -2 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- build.xml 8 Jan 2005 11:14:37 - 1.221
+++ build.xml 20 Jan 2005 12:00:20 - 1.222
@@ -1758,10 +1758,9 @@
param name=destfile value=${xml-apis.jar}/
/antcall
-antcall target=downloadzip
+antcall target=downloadgz
param name=sourcefile value=${jmx.loc}/
param name=destfile value=${jmx.jar}/
- param name=destdir value=${jmx.home}/
/antcall
antcall target=downloadzip
1.140 +4 -4 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- build.properties.default 19 Jan 2005 14:34:38 - 1.139
+++ build.properties.default 20 Jan 2005 12:00:20 - 1.140
@@ -59,7 +59,7 @@
base-struts.loc=http://archive.apache.org/dist/struts
# - Sourceforge files base location -
-base-sf.loc=http://telia.dl.sourceforge.net/sourceforge
+base-sf.loc=http://unc.dl.sourceforge.net/sourceforge
# --
#REQUIRED LIBRARIES
@@ -189,11 +189,11 @@
commons-fileupload.loc=${base-jakarta.loc}/commons/fileupload/binaries/commons-fileupload-1.0.tar.gz
# - Java Management Extensions (JMX), JMX RI 1.2.1 or later or MX4J
2.0.1 or later -
-jmx.home=${base.path}/mx4j-2.1.0/mx4j-2.1.0
+jmx.home=${base.path}/mx4j-2.1.1
jmx.lib=${jmx.home}/lib
jmx.jar=${jmx.lib}/mx4j.jar
jmx-tools.jar=${jmx.lib}/mx4j-tools.jar
-jmx.loc=${base-sf.loc}/mx4j/mx4j-2.1.0.zip
+jmx.loc=${base-sf.loc}/mx4j/mx4j-2.1.1.tar.gz
# - JUnit Unit Test Suite, version 3.7 or later -
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
pero2005/01/08 03:14:37
Modified:.build.xml
Log:
New store config module for better server.xml saving support
Revision ChangesPath
1.221 +1 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- build.xml 6 Jan 2005 12:42:13 - 1.220
+++ build.xml 8 Jan 2005 11:14:37 - 1.221
@@ -495,6 +495,7 @@
ant dir=${catalina.home}/modules target=build
property name=catalina.build value=${tomcat.build} /
property name=cluster.dist value=${tomcat.build}/server/lib /
+property name=config.dist value=${tomcat.build}/server/lib /
property name=catalina.deploy value=${tomcat.build} /
property name=flags.hide value=true /
/ant
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2004/10/14 00:40:34
Modified:.build.xml
Log:
- JK wants to copy coyote. This used to work fine, so it's fairly odd.
Revision ChangesPath
1.219 +1 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- build.xml 5 Oct 2004 14:01:57 - 1.218
+++ build.xml 14 Oct 2004 07:40:34 - 1.219
@@ -204,6 +204,7 @@
property name=jk.build value=${tomcat.build}/
+ property name=tomcat-coyote.jar
value=${tomcat.build}/server/lib/tomcat-coyote.jar /
!--
property name=tomcat-coyote.jar
value=${tomcat.build}/server/lib/tomcat-coyote.jar /
property name=tomcat-jk2.jar
value=${tomcat.build}/server/lib/tomcat-ajp.jar /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2004/10/04 02:27:26
Modified:.build.xml
Log:
- Comment out jk2.properties file for now.
Revision ChangesPath
1.216 +2 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- build.xml 3 Oct 2004 08:53:55 - 1.215
+++ build.xml 4 Oct 2004 09:27:26 - 1.216
@@ -215,8 +215,10 @@
/ant
+ !--
copy file=${jtc.home}/jk/conf/jk2.properties
todir=${tomcat.build}/conf /
+--
!-- Protocol handlers - AJP --
jar jarfile=${tomcat.build}/server/lib/tomcat-ajp.jar index=true
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat-5 build.xml
Hi, I think the new version numbering in build.xml is too complicated and too high maintenance to be worth the small (and at this point purely theoretical) gains. I'd be happy going back to simple version is a string property, without any math or conditionals around it. Yoav Shapira Millennium Research Informatics -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: Wednesday, September 15, 2004 9:06 AM To: [EMAIL PROTECTED] Subject: cvs commit: jakarta-tomcat-5 build.xml mturk 2004/09/15 06:05:41 Modified:.build.xml Log: Increment build number. Aynone has idea how to automate this? Revision ChangesPath 1.213 +1 -1 jakarta-tomcat-5/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v retrieving revision 1.212 retrieving revision 1.213 diff -u -r1.212 -r1.213 --- build.xml13 Sep 2004 21:06:29 - 1.212 +++ build.xml15 Sep 2004 13:05:41 - 1.213 @@ -18,7 +18,7 @@ !-- When releasing set the 'version.build' to even number and 'version.isdev' to zero. -- - property name=version.build value=2 / + property name=version.build value=3 / property name=version.patch value=0 / property name=version.isdev value=1 / - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-5 build.xml
Shapira, Yoav wrote: Hi, I think the new version numbering in build.xml is too complicated and too high maintenance to be worth the small (and at this point purely theoretical) gains. I'd be happy going back to simple version is a string property, without any math or conditionals around it. OK, but still you will need to update that, and be limited to numbers only, cause the installer will break in case of strings. I agree that the build.xml is vrong place to maintain versions. Perhaps to add some property file that will be accessible from catalina too and give the 'true' version number even from command line. Regards, MT. smime.p7s Description: S/MIME Cryptographic Signature
RE: cvs commit: jakarta-tomcat-5 build.xml
Hi, OK, but still you will need to update that, and be limited to numbers only, cause the installer will break in case of strings. I agree that the build.xml is vrong place to maintain versions. Perhaps to add some property file that will be accessible from catalina too and give the 'true' version number even from command line. Can the installer be modified to accept a version string? The version usually has periods in it, making it a string and not a number. I can also see cases where we'd want -alpha, -beta, -rc as part of the version. So I don't like the installer limitation ;) But I assume you've looked at the issue and it's not feasible to get around it, so I/we will just have to live with it. What I don't understand is why we can't leave the base defaults in build.xml as they are and just modify them in build.properties (a private non-CVS file obviously) when I cut a release? Why must I update build.xml each time? Yoav This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
mturk 2004/09/13 08:04:08 Modified:.build.xml Log: Do not forget to increment version.build after release. It is used for generating proper file names. Revision ChangesPath 1.211 +1 -1 jakarta-tomcat-5/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v retrieving revision 1.210 retrieving revision 1.211 diff -u -r1.210 -r1.211 --- build.xml 5 Sep 2004 10:17:51 - 1.210 +++ build.xml 13 Sep 2004 15:04:08 - 1.211 @@ -18,7 +18,7 @@ !-- When releasing set the 'version.build' to even number and 'version.isdev' to zero. -- - property name=version.build value=1 / + property name=version.build value=2 / property name=version.patch value=0 / property name=version.isdev value=1 / - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2004/09/13 14:06:29
Modified:.build.xml
Log:
- Wait less before starting tests (TC starts much faster now).
Revision ChangesPath
1.212 +1 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- build.xml 13 Sep 2004 15:04:08 - 1.211
+++ build.xml 13 Sep 2004 21:06:29 - 1.212
@@ -1181,7 +1181,7 @@
sequential
!-- Let tomcat starts before starting Tester --
-sleep seconds=15/
+sleep seconds=8/
ant dir=${catalina.home}/tester/dist/bin antfile=tester.xml
target=all
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2004/09/05 03:17:51
Modified:.build.xml
Log:
- Fix typo.
Revision ChangesPath
1.210 +23 -23jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- build.xml 4 Sep 2004 18:05:58 - 1.209
+++ build.xml 5 Sep 2004 10:17:51 - 1.210
@@ -13,31 +13,31 @@
!-- Project Properties --
property name=name value=Apache Tomcat /
property name=year value=2004 /
- property name=version.major value=5 /
+ property name=version.major value=5 /
property name=version.minor value=5 /
!-- When releasing set the 'version.build' to even number
and 'version.isdev' to zero.
- --
- property name=version.build value=1 /
- property name=version.patch value=0 /
- property name=version.isdev value=1 /
-
- condition property=isDevVersion value=-dev
-not
- equals arg1=${version.isdev} arg2=0/
-/not
- /condition
- condition property=isPatchedVersion value=.${version.patch}
-not
- equals arg1=${version.patch} arg2=0/
-/not
- /condition
- !-- Second definition if not already conditionaly set --
- property name=isDevVersion value= /
- property name=isPatchedVersion value= /
-
- property name=version
value=${version.major}.${version.minor}.${version.build}${isPatchedVersion}${isDevVersion}
/
- property name=version.number
value=${version.major}.${version.minor}.${version.build}.${version.patch} /
+ --
+ property name=version.build value=1 /
+ property name=version.patch value=0 /
+ property name=version.isdev value=1 /
+
+ condition property=isDevVersion value=-dev
+not
+ equals arg1=${version.isdev} arg2=0/
+/not
+ /condition
+ condition property=isPatchedVersion value=.${version.patch}
+not
+ equals arg1=${version.patch} arg2=0/
+/not
+ /condition
+ !-- Second definition if not already conditionaly set --
+ property name=isDevVersion value= /
+ property name=isPatchedVersion value= /
+
+ property name=version
value=${version.major}.${version.minor}.${version.build}${isPatchedVersion}${isDevVersion}
/
+ property name=version.number
value=${version.major}.${version.minor}.${version.build}.${version.patch} /
property name=project value=jakarta-tomcat /
property name=final.namevalue=${project}-${version} /
@@ -1619,7 +1619,7 @@
target name=package-compat-zip
zip zipfile=${tomcat.release}/v${version}/bin/${final.name}-compat.zip
- zipfileset dir=${tomcat.compat} prefix=${final.name}t
+ zipfileset dir=${tomcat.compat} prefix=${final.name}
includes=** /
zipfileset dir=${tomcat.dist} prefix=${final.name}
includes=LICENSE /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
mturk 2004/09/04 11:05:58
Modified:.build.xml
Log:
Change the way how the 'version' property gets set.
Instead manually setting the property it gets constucted now.
If the 'version-dev' is set to nonzero '-dev' is appended.
If the 'version.patch' is set the 'dot-patch' is appended.
Revision ChangesPath
1.209 +27 -3 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- build.xml 3 Sep 2004 08:18:15 - 1.208
+++ build.xml 4 Sep 2004 18:05:58 - 1.209
@@ -13,8 +13,32 @@
!-- Project Properties --
property name=name value=Apache Tomcat /
property name=year value=2004 /
- property name=version value=5.5-dev /
- property name=dottedver value=5.5.0.1 /
+ property name=version.major value=5 /
+ property name=version.minor value=5 /
+ !-- When releasing set the 'version.build' to even number
+and 'version.isdev' to zero.
+ --
+ property name=version.build value=1 /
+ property name=version.patch value=0 /
+ property name=version.isdev value=1 /
+
+ condition property=isDevVersion value=-dev
+not
+ equals arg1=${version.isdev} arg2=0/
+/not
+ /condition
+ condition property=isPatchedVersion value=.${version.patch}
+not
+ equals arg1=${version.patch} arg2=0/
+/not
+ /condition
+ !-- Second definition if not already conditionaly set --
+ property name=isDevVersion value= /
+ property name=isPatchedVersion value= /
+
+ property name=version
value=${version.major}.${version.minor}.${version.build}${isPatchedVersion}${isDevVersion}
/
+ property name=version.number
value=${version.major}.${version.minor}.${version.build}.${version.patch} /
+
property name=project value=jakarta-tomcat /
property name=final.namevalue=${project}-${version} /
property name=final-src.namevalue=${project}-${version}-src /
@@ -1508,7 +1532,7 @@
copy file=${jtc.home}/procrun/bin/tomcat5w.exe
tofile=${tomcat.dist}/bin/tomcat5w.exe /
filter token=VERSION value=${version}/
-filter token=DOTTEDVER value=${dottedver}/
+filter token=VERSION_NUMBER value=${version.number}/
copy file=tomcat.nsi tofile=${tomcat.dist}/tomcat.nsi
filtering=true/
exec dir=${tomcat.dist} executable=${nsis.exe}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml tomcat.nsi
remm2004/09/02 06:16:52
Modified:.build.xml tomcat.nsi
Log:
- Add jmx and xerces before running tester.
- Remove useless stuff in installer: tools.jar and the JDK path are now useless. My
Java detection code, which has always been soso, needs
to be updated: I have JDK 1.4, JDK 5 and JRE 5, and the thing preselects JDK 1.4
(the worst default) ;)
Revision ChangesPath
1.207 +5 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- build.xml 2 Sep 2004 00:47:50 - 1.206
+++ build.xml 2 Sep 2004 13:16:52 - 1.207
@@ -1135,6 +1135,11 @@
target name=run-tester
description=Catalina Tests depends=dist-tester
+ !-- For Java 1.4 --
+ copy file=${jmx.jar} tofile=${tomcat.build}/bin/jmx.jar /
+copy todir=${tomcat.build}/common/endorsed file=${xercesImpl.jar}/
+copy todir=${tomcat.build}/common/endorsed file=${xml-apis.jar}/
+
parallel
java classname=LauncherBootstrap fork=yes
1.54 +9 -19 jakarta-tomcat-5/tomcat.nsi
Index: tomcat.nsi
===
RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- tomcat.nsi2 Sep 2004 10:07:02 - 1.53
+++ tomcat.nsi2 Sep 2004 13:16:52 - 1.54
@@ -24,12 +24,12 @@
!include MUI.nsh
!include StrFunc.nsh
${StrRep}
- Var JavaHome
+ Var JavaHome
;
;Configuration
- !define MUI_WELCOMEFINISHPAGE_BITMAP side_left.bmp
+ !define MUI_WELCOMEFINISHPAGE_BITMAP side_left.bmp
!define MUI_FINISHPAGE_SHOWREADME $INSTDIR\webapps\ROOT\RELEASE-NOTES.txt
!define MUI_FINISHPAGE_RUN $INSTDIR\bin\tomcat5w.exe
!define MUI_FINISHPAGE_RUN_PARAMETERS //MS//Tomcat5
@@ -70,7 +70,7 @@
!insertmacro MUI_UNPAGE_INSTFILES
;License dialog
- LicenseData License.rtf
+ LicenseData License.rtf
;Component-selection page
;Descriptions
@@ -138,16 +138,6 @@
SetOutPath $INSTDIR\conf\Catalina\localhost
File conf\Catalina\localhost\manager.xml
- IfSilent 0 +3
- Call findJavaPath
- Pop $2
-
- IfSilent +2 0
- !insertmacro MUI_INSTALLOPTIONS_READ $2 jvm.ini Field 2 State
-
-; CopyFiles /SILENT $2\lib\tools.jar $INSTDIR\common\lib 4500
- ClearErrors
-
Call configure
Call findJavaPath
Pop $2
@@ -155,7 +145,7 @@
IfSilent +2 0
!insertmacro MUI_INSTALLOPTIONS_READ $2 jvm.ini Field 2 State
- StrCpy $JavaHome $2
+ StrCpy $JavaHome $2
Push $2
Call findJVMPath
Pop $2
@@ -178,7 +168,7 @@
IfSilent +2 0
!insertmacro MUI_INSTALLOPTIONS_READ $2 jvm.ini Field 2 State
- StrCpy $JavaHome $2
+ StrCpy $JavaHome $2
Push $2
Call findJVMPath
Pop $2
@@ -282,8 +272,8 @@
SectionEnd
Section -post
- nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //US//Tomcat5 --Classpath
$JavaHome\lib\tools.jar;$INSTDIR\bin\bootstrap.jar --StartClass
org.apache.catalina.startup.Bootstrap --StopClass
org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop
--StartMode jvm --StopMode jvm'
- nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //US//Tomcat5 --JvmOptions
-Dcatalina.home=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Djava.io.tmpdir=$INSTDIR\temp
--StdOutput $INSTDIR\logs\stdout.log --StdError $INSTDIR\logs\stderr.log'
+ nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //US//Tomcat5 --Classpath
;$INSTDIR\bin\bootstrap.jar --StartClass org.apache.catalina.startup.Bootstrap
--StopClass org.apache.catalina.startup.Bootstrap --StartParams start --StopParams
stop --StartMode jvm --StopMode jvm'
+ nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //US//Tomcat5 --JvmOptions
-Dcatalina.home=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Djava.io.tmpdir=$INSTDIR\temp
--StdOutput $INSTDIR\logs\stdout.log --StdError $INSTDIR\logs\stderr.log'
WriteUninstaller $INSTDIR\Uninstall.exe
@@ -433,7 +423,7 @@
MessageBox MB_OK No Java Virtual Machine found.
Quit
NoErrors1:
- StrCpy $JavaHome $3
+ StrCpy $JavaHome $3
Push $3
Call findJVMPath
Pop $4
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-5 build.xml tomcat.nsi
[EMAIL PROTECTED] wrote: - Remove useless stuff in installer: tools.jar and the JDK path are now useless. Does it mean that the classloader is taking care of that? Does 5_0 branch still needs the tools.jar? Regards, MT. smime.p7s Description: S/MIME Cryptographic Signature
Re: cvs commit: jakarta-tomcat-5 build.xml tomcat.nsi
Mladen Turk wrote: [EMAIL PROTECTED] wrote: - Remove useless stuff in installer: tools.jar and the JDK path are now useless. Does it mean that the classloader is taking care of that? Well, there's a Java compiler bundled, so tools.jar is not needed (and Tomcat can now use a JRE). Does 5_0 branch still needs the tools.jar? Yes. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-5 build.xml tomcat.nsi
Remy Maucherat wrote: Does it mean that the classloader is taking care of that? Well, there's a Java compiler bundled, so tools.jar is not needed (and Tomcat can now use a JRE). Wow, I'll try it then with the fresh 1.5.0-RC released today :). Regards, MT. smime.p7s Description: S/MIME Cryptographic Signature
cvs commit: jakarta-tomcat-5 build.xml
remm2004/09/01 06:03:00
Modified:.build.xml
Log:
- Build a baseline _en resource bundle.
Revision ChangesPath
1.204 +17 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- build.xml 1 Sep 2004 10:10:48 - 1.203
+++ build.xml 1 Sep 2004 13:03:00 - 1.204
@@ -536,6 +536,20 @@
/fileset
/jar
+ !-- Build baseline _en bundle to ease --
+copy todir=${tomcat.build}/classes includeemptydirs=false
+ fileset dir=${tomcat.build}/classes
+include name=**/LocalStrings.properties/
+ /fileset
+ mapper type=glob from=*.properties to=*_en.properties/
+/copy
+jar jarfile=${tomcat.build}/common/i18n/tomcat-i18n-en.jar
+ fileset dir=${tomcat.build}/classes
+include name=**/LocalStrings_en.properties /
+exclude name=**/tomcat4/** /
+ /fileset
+/jar
+
/target
!-- == Build dependent code === --
@@ -1321,6 +1335,9 @@
/copy
copy todir=${tomcat.dist}/common/endorsed
fileset dir=${tomcat.build}/common/endorsed /
+/copy
+copy todir=${tomcat.dist}/common/i18n
+ fileset dir=${tomcat.build}/common/i18n /
/copy
copy todir=${tomcat.dist}/common/lib
fileset dir=${tomcat.build}/common/lib /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
yoavs 2004/09/01 17:47:50
Modified:.build.xml
Log:
Builds successfully on JDK 5.0.
Revision ChangesPath
1.206 +6 -2 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- build.xml 1 Sep 2004 23:45:41 - 1.205
+++ build.xml 2 Sep 2004 00:47:50 - 1.206
@@ -13,7 +13,7 @@
!-- Project Properties --
property name=name value=Apache Tomcat /
property name=year value=2004 /
- property name=version value=5.5.0 /
+ property name=version value=5.5-dev /
property name=project value=jakarta-tomcat /
property name=final.namevalue=${project}-${version} /
property name=final-src.namevalue=${project}-${version}-src /
@@ -67,7 +67,7 @@
property name=compile.optimize value=false/
property name=compile.debugvalue=true /
property name=compile.deprecation value=false /
-
+ property name=compile.source value=1.4 /
!-- === DETECT: Display configuration == --
target name=detect
@@ -378,6 +378,7 @@
optimize=off
debug=${compile.debug}
deprecation=${compile.deprecation}
+ source=${compile.source}
failonerror=false
srcdir=${ROOT.base}/WEB-INF/src
excludes=**/*.smap
@@ -405,6 +406,7 @@
optimize=off
debug=${compile.debug}
deprecation=${compile.deprecation}
+ source=${compile.source}
failonerror=false
srcdir=${jsp-examples.base}/WEB-INF/src
excludes=**/*.smap
@@ -430,6 +432,7 @@
optimize=off
debug=${compile.debug}
deprecation=${compile.deprecation}
+ source=${compile.source}
failonerror=false
srcdir=${admin.base}/WEB-INF/src
excludes=**/*.smap
@@ -659,6 +662,7 @@
optimize=off
debug=${compile.debug}
deprecation=${compile.deprecation}
+ source=${compile.source}
sourcepath=${tomcat-dbcp.home}/src/java
srcdir=src/java
include name=** /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2004/08/25 10:46:32
Modified:.build.xml
Log:
- Rework the packaging as discussed, with separate bundles for admin and compat.
Revision ChangesPath
1.199 +98 -34jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- build.xml 18 Aug 2004 01:54:47 - 1.198
+++ build.xml 25 Aug 2004 17:46:32 - 1.199
@@ -13,7 +13,7 @@
!-- Project Properties --
property name=name value=Apache Tomcat /
property name=year value=2004 /
- property name=version value=5.5 /
+ property name=version value=5.5.0 /
property name=project value=jakarta-tomcat /
property name=final.namevalue=${project}-${version} /
property name=final-src.namevalue=${project}-${version}-src /
@@ -739,7 +739,6 @@
copy todir=embed/lib file=${commons-modeler.jar}/
copy todir=embed/lib file=${commons-beanutils.jar}/
copy todir=embed/lib file=${commons-collections.jar}/
-copy todir=embed/lib file=${jmx.jar}/
copy todir=embed/lib file=${regexp.jar}/
copy todir=embed/lib file=${jasper-compiler-jdt.jar}/
@@ -1237,7 +1236,11 @@
!-- Copy the contents of each build directory --
copy todir=${tomcat.dist}/bin
- fileset dir=${tomcat.build}/bin /
+ fileset dir=${tomcat.build}/bin
+ exclude name=catalina.xml/
+ exclude name=commons-launcher.jar/
+ exclude name=*-using-launcher.*/
+ /fileset
/copy
copy todir=${tomcat.dist}/common/classes
fileset dir=${tomcat.build}/common/classes /
@@ -1414,7 +1417,7 @@
!-- RELEASE: Create Release === --
- target name=release
depends=clean,dist,dist-source,prepare-release,installer,package-zip,package-tgz,package-embed-zip,package-embed-tgz,package-deployer-zip,package-deployer-tgz,package-src-zip,package-src-tgz,clean-tester,run-tester,run-watchdog
+ target name=release
depends=clean,dist,dist-source,prepare-release,installer,package-zip,package-tgz,package-embed-zip,package-embed-tgz,package-deployer-zip,package-deployer-tgz,package-compat-zip,package-compat-tgz,package-admin-zip,package-admin-tgz,package-src-zip,package-src-tgz,clean-tester,run-tester
description=Create a Tomcat 5 packaged distribution
filter token=VERSION value=${version}/
@@ -1434,36 +1437,24 @@
target name=package-zip
zip zipfile=${tomcat.release}/v${version}/bin/${final.name}.zip
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=bin/** /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=common/** /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=conf/** /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=logs/** /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=server/** /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=shared/** /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=webapps/** /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=work/** /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=temp/** /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=LICENSE /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=NOTICE /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=README.txt /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=RELEASE-NOTES /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=RUNNING.txt /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=BENCHMARKS.txt /
+ zipfileset dir=${tomcat.dist} prefix=${final.name}
+ include name=bin/**/
+ include name=conf/**/
+ include name=logs/**/
+ include name=server/**/
+ include name=shared/**/
+ include name=webapps/**/
+ include name=work/**/
+ include name=temp/**/
+ include name=LICENSE/
+ include name=NOTICE/
+ include name=README.txt/
+ include name=RELEASE-NOTES/
+ include name=RUNNING.txt/
+ include name=BENCHMARKS.txt/
+ exclude name=server/webapps/admin/**/
+ exclude name=conf/Catalina/localhost/admin.xml/
+ /zipfileset
/zip
/target
@@ -1497,6 +1488,39
cvs commit: jakarta-tomcat-5 build.xml
remm2004/08/25 17:21:10
Modified:.build.xml
Log:
- Fix packaging issues.
Revision ChangesPath
1.200 +3 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- build.xml 25 Aug 2004 17:46:32 - 1.199
+++ build.xml 26 Aug 2004 00:21:10 - 1.200
@@ -1240,6 +1240,8 @@
exclude name=catalina.xml/
exclude name=commons-launcher.jar/
exclude name=*-using-launcher.*/
+ exclude name=LauncherBootstrap.class/
+ exclude name=launcher.properties/
/fileset
/copy
copy todir=${tomcat.dist}/common/classes
@@ -1439,6 +1441,7 @@
zip zipfile=${tomcat.release}/v${version}/bin/${final.name}.zip
zipfileset dir=${tomcat.dist} prefix=${final.name}
include name=bin/**/
+ include name=common/**/
include name=conf/**/
include name=logs/**/
include name=server/**/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
billbarker2004/08/17 18:54:47
Modified:.build.xml
Log:
Fix typo.
Reported By: Gumpy
Revision ChangesPath
1.198 +1 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- build.xml 16 Aug 2004 23:52:11 - 1.197
+++ build.xml 18 Aug 2004 01:54:47 - 1.198
@@ -742,7 +742,7 @@
copy todir=embed/lib file=${jmx.jar}/
copy todir=embed/lib file=${regexp.jar}/
-copy todir=embed/lib file=${jdt.jar}/
+copy todir=embed/lib file=${jasper-compiler-jdt.jar}/
copy todir=embed/lib
fileset dir=build/server/lib
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
billbarker2004/08/13 00:22:22
Modified:.build.xml
Log:
Small change to the dbcp build target to fix Gump build.
Revision ChangesPath
1.196 +6 -2 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- build.xml 12 Aug 2004 04:56:08 - 1.195
+++ build.xml 13 Aug 2004 07:22:22 - 1.196
@@ -514,13 +514,17 @@
param name=destfile value=${tomcat-dbcp.jar} /
/antcall
+ antcall target=build-tomcat-dbcp /
+ /target
+
+ target name=build-tomcat-dbcp
mkdir dir=${tomcat-dbcp.home}/
- antcall target=build-tomcat-dbcp
+ antcall target=-build-tomcat-dbcp
param name=basedir value=${tomcat-dbcp.home} /
/antcall
/target
- target name=build-tomcat-dbcp
+ target name=-build-tomcat-dbcp
copy todir=${tomcat-dbcp.home}
fileset dir=${commons-collections.home}
include name=**/collections/CursorableLinkedList.java /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
billbarker2004/08/11 21:56:08
Modified:.build.xml
Log:
Move the dbcp jar building code into its own target (so that Gump can invoke it).
Also make the directory and jar file configurable (mostly for Gump). Cleaned up the
download target so that it isn't so touchy about building the dbcp jar.
Revision ChangesPath
1.195 +26 -16jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- build.xml 10 Aug 2004 22:42:37 - 1.194
+++ build.xml 12 Aug 2004 04:56:08 - 1.195
@@ -55,6 +55,9 @@
property name=tomcat.release value=${basedir}/release/
property name=webapps.buildvalue=${catalina.home}/webapps/build/
property name=webapps.dist value=${catalina.home}/webapps/dist/
+ property name=tomcat-dbcp.home value=${base.path}/tomcat-deps /
+ property name=tomcat-dbcp.jar
+ value=${tomcat-dbcp.home}/naming-factory-dbcp-${commons-dbcp.version}.jar/
!-- Some compilers will disable debugging if true. And it doesn't do anything
in most cases --
@@ -500,18 +503,25 @@
antcall target=downloadgz
param name=sourcefile value=${commons-collections-src.loc}/
- param name=destfile
value=${base.path}/tomcat-deps/naming-factory-dbcp-${commons-dbcp.version}.jar/
+ param name=destfile value=${tomcat-dbcp.jar} /
/antcall
antcall target=downloadgz
param name=sourcefile value=${commons-pool-src.loc}/
- param name=destfile
value=${base.path}/tomcat-deps/naming-factory-dbcp-${commons-dbcp.version}.jar/
+ param name=destfile value=${tomcat-dbcp.jar} /
/antcall
antcall target=downloadgz
param name=sourcefile value=${commons-dbcp-src.loc}/
- param name=destfile
value=${base.path}/tomcat-deps/naming-factory-dbcp-${commons-dbcp.version}.jar/
+ param name=destfile value=${tomcat-dbcp.jar} /
/antcall
- mkdir dir=${base.path}/tomcat-deps/
-copy todir=${base.path}/tomcat-deps
+
+ mkdir dir=${tomcat-dbcp.home}/
+ antcall target=build-tomcat-dbcp
+ param name=basedir value=${tomcat-dbcp.home} /
+ /antcall
+ /target
+
+ target name=build-tomcat-dbcp
+copy todir=${tomcat-dbcp.home}
fileset dir=${commons-collections.home}
include name=**/collections/CursorableLinkedList.java /
include name=**/collections/KeyValue.java /
@@ -529,34 +539,34 @@
exclude name=**/test/** /
/fileset
/copy
- replace dir=${base.path}/tomcat-deps/src/java/org/apache/commons
+ replace dir=${tomcat-dbcp.home}/src/java/org/apache/commons
replacefilter token=return UnmodifiableList.decorate(l);
value=return l; /
replacefilter token=import
org.apache.commons.collections.list.UnmodifiableList;
value= /
/replace
- replace dir=${base.path}/tomcat-deps/src/java/org/apache/commons
+ replace dir=${tomcat-dbcp.home}/src/java/org/apache/commons
replacefilter token=org.apache.commons
value=org.apache.tomcat.dbcp /
/replace
- mkdir dir=${base.path}/tomcat-deps/src/java/org/apache/tomcat/dbcp /
- move todir=${base.path}/tomcat-deps/src/java/org/apache/tomcat/dbcp
- fileset dir=${base.path}/tomcat-deps/src/java/org/apache/commons /
+ mkdir dir=${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp /
+ move todir=${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp
+ fileset dir=${tomcat-dbcp.home}/src/java/org/apache/commons /
/move
- mkdir dir=${base.path}/tomcat-deps/classes/
-javac destdir=${base.path}/tomcat-deps/classes
+ mkdir dir=${tomcat-dbcp.home}/classes/
+javac destdir=classes
optimize=off debug=on
- srcdir=${base.path}/tomcat-deps/src/java
+ sourcepath=${tomcat-dbcp.home}/src/java
+ srcdir=src/java
include name=** /
/javac
-jar
jarfile=${base.path}/tomcat-deps/naming-factory-dbcp-${commons-dbcp.version}.jar
+jar jarfile=${tomcat-dbcp.jar}
index=true
- fileset dir=${base.path}/tomcat-deps/classes
+ fileset dir=${tomcat-dbcp.home}/classes
include name=**/*.class /
include name=**/*.properties /
/fileset
/jar
-
/target
target name=build-webapps depends=init
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
billbarker2004/06/27 19:38:41
Modified:.build.xml
Log:
Don't copy the (useless) JSP fragment files for the admin webapp.
Fix for Bug #29728
Revision ChangesPath
1.191 +1 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- build.xml 27 Jun 2004 23:56:22 - 1.190
+++ build.xml 28 Jun 2004 02:38:41 - 1.191
@@ -1154,6 +1154,7 @@
copy todir=${tomcat.dist}/server/webapps
fileset dir=${tomcat.build}/server/webapps
exclude name=admin/**/*.jsp /
+exclude name=admin/**/*.jspf /
exclude name=admin/WEB-INF/classes/** /
exclude name=admin/WEB-INF/src/** /
exclude name=manager/WEB-INF/classes/** /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
yoavs 2004/05/27 07:10:47
Modified:.build.xml
Log:
Fixed missing on line 28
Revision ChangesPath
1.187 +1 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- build.xml 26 May 2004 20:14:27 - 1.186
+++ build.xml 27 May 2004 14:10:44 - 1.187
@@ -25,7 +25,7 @@
property name=jtc.project value=jakarta-tomcat-connectors /
property name=jasper.projectvalue=jakarta-tomcat-jasper /
property name=ant.jar value=${ant.home}/lib/ant.jar/
- property name=ant-launcher.jar value=${ant.home}/lib/ant-launcher.jar/
+ property name=ant-launcher.jar value=${ant.home}/lib/ant-launcher.jar/
property name=cvstagvalue= /
property name=cvs.base
value=${basedir}/../
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
yoavs 2004/05/26 09:48:26
Modified:.build.xml
Log:
Minor fixes
Revision ChangesPath
1.185 +3 -3 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- build.xml 4 May 2004 16:29:42 - 1.184
+++ build.xml 26 May 2004 16:48:26 - 1.185
@@ -12,7 +12,7 @@
!-- Project Properties --
property name=name value=Apache Tomcat /
- property name=year value=2003 /
+ property name=year value=2004 /
property name=version value=5.0 /
property name=project value=jakarta-tomcat /
property name=final.namevalue=${project}-${version} /
@@ -627,9 +627,9 @@
/target
- !-- == Embeded target === --
+ !-- == Embed target === --
- target name=embed description=Create a set of jars for embeded tomcat
+ target name=embed description=Create a set of jars for embedded tomcat
!-- Generic libraries ( share ?) --
copy todir=embed/lib file=${commons-logging.jar}/
copy todir=embed/lib file=${commons-digester.jar}/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
yoavs 2004/05/26 13:14:27
Modified:.build.xml
Log:
Modified to include ant-launcher.jar for people building with Ant 1.6 or later (also
required for startup-using-launcher scripts).
Revision ChangesPath
1.186 +6 -3 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- build.xml 26 May 2004 16:48:26 - 1.185
+++ build.xml 26 May 2004 20:14:27 - 1.186
@@ -25,6 +25,7 @@
property name=jtc.project value=jakarta-tomcat-connectors /
property name=jasper.projectvalue=jakarta-tomcat-jasper /
property name=ant.jar value=${ant.home}/lib/ant.jar/
+ property name=ant-launcher.jar value=${ant.home}/lib/ant-launcher.jar/
property name=cvstagvalue= /
property name=cvs.base
value=${basedir}/../
@@ -145,6 +146,7 @@
failonerror=false /
copy todir=${tomcat.build}/common/lib file=${ant.jar}/
+copy todir=${tomcat.build}/common/lib file=${ant-launcher.jar}/
/target
!-- == Build all components === --
@@ -639,13 +641,13 @@
copy todir=embed/lib file=${jmx.jar}/
copy todir=embed/lib file=${regexp.jar}/
+copy todir=embed/lib file=${ant.jar}/
+copy todir=embed/lib file=${ant-launcher.jar}/
+
copy todir=embed/lib
fileset dir=build/server/lib
include name=tomcat-util.jar/
/fileset
- fileset dir=${ant.home}/lib
-include name=ant.jar/
- /fileset
/copy
!-- Connector --
@@ -698,6 +700,7 @@
copy todir=embed/lib
fileset dir=build/common/lib
include name=ant.jar/
+include name=ant-launcher.jar /
/fileset
fileset dir=build/common/lib
include name=jasper-compiler.jar/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2004/05/04 09:29:42
Modified:.build.xml
Log:
- Don't include the manifest.
Revision ChangesPath
1.184 +3 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- build.xml 7 Apr 2004 11:33:40 - 1.183
+++ build.xml 4 May 2004 16:29:42 - 1.184
@@ -1143,7 +1143,9 @@
fileset dir=${tomcat.build}/common/lib /
/copy
copy todir=${tomcat.dist}/conf
- fileset dir=${tomcat.build}/conf /
+ fileset dir=${tomcat.build}/conf
+exclude name=MANIFEST.MF /
+ /fileset
/copy
copy todir=${tomcat.dist}/server/lib
fileset dir=${tomcat.build}/server/lib /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2004/03/30 03:21:53
Modified:.build.xml
Log:
- Include jmx.jar again.
Revision ChangesPath
1.181 +1 -3 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- build.xml 12 Mar 2004 14:35:45 - 1.180
+++ build.xml 30 Mar 2004 11:21:53 - 1.181
@@ -1130,9 +1130,7 @@
!-- Copy the contents of each build directory --
copy todir=${tomcat.dist}/bin
- fileset dir=${tomcat.build}/bin
-exclude name=jmx.jar /
- /fileset
+ fileset dir=${tomcat.build}/bin /
/copy
copy todir=${tomcat.dist}/common/classes
fileset dir=${tomcat.build}/common/classes /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2004/03/12 06:31:24
Modified:.build.xml
Log:
- Don't copy jmx.jar to dist.
Revision ChangesPath
1.179 +3 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- build.xml 2 Mar 2004 12:33:00 - 1.178
+++ build.xml 12 Mar 2004 14:31:24 - 1.179
@@ -1136,7 +1136,9 @@
!-- Copy the contents of each build directory --
copy todir=${tomcat.dist}/bin
- fileset dir=${tomcat.build}/bin /
+ fileset dir=${tomcat.build}/bin
+exclude name=jmx.jar /
+ /fileset
/copy
copy todir=${tomcat.dist}/common/classes
fileset dir=${tomcat.build}/common/classes /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2004/03/12 06:35:45
Modified:.build.xml
Log:
- Don't bother about the other JMX related binaries.
Revision ChangesPath
1.180 +0 -6 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- build.xml 12 Mar 2004 14:31:24 - 1.179
+++ build.xml 12 Mar 2004 14:35:45 - 1.180
@@ -137,12 +137,6 @@
copy todir=${tomcat.build}/bin
file=${commons-logging-api.jar} /
copy tofile=${tomcat.build}/bin/jmx.jar file=${jmx.jar} /
-copy tofile=${tomcat.build}/common/lib/jmx-tools.jar
-file=${jmx-tools.jar} failonerror=false /
-copy tofile=${tomcat.build}/common/lib/jmx-remote.jar
-file=${jmx-remote.jar} failonerror=false /
-copy tofile=${tomcat.build}/common/lib/jmx-remote-tools.jar
-file=${jmx-remote-tools.jar} failonerror=false /
copy todir=${tomcat.build}/server/lib file=${commons-modeler.jar} /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-5 build.xml
[EMAIL PROTECTED] wrote:
remm2004/03/12 06:35:45
Modified:.build.xml
Log:
- Don't bother about the other JMX related binaries.
Revision ChangesPath
1.180 +0 -6 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- build.xml 12 Mar 2004 14:31:24 - 1.179
+++ build.xml 12 Mar 2004 14:35:45 - 1.180
@@ -137,12 +137,6 @@
copy todir=${tomcat.build}/bin
file=${commons-logging-api.jar} /
copy tofile=${tomcat.build}/bin/jmx.jar file=${jmx.jar} /
-copy tofile=${tomcat.build}/common/lib/jmx-tools.jar
-file=${jmx-tools.jar} failonerror=false /
-copy tofile=${tomcat.build}/common/lib/jmx-remote.jar
-file=${jmx-remote.jar} failonerror=false /
-copy tofile=${tomcat.build}/common/lib/jmx-remote-tools.jar
-file=${jmx-remote-tools.jar} failonerror=false /
copy todir=${tomcat.build}/server/lib file=${commons-modeler.jar} /
We have HTTP and JRMP support in jmx-tools.jar, are you sure we could
forget to include them ?
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-5 build.xml
Henri Gomez wrote:
[EMAIL PROTECTED] wrote:
remm2004/03/12 06:35:45
Modified:.build.xml
Log:
- Don't bother about the other JMX related binaries.
Revision ChangesPath
1.180 +0 -6 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- build.xml12 Mar 2004 14:31:24 -1.179
+++ build.xml12 Mar 2004 14:35:45 -1.180
@@ -137,12 +137,6 @@
copy todir=${tomcat.build}/bin
file=${commons-logging-api.jar} /
copy tofile=${tomcat.build}/bin/jmx.jar file=${jmx.jar} /
-copy tofile=${tomcat.build}/common/lib/jmx-tools.jar
-file=${jmx-tools.jar} failonerror=false /
-copy tofile=${tomcat.build}/common/lib/jmx-remote.jar
-file=${jmx-remote.jar} failonerror=false /
-copy tofile=${tomcat.build}/common/lib/jmx-remote-tools.jar
-file=${jmx-remote-tools.jar} failonerror=false /
copy todir=${tomcat.build}/server/lib
file=${commons-modeler.jar} /
We have HTTP and JRMP support in jmx-tools.jar, are you sure we could
forget to include them ?
I've never actually bundled these binaries (at least, not for a while),
so there's no change.
Rémy
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-5 build.xml
Remy Maucherat wrote:
Henri Gomez wrote:
[EMAIL PROTECTED] wrote:
remm2004/03/12 06:35:45
Modified:.build.xml
Log:
- Don't bother about the other JMX related binaries.
Revision ChangesPath
1.180 +0 -6 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- build.xml12 Mar 2004 14:31:24 -1.179
+++ build.xml12 Mar 2004 14:35:45 -1.180
@@ -137,12 +137,6 @@
copy todir=${tomcat.build}/bin
file=${commons-logging-api.jar} /
copy tofile=${tomcat.build}/bin/jmx.jar file=${jmx.jar} /
-copy tofile=${tomcat.build}/common/lib/jmx-tools.jar
-file=${jmx-tools.jar} failonerror=false /
-copy tofile=${tomcat.build}/common/lib/jmx-remote.jar
-file=${jmx-remote.jar} failonerror=false /
-copy tofile=${tomcat.build}/common/lib/jmx-remote-tools.jar
-file=${jmx-remote-tools.jar} failonerror=false /
copy todir=${tomcat.build}/server/lib
file=${commons-modeler.jar} /
We have HTTP and JRMP support in jmx-tools.jar, are you sure we could
forget to include them ?
I've never actually bundled these binaries (at least, not for a while),
so there's no change.
Ok, they are needed if you want to use JMX from a JMX console like
ExtremeJ or MC4J, since they use JRMP.
Just my .2 EUR
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2004/03/02 04:33:00
Modified:.build.xml
Log:
- Register all classloaders with JMX, so that Tomcat is actually manageable
through JMX remote (otherwise, instantiating a new MBean is not possible).
- Move jmx.jar (used for JDKs 1.5).
Revision ChangesPath
1.178 +1 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- build.xml 2 Feb 2004 03:00:11 - 1.177
+++ build.xml 2 Mar 2004 12:33:00 - 1.178
@@ -136,7 +136,7 @@
copy todir=${tomcat.build}/bin
file=${commons-logging-api.jar} /
-copy tofile=${tomcat.build}/common/lib/jmx.jar file=${jmx.jar} /
+copy tofile=${tomcat.build}/bin/jmx.jar file=${jmx.jar} /
copy tofile=${tomcat.build}/common/lib/jmx-tools.jar
file=${jmx-tools.jar} failonerror=false /
copy tofile=${tomcat.build}/common/lib/jmx-remote.jar
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml tomcat.nsi
markt 2004/02/01 10:27:28
Modified:.build.xml tomcat.nsi
Log:
- Update build process to include WebDAV servlet.
Revision ChangesPath
1.176 +4 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- build.xml 31 Jan 2004 03:55:54 - 1.175
+++ build.xml 1 Feb 2004 18:27:28 - 1.176
@@ -561,6 +561,10 @@
property name=flags.hide value=true /
/ant
+ant dir=${catalina.home}/webapps/webdav target=build-main
+property name=webapps.build value=${tomcat.build}/webapps /
+/ant
+
!-- Precompiling and fixing webapps --
antcall target=build-webapps-precompile /
antcall target=fix-webapps /
1.41 +3 -1 jakarta-tomcat-5/tomcat.nsi
Index: tomcat.nsi
===
RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- tomcat.nsi27 Dec 2003 17:32:23 - 1.40
+++ tomcat.nsi1 Feb 2004 18:27:28 - 1.41
@@ -215,6 +215,7 @@
SetOutPath $INSTDIR\webapps
File /r webapps\jsp-examples
File /r webapps\servlets-examples
+ File /r webapps\webdav
SectionEnd
@@ -493,6 +494,7 @@
RMDir /r $INSTDIR\webapps\tomcat-docs
RMDir /r $INSTDIR\webapps\servlets-examples
RMDir /r $INSTDIR\webapps\jsp-examples
+ RMDir /r $INSTDIR\webapps\webdav
RMDir $INSTDIR\webapps
RMDir /r $INSTDIR\work
RMDir /r $INSTDIR\temp
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
billbarker2004/02/01 19:00:11
Modified:.build.xml
Log:
Hack to work-around the fact that Gumpy sends us the wrong path for jsvc.tar.gz.
Revision ChangesPath
1.177 +2 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- build.xml 1 Feb 2004 18:27:28 - 1.176
+++ build.xml 2 Feb 2004 03:00:11 - 1.177
@@ -147,7 +147,8 @@
copy todir=${tomcat.build}/server/lib file=${commons-modeler.jar} /
copy todir=${tomcat.build}/bin file=${commons-daemon.jar} /
-copy todir=${tomcat.build}/bin file=${commons-daemon.jsvc.tar.gz} /
+copy todir=${tomcat.build}/bin file=${commons-daemon.jsvc.tar.gz}
+failonerror=false /
copy todir=${tomcat.build}/common/lib file=${ant.jar}/
/target
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
billbarker2004/01/30 19:55:54 Modified:.build.xml Log: Gumpy doesn't seem to be as smart as its father, so add a target to help it out. The gump build seems to have diverged from the 'release' build, but I left it with what was in gump before. Revision ChangesPath 1.175 +3 -0 jakarta-tomcat-5/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- build.xml 15 Jan 2004 14:37:37 - 1.174 +++ build.xml 31 Jan 2004 03:55:54 - 1.175 @@ -1772,4 +1772,7 @@ out=build/classes/org/apache/coyote/tomcat5/mbeans-descriptors.xml.ser / /target + target name=gumpy-build description=HACK: to stop gumpy from nagging + depends=prepare-release,dist,dist-source,installer,package-zip,package-tgz,package-src-zip,package-src-tgz / + /project - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2004/01/15 01:38:49
Modified:.build.xml
Log:
- Make .tgz source package the same as the zip package. This wasn't Ant's
fault after all.
Revision ChangesPath
1.173 +2 -3 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- build.xml 19 Dec 2003 16:47:55 - 1.172
+++ build.xml 15 Jan 2004 09:38:49 - 1.173
@@ -1498,7 +1498,7 @@
excludes=**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico eol=lf/
tar longfile=gnu compression=gzip
tarfile=${tomcat.release}/v${version}/src/${final-src.name}.tar.gz
- tarfileset dir=${tomcat.dist} mode=755 prefix=${final-src.name}
+ tarfileset dir=${tomcat.dist}/src mode=755 prefix=${final-src.name}
include name=${jtc.project}/jk/native/buildconf.sh /
include name=${jtc.project}/jk/native/apache-1.3/build-hpux-cc.sh /
include name=${jtc.project}/jk/native/apache-1.3/build-solaris.sh /
@@ -1507,8 +1507,7 @@
include name=${jtc.project}/jk/native/apache-2.0/install-unix.sh /
include name=${jtc.project}/jk/native/domino/mkini.sh /
/tarfileset
- tarfileset dir=${tomcat.dist} prefix=${final-src.name}
-include name=src/** /
+ tarfileset dir=${tomcat.dist}/src prefix=${final-src.name}
exclude name=${jtc.project}/jk/native/buildconf.sh /
exclude name=${jtc.project}/jk/native/apache-1.3/build-hpux-cc.sh /
exclude name=${jtc.project}/jk/native/apache-1.3/build-solaris.sh /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/12/19 08:47:55
Modified:.build.xml
Log:
- Fix packaging of the deployer JAR.
Revision ChangesPath
1.172 +2 -16 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- build.xml 25 Nov 2003 14:57:58 - 1.171
+++ build.xml 19 Dec 2003 16:47:55 - 1.172
@@ -766,23 +766,9 @@
file=${tomcat.build}/server/lib/catalina-ant.jar/
copy todir=${tomcat.deployer}/lib file=${commons-logging.jar}/
-jar jarfile=${tomcat.deployer}/lib/catalina-deployer.jar
- index=true
+jar jarfile=${tomcat.deployer}/lib/catalina-deployer.jar
fileset dir=${tomcat.build}/classes
- include name=org/apache/catalina/LifecycleListener.class /
- include name=org/apache/catalina/Manager.class /
- include name=org/apache/catalina/Pipeline.class /
- include name=org/apache/catalina/startup/Constants.class /
- include name=org/apache/catalina/startup/ContextConfig.class /
- include name=org/apache/catalina/startup/SetPublicIdRule.class /
- include name=org/apache/catalina/startup/SetDistributableRule.class /
- include name=org/apache/catalina/startup/SetJspConfig.class /
- include name=org/apache/catalina/startup/SetLoginConfig.class /
- include name=org/apache/catalina/startup/SetAuthConstraintRule.class /
- include name=org/apache/catalina/startup/WrapperCreateRule.class /
- include name=org/apache/catalina/startup/SetSessionConfig.class /
- include name=org/apache/catalina/startup/WebRuleSet.class /
- include name=org/apache/catalina/startup/*.properties /
+ include name=org/apache/catalina/startup/DigesterFactory.class /
include name=org/apache/catalina/util/SchemaResolver.class /
include name=org/apache/catalina/util/StringManager.class /
/fileset
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml RELEASE-NOTES
remm2003/11/25 06:57:59
Modified:.build.xml RELEASE-NOTES
Log:
- Small fixes.
Revision ChangesPath
1.171 +6 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- build.xml 20 Nov 2003 22:42:14 - 1.170
+++ build.xml 25 Nov 2003 14:57:58 - 1.171
@@ -1427,6 +1427,9 @@
include name=bin/startup.sh /
include name=bin/shutdown.sh /
include name=bin/tool-wrapper.sh /
+include name=bin/tool-wrapper-using-launcher.sh /
+include name=bin/shutdown-using-launcher.sh /
+include name=bin/startup-using-launcher.sh /
/tarfileset
tarfileset dir=${tomcat.dist} mode=600 prefix=${final.name}
include name=conf/** /
@@ -1453,6 +1456,9 @@
exclude name=bin/startup.sh /
exclude name=bin/shutdown.sh /
exclude name=bin/tool-wrapper.sh /
+exclude name=bin/tool-wrapper-using-launcher.sh /
+exclude name=bin/shutdown-using-launcher.sh /
+exclude name=bin/startup-using-launcher.sh /
exclude name=conf/** /
exclude name=src/** /
/tarfileset
1.10 +3 -1 jakarta-tomcat-5/RELEASE-NOTES
Index: RELEASE-NOTES
===
RCS file: /home/cvs/jakarta-tomcat-5/RELEASE-NOTES,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RELEASE-NOTES 25 Nov 2003 14:05:17 - 1.9
+++ RELEASE-NOTES 25 Nov 2003 14:57:59 - 1.10
@@ -86,6 +86,8 @@
you may replace the xercesImpl.jar file in common/endorsed with another
XML parser, as long as it is compatible with the JAXP 1.2 APIs.
+Xerces 2.5.0 is included.
+
---
Web application reloading and static fields in shared libraries:
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/11/20 12:45:34
Modified:.build.xml
Log:
- Add balancer to the build.
Revision ChangesPath
1.168 +25 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- build.xml 13 Nov 2003 08:33:44 - 1.167
+++ build.xml 20 Nov 2003 20:45:34 - 1.168
@@ -553,6 +553,14 @@
property name=flags.hide value=true /
/ant
+ant dir=${catalina.home}/webapps/balancer target=build-main
+property name=webapps.build value=${tomcat.build}/webapps /
+property name=classes.dir value=${tomcat.build}/classes /
+property name=tomcat-util.jar
value=${tomcat.build}/server/lib/tomcat-util.jar/
+property name=catalina.deploy value=${tomcat.build} /
+property name=flags.hide value=true /
+/ant
+
!-- Precompiling and fixing webapps --
antcall target=build-webapps-precompile /
antcall target=fix-webapps /
@@ -593,6 +601,22 @@
include name=**/*.properties /
/fileset
/jar
+mkdir dir=${tomcat.build}/webapps/balancer/WEB-INF/lib /
+jar
jarfile=${tomcat.build}/webapps/balancer/WEB-INF/lib/catalina-balancer.jar
+ index=true
+ fileset dir=${tomcat.build}/webapps/balancer/WEB-INF/classes
+ include name=**/*.class /
+ include name=**/*.properties /
+ /fileset
+/jar
+mkdir dir=${tomcat.build}/webapps/ROOT/WEB-INF/lib /
+jar jarfile=${tomcat.build}/webapps/ROOT/WEB-INF/lib/catalina-root.jar
+ index=true
+ fileset dir=${tomcat.build}/webapps/ROOT/WEB-INF/classes
+ include name=**/*.class /
+ include name=**/*.properties /
+ /fileset
+/jar
!-- Add XML declarations for admin and manager --
copy file=${tomcat.build}/server/webapps/manager/manager.xml
@@ -1151,6 +1175,7 @@
--
copy todir=${tomcat.dist}/webapps
fileset dir=${tomcat.build}/webapps
+exclude name=**/balancer/WEB-INF/classes/** /
exclude name=**/WEB-INF/src/** /
/fileset
/copy
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/11/20 13:44:11
Modified:.build.xml
Log:
- Include balancer in the build.
Revision ChangesPath
1.169 +5 -3 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- build.xml 20 Nov 2003 20:45:34 - 1.168
+++ build.xml 20 Nov 2003 21:44:10 - 1.169
@@ -618,10 +618,12 @@
/fileset
/jar
-!-- Add XML declarations for admin and manager --
-copy file=${tomcat.build}/server/webapps/manager/manager.xml
+!-- Add XML declarations for admin, manager and balancer --
+move file=${tomcat.build}/server/webapps/manager/manager.xml
todir=${tomcat.build}/conf/Catalina/localhost /
-copy file=${tomcat.build}/server/webapps/admin/admin.xml
+move file=${tomcat.build}/server/webapps/admin/admin.xml
+ todir=${tomcat.build}/conf/Catalina/localhost /
+move file=${tomcat.build}/webapps/balancer/balancer.xml
todir=${tomcat.build}/conf/Catalina/localhost /
/target
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/11/20 14:42:15
Modified:.build.xml
Log:
- Copy instead of move.
Revision ChangesPath
1.170 +3 -3 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- build.xml 20 Nov 2003 21:44:10 - 1.169
+++ build.xml 20 Nov 2003 22:42:14 - 1.170
@@ -619,11 +619,11 @@
/jar
!-- Add XML declarations for admin, manager and balancer --
-move file=${tomcat.build}/server/webapps/manager/manager.xml
+copy file=${tomcat.build}/server/webapps/manager/manager.xml
todir=${tomcat.build}/conf/Catalina/localhost /
-move file=${tomcat.build}/server/webapps/admin/admin.xml
+copy file=${tomcat.build}/server/webapps/admin/admin.xml
todir=${tomcat.build}/conf/Catalina/localhost /
-move file=${tomcat.build}/webapps/balancer/balancer.xml
+copy file=${tomcat.build}/webapps/balancer/balancer.xml
todir=${tomcat.build}/conf/Catalina/localhost /
/target
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/11/13 00:33:44 Modified:.build.xml Log: - Include the manager in the embed package. Revision ChangesPath 1.167 +6 -3 jakarta-tomcat-5/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- build.xml 11 Nov 2003 10:59:26 - 1.166 +++ build.xml 13 Nov 2003 08:33:44 - 1.167 @@ -489,7 +489,7 @@ /target -- - target name=build-all depends=init,deploy-static,build,build-webapps,embed,compat,deployer + target name=build-all depends=init,deploy-static,build,build-webapps,compat,deployer description=build tomcat, webapps, embed, compat, deployer / @@ -700,7 +700,10 @@ mkdir dir=embed/webapps/ copy todir=embed/webapps - fileset dir=build/webapps includes=ROOT/**/ + fileset dir=dist/webapps includes=ROOT/**/ +/copy +copy todir=embed/webapps + fileset dir=dist/server/webapps includes=manager/**/ /copy /target @@ -1257,7 +1260,7 @@ !-- == DIST: Create Archives === -- - target name=dist depends=deploy,dist-static,dist-javadoc + target name=dist depends=deploy,dist-static,dist-javadoc,embed description=Create binary distribution /target - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/10/24 06:09:15
Modified:.build.xml
Log:
- Embed needs regexp now (the connector needs it).
Revision ChangesPath
1.165 +1 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- build.xml 6 Oct 2003 13:43:41 - 1.164
+++ build.xml 24 Oct 2003 13:09:15 - 1.165
@@ -608,6 +608,7 @@
copy todir=embed/lib file=${commons-beanutils.jar}/
copy todir=embed/lib file=${commons-collections.jar}/
copy todir=embed/lib file=${jmx.jar}/
+copy todir=embed/lib file=${regexp.jar}/
copy todir=embed/lib
fileset dir=build/server/lib
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/10/06 06:43:41
Modified:.build.xml
Log:
- Fix the build: ant clean / ant download / ant.
- I believe checkout should be done in the cvs.base.
- I hope a commons-daemon milestone will be out soon.
- So, for now, I'm reverting the two patches, as I will tag 5.0.13 soon.
Revision ChangesPath
1.164 +3 -3 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- build.xml 3 Oct 2003 05:58:08 - 1.163
+++ build.xml 6 Oct 2003 13:43:41 - 1.164
@@ -119,7 +119,7 @@
uptodate property=commons-daemon.build.notrequired
targetfile=${commons-daemon.jar}
- srcfiles dir=${commons-daemon.home}/src includes=** /
+ srcfiles dir=${cvs.base}/jakarta-commons/daemon includes=** /
/uptodate
/target
@@ -479,7 +479,7 @@
target name=build-commons-daemon unless=commons-daemon.build.notrequired
description=build commons-daemon
echo== Building: commons-daemon /echo
-ant dir=${commons-daemon.home} target=dist
+ant dir=${cvs.base}/jakarta-commons/daemon target=dist
property name=compile.optimize value=false /
property name=dist.home value=${commons-daemon.home} /
/ant
@@ -1698,7 +1698,7 @@
command=checkout -P ${cvstag} jakarta-servletapi-5
dest=${cvs.base}/
cvs cvsroot=${cvsroot} quiet=true
- command=checkout -P ${cvstag} -d ${commons-daemon.home}
${commons-daemon.cvs.loc}
+ command=checkout -P ${cvstag} ${commons-daemon.cvs.loc}
dest=${cvs.base}/
!--
cvs cvsroot=${cvsroot} quiet=true
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
billbarker2003/10/02 22:49:48
Modified:.build.xml
Log:
Commons-daemon lives in commons-daemon.home by definition.
Don't hack around with presumed locations for it.
Revision ChangesPath
1.162 +2 -2 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- build.xml 29 Sep 2003 10:27:40 - 1.161
+++ build.xml 3 Oct 2003 05:49:48 - 1.162
@@ -119,7 +119,7 @@
uptodate property=commons-daemon.build.notrequired
targetfile=${commons-daemon.jar}
- srcfiles dir=${cvs.base}/jakarta-commons/daemon/src includes=** /
+ srcfiles dir=${commons-daemon.home}/src includes=** /
/uptodate
/target
@@ -479,7 +479,7 @@
target name=build-commons-daemon unless=commons-daemon.build.notrequired
description=build commons-daemon
echo== Building: commons-daemon /echo
-ant dir=${cvs.base}/jakarta-commons/daemon target=dist
+ant dir=${commons-daemon.home} target=dist
property name=compile.optimize value=false /
property name=dist.home value=${commons-daemon.home} /
/ant
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
billbarker2003/10/02 22:58:08
Modified:.build.xml
Log:
Missed one.
Revision ChangesPath
1.163 +1 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- build.xml 3 Oct 2003 05:49:48 - 1.162
+++ build.xml 3 Oct 2003 05:58:08 - 1.163
@@ -1698,7 +1698,7 @@
command=checkout -P ${cvstag} jakarta-servletapi-5
dest=${cvs.base}/
cvs cvsroot=${cvsroot} quiet=true
- command=checkout -P ${cvstag} ${commons-daemon.cvs.loc}
+ command=checkout -P ${cvstag} -d ${commons-daemon.home}
${commons-daemon.cvs.loc}
dest=${cvs.base}/
!--
cvs cvsroot=${cvsroot} quiet=true
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/09/28 05:23:27
Modified:.build.xml
Log:
- Package the Manager class, which is supposedly needed by the
deployer.
Revision ChangesPath
1.160 +1 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- build.xml 8 Sep 2003 10:11:10 - 1.159
+++ build.xml 28 Sep 2003 12:23:27 - 1.160
@@ -736,6 +736,7 @@
index=true
fileset dir=${tomcat.build}/classes
include name=org/apache/catalina/LifecycleListener.class /
+ include name=org/apache/catalina/Manager.class /
include name=org/apache/catalina/Pipeline.class /
include name=org/apache/catalina/startup/Constants.class /
include name=org/apache/catalina/startup/ContextConfig.class /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/09/08 02:12:12
Modified:.build.xml
Log:
- Use the tgz for commons-dbcp.
Revision ChangesPath
1.158 +1 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- build.xml 6 Sep 2003 17:49:22 - 1.157
+++ build.xml 8 Sep 2003 09:12:12 - 1.158
@@ -1579,7 +1579,7 @@
param name=destfile value=${commons-pool.jar}/
/antcall
-antcall target=downloadzip
+antcall target=downloadgz
param name=sourcefile value=${commons-dbcp.loc}/
param name=destfile value=${commons-dbcp.jar}/
param name=destdir value=${base.path}/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/09/08 03:11:10
Modified:.build.xml
Log:
- Bundle the build script with the docs.
- Remove redundent txt documents.
Revision ChangesPath
1.159 +3 -8 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- build.xml 8 Sep 2003 09:12:12 - 1.158
+++ build.xml 8 Sep 2003 10:11:10 - 1.159
@@ -561,17 +561,13 @@
filter token=VERSION value=${version}/
!-- Add release notes to the root webapp --
-copy file=./RELEASE-NOTES
+copy file=${basedir}/RELEASE-NOTES
tofile=${tomcat.build}/webapps/ROOT/RELEASE-NOTES.txt
filtering=true /
!-- Add documents to the tomcat-docs webapp --
-copy todir=${tomcat.build}/webapps/tomcat-docs
- fileset dir=.
-include name=BUILDING.txt/
-include name=RUNNING.txt/
- /fileset
-/copy
+copy file=${basedir}/resources/build.xml
+todir=${tomcat.build}/webapps/tomcat-docs /
copy file=./RELEASE-NOTES
tofile=${tomcat.build}/webapps/tomcat-docs/RELEASE-NOTES.txt
filtering=true /
@@ -1106,7 +1102,6 @@
fileset dir=.
include name=LICENSE/
include name=INSTALLING.txt/
-include name=BUILDING.txt/
include name=README.txt/
include name=RELEASE*/
include name=RUNNING.txt/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/09/06 10:49:22
Modified:.build.xml
Log:
- Modify the bundling of commons-logging to fix (hopefully) the nagging CL issues.
- The commons-logging-api JAR will now be put in the system classloader.
When using an alternate logging implmentation (ex: log4j) you should put the
wrapper implementation in the same classloader or there will likely be trouble.
- Ex: When using a Struts 1.1 webapp with log4j, there should be commons-logging.jar
(just the log4j logger is fine as well) next to it.
- Of course, overriding the log4j API in a webapp is still not possible. It wasn't
before as c-logging was treated as a special case by the classloader (like JAXP).
- This nasty case now works for me (bug 22701), as well as using log4j with
privileged webapps (with or without SSL).
Revision ChangesPath
1.157 +4 -4 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- build.xml 5 Sep 2003 06:46:01 - 1.156
+++ build.xml 6 Sep 2003 17:49:22 - 1.157
@@ -132,7 +132,7 @@
copy file=${commons-el.jar}
todir=${tomcat.build}/common/lib/
-copy todir=${tomcat.build}/common/lib
+copy todir=${tomcat.build}/bin
file=${commons-logging-api.jar} /
copy tofile=${tomcat.build}/common/lib/jmx.jar file=${jmx.jar} /
copy tofile=${tomcat.build}/common/lib/jmx-tools.jar
@@ -142,11 +142,10 @@
copy tofile=${tomcat.build}/common/lib/jmx-remote-tools.jar
file=${jmx-remote-tools.jar} failonerror=false /
-copy todir=${tomcat.build}/server/lib file=${commons-logging.jar} /
copy todir=${tomcat.build}/server/lib file=${commons-modeler.jar} /
-copy todir=${tomcat.build}/bin file=${commons-daemon.jsvc.tar.gz} /
copy todir=${tomcat.build}/bin file=${commons-daemon.jar} /
+copy todir=${tomcat.build}/bin file=${commons-daemon.jsvc.tar.gz} /
copy todir=${tomcat.build}/common/lib file=${ant.jar}/
/target
@@ -280,6 +279,7 @@
path id=jspc.classpath
pathelement location=${java.home}/../lib/tools.jar/
+ pathelement location=${commons-logging.jar}/
pathelement location=${tomcat.build}/server/classes/
fileset dir=${tomcat.build}/server/lib
include name=*.jar/
@@ -724,7 +724,6 @@
fileset dir=${tomcat.build}/server/lib
include name=commons-digester.jar/
include name=commons-beanutils.jar/
-include name=commons-logging.jar/
/fileset
/copy
copy todir=${tomcat.deployer}/lib
@@ -735,6 +734,7 @@
copy todir=${tomcat.deployer}/lib
file=${tomcat.build}/server/lib/catalina-ant.jar/
+copy todir=${tomcat.deployer}/lib file=${commons-logging.jar}/
jar jarfile=${tomcat.deployer}/lib/catalina-deployer.jar
index=true
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/08/31 09:52:06
Modified:.build.xml
Log:
- Don't copy jmx-tools to embed.
Revision ChangesPath
1.155 +0 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- build.xml 30 Aug 2003 22:13:27 - 1.154
+++ build.xml 31 Aug 2003 16:52:05 - 1.155
@@ -612,7 +612,6 @@
copy todir=embed/lib file=${commons-beanutils.jar}/
copy todir=embed/lib file=${commons-collections.jar}/
copy todir=embed/lib file=${jmx.jar}/
-copy todir=embed/lib file=${jmx-tools.jar}/
copy todir=embed/lib
fileset dir=build/server/lib
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/08/30 03:35:50
Modified:.build.xml
Log:
- Copy additional, optional, jmx tools binaries (jmx remote has two additional
JARs).
Revision ChangesPath
1.153 +4 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- build.xml 26 Aug 2003 08:42:38 - 1.152
+++ build.xml 30 Aug 2003 10:35:49 - 1.153
@@ -137,6 +137,10 @@
copy tofile=${tomcat.build}/common/lib/jmx.jar file=${jmx.jar} /
copy tofile=${tomcat.build}/common/lib/jmx-tools.jar
file=${jmx-tools.jar} /
+copy tofile=${tomcat.build}/common/lib/jmx-tools2.jar
+file=${jmx-tools2.jar} failonerror=false /
+copy tofile=${tomcat.build}/common/lib/jmx-tools3.jar
+file=${jmx-tools3.jar} failonerror=false /
copy todir=${tomcat.build}/server/lib file=${commons-logging.jar} /
copy todir=${tomcat.build}/server/lib file=${commons-modeler.jar} /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/08/30 15:13:27
Modified:.build.xml
Log:
- Rename the JMX related properties.
Revision ChangesPath
1.154 +5 -5 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- build.xml 30 Aug 2003 10:35:49 - 1.153
+++ build.xml 30 Aug 2003 22:13:27 - 1.154
@@ -136,11 +136,11 @@
file=${commons-logging-api.jar} /
copy tofile=${tomcat.build}/common/lib/jmx.jar file=${jmx.jar} /
copy tofile=${tomcat.build}/common/lib/jmx-tools.jar
-file=${jmx-tools.jar} /
-copy tofile=${tomcat.build}/common/lib/jmx-tools2.jar
-file=${jmx-tools2.jar} failonerror=false /
-copy tofile=${tomcat.build}/common/lib/jmx-tools3.jar
-file=${jmx-tools3.jar} failonerror=false /
+file=${jmx-tools.jar} failonerror=false /
+copy tofile=${tomcat.build}/common/lib/jmx-remote.jar
+file=${jmx-remote.jar} failonerror=false /
+copy tofile=${tomcat.build}/common/lib/jmx-remote-tools.jar
+file=${jmx-remote-tools.jar} failonerror=false /
copy todir=${tomcat.build}/server/lib file=${commons-logging.jar} /
copy todir=${tomcat.build}/server/lib file=${commons-modeler.jar} /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/08/25 11:43:04
Modified:.build.xml
Log:
- Add run-watchdog in my do-it-all release target.
Revision ChangesPath
1.151 +1 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- build.xml 18 Aug 2003 16:34:42 - 1.150
+++ build.xml 25 Aug 2003 18:43:04 - 1.151
@@ -1284,7 +1284,7 @@
!-- RELEASE: Create Release === --
- target name=release
depends=clean,dist,dist-source,prepare-release,installer,package-zip,package-tgz,package-embed-zip,package-embed-tgz,package-deployer-zip,package-deployer-tgz,package-src-zip,package-src-tgz,clean-tester,run-tester
+ target name=release
depends=clean,dist,dist-source,prepare-release,installer,package-zip,package-tgz,package-embed-zip,package-embed-tgz,package-deployer-zip,package-deployer-tgz,package-src-zip,package-src-tgz,clean-tester,run-tester,run-watchdog
description=Create a Tomcat 5 packaged distribution
filter token=VERSION value=${version}/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
jfarcand2003/08/18 09:34:42
Modified:.build.xml
Log:
Minor cleanup (modeler is now released or soon to be)
Revision ChangesPath
1.150 +0 -7 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- build.xml 10 Aug 2003 09:53:37 - 1.149
+++ build.xml 18 Aug 2003 16:34:42 - 1.150
@@ -117,13 +117,6 @@
srcfiles dir=${catalina.home}/webapps/admin includes=** /
/uptodate
-!--
-uptodate property=commons-modeler.build.notrequired
- targetfile=${commons-modeler.jar}
- srcfiles dir=${cvs.base}/jakarta-commons/modeler/src/java includes=** /
-/uptodate
---
-
uptodate property=commons-daemon.build.notrequired
targetfile=${commons-daemon.jar}
srcfiles dir=${cvs.base}/jakarta-commons-sandbox/daemon/src includes=**
/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/08/02 10:15:54
Modified:.build.xml
Log:
- Initialize filter so that the release notes of the docs look right.
Revision ChangesPath
1.147 +2 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- build.xml 29 Jul 2003 15:14:39 - 1.146
+++ build.xml 2 Aug 2003 17:15:54 - 1.147
@@ -558,6 +558,8 @@
target name=fix-webapps depends=init
!-- Extra build steps for webapps --
+filter token=VERSION value=${version}/
+
!-- Add release notes to the root webapp --
copy file=./RELEASE-NOTES
tofile=${tomcat.build}/webapps/ROOT/RELEASE-NOTES.txt
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/07/29 08:14:40
Modified:.build.xml
Log:
- Copy jk2.properties to conf.
Revision ChangesPath
1.146 +4 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- build.xml 23 Jul 2003 18:31:05 - 1.145
+++ build.xml 29 Jul 2003 15:14:39 - 1.146
@@ -201,6 +201,10 @@
property name=tomcat-jni.jar
value=${tomcat.build}/server/lib/tomcat-jni.jar /
/ant
+
+copy file=${jtc.home}/jk/conf/jk2.properties
+todir=${tomcat.build}/conf /
+
/target
target name=build-tomcatcoyote
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/07/23 11:31:05 Modified:.build.xml Log: - Add the optional JAR in the embed package. Revision ChangesPath 1.145 +1 -0 jakarta-tomcat-5/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- build.xml 23 Jul 2003 00:36:41 - 1.144 +++ build.xml 23 Jul 2003 18:31:05 - 1.145 @@ -639,6 +639,7 @@ include name=servlets-invoker.jar/ include name=servlets-default.jar/ include name=catalina.jar/ +include name=catalina-optional.jar/ /fileset /copy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
funkman 2003/07/22 17:36:41
Modified:.build.xml
Log:
Only checkout modeler from commons instead of all of commons.
Revision ChangesPath
1.144 +1 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- build.xml 21 Jul 2003 17:47:46 - 1.143
+++ build.xml 23 Jul 2003 00:36:41 - 1.144
@@ -1694,7 +1694,7 @@
command=checkout -P ${cvstag} ${commons-daemon.cvs.loc}
dest=${cvs.base}/
cvs cvsroot=${cvsroot} quiet=true
- command=checkout -P ${cvstag} jakarta-commons
+ command=checkout -P ${cvstag} ${commons-modeler.cvs.loc}
dest=${cvs.base}/
/target
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
jfarcand2003/07/21 10:47:47
Modified:.build.xml
Log:
Minor clean up
Revision ChangesPath
1.143 +0 -20 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- build.xml 20 Jul 2003 16:44:05 - 1.142
+++ build.xml 21 Jul 2003 17:47:46 - 1.143
@@ -122,13 +122,6 @@
srcfiles dir=${cvs.base}/jakarta-commons/modeler/src/java includes=** /
/uptodate
-!--
-uptodate property=commons-el.build.notrequired
- targetfile=${commons-el.jar}
- srcfiles dir=${cvs.base}/jakarta-commons/el/src/java includes=** /
-/uptodate
---
-
uptodate property=commons-daemon.build.notrequired
targetfile=${commons-daemon.jar}
srcfiles dir=${cvs.base}/jakarta-commons-sandbox/daemon/src includes=**
/
@@ -478,18 +471,6 @@
/ant
/target
-!--
- target name=build-commons-el unless=commons-el.build.notrequired
description=build commons-el
-echo== Building: commons-el /echo
-
-ant dir=${cvs.base}/jakarta-commons/el target=dist
-property name=servlet-api.jar location=${servlet-api.jar} /
-property name=jsp-api.jar value=${jsp-api.jar}/
-property name=compile.optimize value=false /
-property name=dist.home value=${commons-el.home} /
-/ant
- /target
---
target name=build-commons-daemon unless=commons-daemon.build.notrequired
description=build commons-daemon
echo== Building: commons-daemon /echo
@@ -509,7 +490,6 @@
antcall target=build-servletapi/
antcall target=build-jspapi/
-!-- antcall target=build-commons-el / --
antcall target=build-commons-modeler /
antcall target=build-commons-daemon /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/07/20 09:44:06
Modified:.build.xml
Log:
- Add a clean-tester target.
- Release will now call the tester targets.
- Watchdog will be also added after review of the Watchdog targets.
Revision ChangesPath
1.142 +8 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- build.xml 18 Jul 2003 14:29:29 - 1.141
+++ build.xml 20 Jul 2003 16:44:05 - 1.142
@@ -930,6 +930,13 @@
/target
+ target name=clean-tester
+ description=Clean the Catalina tester
+
+ant dir=${catalina.home}/tester target=clean /
+
+ /target
+
target name=run-tester
description=Catalina Tests depends=dist-tester
@@ -1294,7 +1301,7 @@
!-- RELEASE: Create Release === --
- target name=release
depends=clean,dist,dist-source,prepare-release,installer,package-zip,package-tgz,package-embed-zip,package-embed-tgz,package-deployer-zip,package-deployer-tgz,package-src-zip,package-src-tgz
+ target name=release
depends=clean,dist,dist-source,prepare-release,installer,package-zip,package-tgz,package-embed-zip,package-embed-tgz,package-deployer-zip,package-deployer-tgz,package-src-zip,package-src-tgz,clean-tester,run-tester
description=Create a Tomcat 5 packaged distribution
filter token=VERSION value=${version}/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/07/16 15:50:42
Modified:.build.xml
Log:
- Add the tester, similar to watchdog.
- The tester will need some more tweaks.
Revision ChangesPath
1.140 +64 -6 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- build.xml 8 Jul 2003 06:27:09 - 1.139
+++ build.xml 16 Jul 2003 22:50:41 - 1.140
@@ -916,6 +916,63 @@
/ant
/target
+ !-- === TESTER: Run Catalina Tester Tests=== --
+
+ target name=dist-tester
+ description=Build the Catalina tester
+
+ant dir=${catalina.home}/tester target=dist
+ property name=tester.deploy value=${tomcat.build}/
+/ant
+ant dir=${catalina.home}/tester target=deploy
+ property name=tester.deploy value=${tomcat.build}/
+/ant
+
+ /target
+
+ target name=run-tester
+ description=Catalina Tests depends=dist-tester
+
+parallel
+
+java classname=LauncherBootstrap fork=yes
+arg value=-launchfile/
+arg value=catalina.xml/
+arg value=-verbose/
+arg value=catalina/
+arg value=start/
+classpath
+pathelement path=${java.class.path}/
+pathelement path=${tomcat.build}/bin/
+/classpath
+/java
+
+sequential
+!-- Let tomcat starts before starting Tester --
+sleep seconds=15/
+
+ant dir=${catalina.home}/tester/dist/bin antfile=tester.xml
+ target=all
+ property name=catalina.home value=${tomcat.build}/
+/ant
+
+java classname=LauncherBootstrap fork=yes
+arg value=-launchfile/
+arg value=catalina.xml/
+arg value=-verbose/
+arg value=catalina/
+arg value=stop/
+classpath
+pathelement path=${java.class.path}/
+pathelement path=${tomcat.build}/bin/
+/classpath
+/java
+/sequential
+
+/parallel
+
+ /target
+
!-- === WATCHDOG: Run Watchdog Tests --
target name=dist-watchdog depends=proxyflags
@@ -947,7 +1004,7 @@
/target
target name=prepare-watchdog
-copy todir=${catalina.build}/webapps
+copy todir=${tomcat.build}/webapps
fileset dir=${watchdog.home}/dist/webapps/
/copy
/target
@@ -964,13 +1021,13 @@
arg value=start/
classpath
pathelement path=${java.class.path}/
-pathelement path=${catalina.build}/bin/
+pathelement path=${tomcat.build}/bin/
/classpath
/java
sequential
!-- Let tomcat starts before starting Watchdog --
-sleep seconds=60/
+sleep seconds=15/
ant dir=${watchdog.home}/dist target=${watchdog.target}/
@@ -982,7 +1039,7 @@
arg value=stop/
classpath
pathelement path=${java.class.path}/
-pathelement path=${catalina.build}/bin/
+pathelement path=${tomcat.build}/bin/
/classpath
/java
/sequential
@@ -1003,7 +1060,7 @@
arg value=start/
classpath
pathelement path=${java.class.path}/
-pathelement path=${catalina.build}/bin/
+pathelement path=${tomcat.build}/bin/
/classpath
/java
@@ -1021,13 +1078,14 @@
arg value=stop/
classpath
pathelement path=${java.class.path}/
-pathelement path=${catalina.build}/bin/
+pathelement path=${tomcat.build}/bin/
/classpath
/java
/sequential
/parallel
/target
+
!-- == DIST: Create Directories --
target name=dist-prepare
mkdir dir=${tomcat.dist}/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/07/07 23:27:09
Modified:.build.xml
Log:
- Exclude generated source in the JSP examples.
Revision ChangesPath
1.139 +3 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- build.xml 6 Jul 2003 23:15:11 - 1.138
+++ build.xml 8 Jul 2003 06:27:09 - 1.139
@@ -1097,7 +1097,9 @@
/copy
--
copy todir=${tomcat.dist}/webapps
- fileset dir=${tomcat.build}/webapps /
+ fileset dir=${tomcat.build}/webapps
+exclude name=**/WEB-INF/src/** /
+ /fileset
/copy
!-- Correct permissions and line endings on bin scripts --
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/07/06 16:15:11
Modified:.build.xml
Log:
- Only include the admin webapp JARs (no JSPs or expanded generated
sources or binaries).
- Same for the manager (no more duplicate classes).
Revision ChangesPath
1.138 +4 -2 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- build.xml 30 Jun 2003 22:16:39 - 1.137
+++ build.xml 6 Jul 2003 23:15:11 - 1.138
@@ -1085,8 +1085,10 @@
/copy
copy todir=${tomcat.dist}/server/webapps
fileset dir=${tomcat.build}/server/webapps
-exclude name=${tomcat.build}/server/webapps/admin/WEB-INF/classes/** /
-exclude name=${tomcat.build}/server/webapps/manager/WEB-INF/classes/** /
+exclude name=admin/**/*.jsp /
+exclude name=admin/WEB-INF/classes/** /
+exclude name=admin/WEB-INF/src/** /
+exclude name=manager/WEB-INF/classes/** /
/fileset
/copy
!--
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/06/30 15:16:40
Modified:.build.xml
Log:
- Use the flag to include declarations inside web.xml, rather than
rely on a token.
Revision ChangesPath
1.137 +3 -15 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- build.xml 30 Jun 2003 18:21:34 - 1.136
+++ build.xml 30 Jun 2003 22:16:39 - 1.137
@@ -310,6 +310,7 @@
validateXml=false
uriroot=${ROOT.base}
webXmlFragment=${ROOT.base}/WEB-INF/generated_web.xml
+ addWebXmlMappings=true
outputDir=${ROOT.base}/WEB-INF/src /
jasper2
@@ -317,6 +318,7 @@
validateXml=false
uriroot=${jsp-examples.base}
webXmlFragment=${jsp-examples.base}/WEB-INF/generated_web.xml
+ addWebXmlMappings=true
outputDir=${jsp-examples.base}/WEB-INF/src /
jasper2
@@ -325,22 +327,8 @@
validateXml=false
uriroot=${admin.base}
webXmlFragment=${admin.base}/WEB-INF/generated_web.xml
+ addWebXmlMappings=true
outputDir=${admin.base}/WEB-INF/src/admin /
-
-loadfile property=generated_ROOT_web.xml
- srcFile=${ROOT.base}/WEB-INF/generated_web.xml /
-replace file=${ROOT.base}/WEB-INF/web.xml
- token=lt;!--GENERATED_JSPS--gt; value=${generated_ROOT_web.xml}
/
-
-loadfile property=generated_JSP_web.xml
- srcFile=${jsp-examples.base}/WEB-INF/generated_web.xml /
-replace file=${jsp-examples.base}/WEB-INF/web.xml
- token=lt;!--GENERATED_JSPS--gt; value=${generated_JSP_web.xml} /
-
-loadfile property=generated_admin_web.xml
- srcFile=${admin.base}/WEB-INF/generated_web.xml /
-replace file=${admin.base}/WEB-INF/web.xml
- token=lt;!--GENERATED_JSPS--gt; value=${generated_admin_web.xml}
/
javac destdir=${ROOT.base}/WEB-INF/classes
optimize=off
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/06/22 10:42:47
Modified:.build.xml
Log:
- Unix packaging paranoia: Put everything in conf as 600 for added safety.
Revision ChangesPath
1.135 +4 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- build.xml 21 Jun 2003 13:37:21 - 1.134
+++ build.xml 22 Jun 2003 17:42:46 - 1.135
@@ -1354,10 +1354,12 @@
include name=bin/shutdown.sh /
include name=bin/tool-wrapper.sh /
/tarfileset
+ tarfileset dir=${tomcat.dist} mode=600 prefix=${final.name}
+include name=conf/** /
+ /tarfileset
tarfileset dir=${tomcat.dist} prefix=${final.name}
include name=bin/** /
include name=common/** /
-include name=conf/** /
include name=logs/** /
include name=server/** /
include name=shared/** /
@@ -1377,6 +1379,7 @@
exclude name=bin/startup.sh /
exclude name=bin/shutdown.sh /
exclude name=bin/tool-wrapper.sh /
+exclude name=conf/** /
exclude name=src/** /
/tarfileset
/tar
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/06/15 06:13:18
Modified:.build.xml
Log:
- Copy manager and admin.xml to the new locations.
Revision ChangesPath
1.131 +2 -2 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- build.xml 5 Jun 2003 18:28:07 - 1.130
+++ build.xml 15 Jun 2003 13:13:17 - 1.131
@@ -618,9 +618,9 @@
!-- Add XML declarations for admin and manager --
copy file=${tomcat.build}/server/webapps/manager/manager.xml
- todir=${tomcat.build}/webapps /
+ todir=${tomcat.build}/conf/Catalina/localhost /
copy file=${tomcat.build}/server/webapps/admin/admin.xml
- todir=${tomcat.build}/webapps /
+ todir=${tomcat.build}/conf/Catalina/localhost /
/target
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/06/15 06:32:35
Modified:.build.xml
Log:
- Copy the commons-daemon JAR (the daemon loader class is still needed).
Revision ChangesPath
1.132 +2 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- build.xml 15 Jun 2003 13:13:17 - 1.131
+++ build.xml 15 Jun 2003 13:32:35 - 1.132
@@ -152,6 +152,7 @@
copy todir=${tomcat.build}/server/lib file=${commons-modeler.jar} /
copy todir=${tomcat.build}/bin file=${commons-daemon.jsvc.tar.gz} /
+copy todir=${tomcat.build}/bin file=${commons-daemon.jar} /
copy todir=${tomcat.build}/common/lib file=${ant.jar}/
/target
@@ -853,6 +854,7 @@
!-- Copy Unix JSVC from commons-daemon --
copy file=${commons-daemon.jsvc.tar.gz}
tofile=${tomcat.dist}/bin/jsvc.tar.gz /
+copy todir=${tomcat.build}/bin file=${commons-daemon.jar} /
echoTarget: Webapps precompilation .../echo
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml CHANGELOG TODO.txt
remm2003/06/03 14:38:52
Modified:.build.xml
Removed: .CHANGELOG TODO.txt
Log:
- Remove old todo and changelog.
Revision ChangesPath
1.129 +0 -14 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- build.xml 27 May 2003 19:37:18 - 1.128
+++ build.xml 3 Jun 2003 21:38:52 - 1.129
@@ -595,8 +595,6 @@
copy file=./RELEASE-NOTES
tofile=${tomcat.build}/webapps/tomcat-docs/RELEASE-NOTES.txt
filtering=true /
-copy file=./CHANGELOG
-tofile=${tomcat.build}/webapps/tomcat-docs/CHANGELOG.txt /
!-- Build JARs for webapps classes --
mkdir dir=${tomcat.build}/server/webapps/admin/WEB-INF/lib /
@@ -1245,9 +1243,6 @@
copy file=RELEASE-NOTES
todir=${tomcat.release}/v${version}
filtering=true/
-copy file=CHANGELOG
- todir=${tomcat.release}/v${version}
- filtering=true/
copy file=resources/welcome.main.html
tofile=${tomcat.release}/v${version}/README.html
filtering=true/
@@ -1284,8 +1279,6 @@
zipfileset dir=${tomcat.dist} prefix=${final.name}
includes=RELEASE-NOTES /
zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=CHANGELOG /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
includes=RUNNING.txt /
zipfileset dir=${tomcat.dist} prefix=${final.name}
includes=BENCHMARKS.txt /
@@ -1302,8 +1295,6 @@
includes=README.txt /
zipfileset dir=${tomcat.dist} prefix=${final.name}-embed
includes=RELEASE-NOTES /
- zipfileset dir=${tomcat.dist} prefix=${final.name}-embed
- includes=CHANGELOG /
/zip
/target
@@ -1317,8 +1308,6 @@
includes=README.txt /
zipfileset dir=${tomcat.dist} prefix=${final.name}-deployer
includes=RELEASE-NOTES /
- zipfileset dir=${tomcat.dist} prefix=${final.name}-deployer
- includes=CHANGELOG /
/zip
/target
@@ -1368,7 +1357,6 @@
include name=LICENSE /
include name=README.txt /
include name=RELEASE-NOTES /
-include name=CHANGELOG /
include name=RUNNING.txt /
include name=BENCHMARKS.txt /
exclude name=bin/catalina.sh /
@@ -1394,7 +1382,6 @@
include name=LICENSE /
include name=README.txt /
include name=RELEASE-NOTES /
-include name=CHANGELOG /
/tarfileset
tarfileset dir=${tomcat.embed} prefix=${final.name}-embed
include name=** /
@@ -1412,7 +1399,6 @@
include name=LICENSE /
include name=README.txt /
include name=RELEASE-NOTES /
-include name=CHANGELOG /
/tarfileset
tarfileset dir=${tomcat.deployer} prefix=${final.name}-deployer
include name=** /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
jfarcand2003/05/27 12:37:19
Modified:.build.xml
Log:
Copy ant.jar to avoid having to copy it manually. That should fix the gump failure.
Revision ChangesPath
1.128 +3 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- build.xml 14 May 2003 17:46:39 - 1.127
+++ build.xml 27 May 2003 19:37:18 - 1.128
@@ -24,6 +24,7 @@
property name=catalina.project value=jakarta-tomcat-catalina /
property name=jtc.project value=jakarta-tomcat-connectors /
property name=jasper.projectvalue=jakarta-tomcat-jasper /
+ property name=ant.jar value=${ant.home}/lib/ant.jar/
property name=cvstagvalue= /
property name=cvs.base
value=${basedir}/../
@@ -149,6 +150,8 @@
--
copy todir=${tomcat.build}/server/lib file=${commons-logging.jar} /
copy todir=${tomcat.build}/server/lib file=${commons-modeler.jar} /
+
+copy todir=${tomcat.build}/common/lib file=${ant.jar}/
/target
!-- == Build all components === --
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/03/26 01:54:38
Modified:.build.xml
Log:
- Build JARs for webapps, in order to save space.
Revision ChangesPath
1.117 +28 -4 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- build.xml 21 Mar 2003 15:54:27 - 1.116
+++ build.xml 26 Mar 2003 09:54:38 - 1.117
@@ -545,9 +545,9 @@
property name=flags.hide value=true /
/ant
-antcall target=fix-webapps /
-
+!-- Precompiling and fixing webapps --
antcall target=build-webapps-precompile /
+antcall target=fix-webapps /
/target
@@ -572,8 +572,26 @@
copy file=./CHANGELOG
tofile=${tomcat.build}/webapps/tomcat-docs/CHANGELOG.txt /
+!-- Build JARs for webapps classes --
+mkdir dir=${tomcat.build}/server/webapps/admin/WEB-INF/lib /
+jar
jarfile=${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar
+ index=true
+ fileset dir=${tomcat.build}/server/webapps/admin/WEB-INF/classes
+ include name=**/*.class /
+ include name=**/*.properties /
+ /fileset
+/jar
+mkdir dir=${tomcat.build}/server/webapps/manager/WEB-INF/lib /
+jar
jarfile=${tomcat.build}/server/webapps/manager/WEB-INF/lib/catalina-manager.jar
+ index=true
+ fileset dir=${tomcat.build}/server/webapps/manager/WEB-INF/classes
+ include name=**/*.class /
+ include name=**/*.properties /
+ /fileset
+/jar
+
!-- Add XML declarations for admin and manager --
-move file=${tomcat.build}/server/webapps/manager/manager.xml
+copy file=${tomcat.build}/server/webapps/manager/manager.xml
todir=${tomcat.build}/webapps /
copy file=${tomcat.build}/server/webapps/admin/admin.xml
todir=${tomcat.build}/webapps /
@@ -737,8 +755,11 @@
!-- == COMBO: Clean All Directories --
target name=clean
description=Clean all components
+
delete dir=${tomcat.build}/
+delete dir=${tomcat.embed}/
+
echoTarget: Servlet API - Clean .../echo
ant dir=${api.home}/jsr154 target=clean/
@@ -957,7 +978,10 @@
fileset dir=${tomcat.build}/server/lib /
/copy
copy todir=${tomcat.dist}/server/webapps
- fileset dir=${tomcat.build}/server/webapps /
+ fileset dir=${tomcat.build}/server/webapps
+exclude name=${tomcat.build}/server/webapps/admin/WEB-INF/classes/** /
+exclude name=${tomcat.build}/server/webapps/manager/WEB-INF/classes/** /
+ /fileset
/copy
!--
copy todir=${tomcat.dist}/shared/lib
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
jfarcand2003/03/21 07:54:27
Modified:.build.xml
Log:
Fix a bug when building from scratch, from a clean workspace and when doing:
ant checkout
ant download
ant dist
One day the nightly build script will work ;-)
Revision ChangesPath
1.116 +0 -4 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- build.xml 21 Mar 2003 00:45:26 - 1.115
+++ build.xml 21 Mar 2003 15:54:27 - 1.116
@@ -147,10 +147,6 @@
ant dir=${api.home}/jsr154 target=dist
property name=servlet-api.dist value=${servlet-api.home} /
/ant
-mkdir dir=${servlet-api.home}/
-copy todir=${servlet-api.home}
- fileset dir=${api.home}/jsr154/dist includes=** /
-/copy
/target
target name=build-jspapi unless=jspapi.build.notrequired
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
amyroh 2003/03/20 16:45:27
Modified:.build.xml
Log:
Copy admin.xml instead of move so second build doesn't fail without doing ant clean.
Revision ChangesPath
1.115 +1 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- build.xml 17 Mar 2003 20:06:18 - 1.114
+++ build.xml 21 Mar 2003 00:45:26 - 1.115
@@ -579,7 +579,7 @@
!-- Add XML declarations for admin and manager --
move file=${tomcat.build}/server/webapps/manager/manager.xml
todir=${tomcat.build}/webapps /
-move file=${tomcat.build}/server/webapps/admin/admin.xml
+copy file=${tomcat.build}/server/webapps/admin/admin.xml
todir=${tomcat.build}/webapps /
/target
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
amyroh 2003/03/17 12:06:19
Modified:.build.xml
Log:
This fixes my build. I'm not sure why this is commented out but let me know
if this causes a problem.
Revision ChangesPath
1.114 +1 -2 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- build.xml 15 Mar 2003 09:04:52 - 1.113
+++ build.xml 17 Mar 2003 20:06:18 - 1.114
@@ -145,8 +145,7 @@
target name=build-servletapi unless=servletapi.build.notrequired
echo== Building: ${servlet-api.jar}/echo
ant dir=${api.home}/jsr154 target=dist
-!--property name=servlet-api.dist value=${servlet-api.home} /
- --
+ property name=servlet-api.dist value=${servlet-api.home} /
/ant
mkdir dir=${servlet-api.home}/
copy todir=${servlet-api.home}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/03/15 01:04:52
Modified:.build.xml
Log:
- Copy the declarations for manager and admin (now I know Costin doesn't
test anything ;-) ).
- Update release to include the embed distro.
Revision ChangesPath
1.113 +41 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- build.xml 14 Mar 2003 22:45:33 - 1.112
+++ build.xml 15 Mar 2003 09:04:52 - 1.113
@@ -47,6 +47,7 @@
property name=build.home value=${tomcat.build}/
property name=tomcat.dist value=${basedir}/dist/
+ property name=tomcat.embed value=${basedir}/embed/
property name=tomcat.release value=${basedir}/release/
property name=webapps.buildvalue=${catalina.home}/webapps/build/
property name=webapps.dist value=${catalina.home}/webapps/dist/
@@ -576,6 +577,12 @@
copy file=./CHANGELOG
tofile=${tomcat.build}/webapps/tomcat-docs/CHANGELOG.txt /
+!-- Add XML declarations for admin and manager --
+move file=${tomcat.build}/server/webapps/manager/manager.xml
+ todir=${tomcat.build}/webapps /
+move file=${tomcat.build}/server/webapps/admin/admin.xml
+ todir=${tomcat.build}/webapps /
+
/target
!-- == Embeded target === --
@@ -1097,7 +1104,7 @@
!-- RELEASE: Create Release === --
- target name=release
depends=clean,dist,dist-source,prepare-release,installer,package-zip,package-tgz,package-src-zip,package-src-tgz
+ target name=release
depends=clean,dist,dist-source,prepare-release,installer,package-zip,package-tgz,package-embed-zip,package-embed-tgz,package-src-zip,package-src-tgz
description=Create a Tomcat 5 packaged distribution
filter token=VERSION value=${version}/
@@ -1153,6 +1160,21 @@
/zip
/target
+ target name=package-embed-zip
+zip zipfile=${tomcat.release}/v${version}/bin/${final.name}-embed.zip
+ zipfileset dir=${tomcat.embed} prefix=${final.name}-embed
+ includes=** /
+ zipfileset dir=${tomcat.dist} prefix=${final.name}-embed
+ includes=LICENSE /
+ zipfileset dir=${tomcat.dist} prefix=${final.name}-embed
+ includes=README.txt /
+ zipfileset dir=${tomcat.dist} prefix=${final.name}-embed
+ includes=RELEASE-NOTES /
+ zipfileset dir=${tomcat.dist} prefix=${final.name}-embed
+ includes=CHANGELOG /
+/zip
+ /target
+
target name=prepare-release
mkdir dir=${tomcat.release}/
@@ -1213,6 +1235,24 @@
exclude name=bin/shutdown.sh /
exclude name=bin/tool-wrapper.sh /
exclude name=src/** /
+ /tarfileset
+/tar
+ /target
+
+ target name=package-embed-tgz
+fixcrlf srcdir=${tomcat.dist}
+ includes=*.txt,LICENSE eol=lf/
+fixcrlf srcdir=${tomcat.embed} includes=*.xml eol=lf/
+tar longfile=gnu compression=gzip
+ tarfile=${tomcat.release}/v${version}/bin/${final.name}-embed.tar.gz
+ tarfileset dir=${tomcat.dist} prefix=${final.name}-embed
+include name=LICENSE /
+include name=README.txt /
+include name=RELEASE-NOTES /
+include name=CHANGELOG /
+ /tarfileset
+ tarfileset dir=${tomcat.embed} prefix=${final.name}-embed
+include name=** /
/tarfileset
/tar
/target
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-5 build.xml
[EMAIL PROTECTED] wrote: costin 2003/03/14 14:42:43 Modified:.build.xml Log: Fix Filip's build. It seems my clean workspace wasn't that clean after all. This whole thing is unbelievable. I have no idea how we end up with this mess. The build is really complex, so it's normal to run into trouble when you refactor it. Plus there are so many dependent components, doing ant build is not enough to do a clean build ;-) BTW, are there any plans to put back a default for base.path ? Otherwise, the build instruction on the website are incorrect. Remy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-5 build.xml
Remy Maucherat wrote: [EMAIL PROTECTED] wrote: costin 2003/03/14 14:42:43 Modified:.build.xml Log: Fix Filip's build. It seems my clean workspace wasn't that clean after all. This whole thing is unbelievable. I have no idea how we end up with this mess. The build is really complex, so it's normal to run into trouble when you refactor it. Plus there are so many dependent components, doing ant build is not enough to do a clean build ;-) The purpose of the refactoring was to make it simpler ( or at least cleaner). We do have a nice component structure, with only few circular deps ( which we can someday resolve by moving coyote tomcat5-specific code to catalina ). The main build file should only call child build files, and we should have a very consistent layout and features in all components - similar with jakarta-commons for example. Each component should support a dist.dir ( unlike servlet/jsp api build files), should support a build target that only builds the .jar - and should use the same patterns for finding the dependencies ( the other components ). BTW, are there any plans to put back a default for base.path ? Otherwise, the build instruction on the website are incorrect. I don't know why it got removed. I think using /repository is a nice idea - and even using repository to build each of our component into. We should consider each component ( coyote, jasper, jk, util, admin, etc ) as a separate piece - as components in jakarta-commons. And the main build script should just be a wrapper to build each component and assemble the distribution(s). Again - sorry for causing the pain. Costin - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-5 build.xml
Costin Manolache wrote: Remy Maucherat wrote: The build is really complex, so it's normal to run into trouble when you refactor it. Plus there are so many dependent components, doing ant build is not enough to do a clean build ;-) The purpose of the refactoring was to make it simpler ( or at least cleaner). We do have a nice component structure, with only few circular deps ( which we can someday resolve by moving coyote tomcat5-specific code to catalina ). The main build file should only call child build files, and we should have a very consistent layout and features in all components - similar with jakarta-commons for example. The biggest problem was commons-el IMO. Each component should support a dist.dir ( unlike servlet/jsp api build files), should support a build target that only builds the .jar - and should use the same patterns for finding the dependencies ( the other components ). No problem with me if you want to do that. Remy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-5 build.xml
Remy Maucherat wrote: Each component should support a dist.dir ( unlike servlet/jsp api build files), should support a build target that only builds the .jar - and should use the same patterns for finding the dependencies ( the other components ). No problem with me if you want to do that. Gradually. Now the build is stable again - I started to add unless in javadoc tags so we can avoid it in regular build. In time I'll try to get all the build files we use to have an set of identical targets and behavior, and be able to produce a dist in repository and use the other dists from the repository. The repository can be created either by download or by building each individual component ( assuming we get the order right - that's gump speciality ), or by using the build.propertes redirection ( should be renamed repository.properties ) or by gump. If only gump could generate smaller wrappers we could use... Costin - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
costin 2003/03/14 07:28:06
Modified:.build.xml
Log:
Trying to guess what's wrong on Remy's machine.
The APIs are built in download as dependencies, no need to build
them twice.
Revision ChangesPath
1.107 +1 -3 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- build.xml 13 Mar 2003 22:48:00 - 1.106
+++ build.xml 14 Mar 2003 15:28:06 - 1.107
@@ -144,7 +144,7 @@
!-- == Build all components === --
target name=build-servletapi unless=servletapi.build.notrequired
echo== Building: ${servlet-api.jar}/echo
-
+mkdir dir=${servlet-api.dist} /
ant dir=${api.home}/jsr154 target=dist
property name=servlet-api.dist value=${servlet-api.home} /
/ant
@@ -425,8 +425,6 @@
copy file=${commons-beanutils.jar} todir=${tomcat.build}/common/lib/
copy file=${jmx.jar} todir=${tomcat.build}/common/lib/
-antcall target=build-servletapi/
-antcall target=build-jspapi/
antcall target=build-tomcatutil/
antcall target=build-catalina/
antcall target=build-tomcatcoyote/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-5 build.xml
[EMAIL PROTECTED] wrote: costin 2003/03/14 07:28:06 Modified:.build.xml Log: Trying to guess what's wrong on Remy's machine. The APIs are built in download as dependencies, no need to build them twice. I don't know what's wrong. I only tried ant clean, then ant download followed by ant. The base.path is set to your ../repository. That's it :) Remy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-5 build.xml
Remy Maucherat wrote: [EMAIL PROTECTED] wrote: costin 2003/03/14 07:28:06 Modified:.build.xml Log: Trying to guess what's wrong on Remy's machine. The APIs are built in download as dependencies, no need to build them twice. I don't know what's wrong. I only tried ant clean, then ant download followed by ant. The base.path is set to your ../repository. That's it :) Ant clean; ant update; ant download should work fine. It's just calling ant dist with dist-dir set to repository/servlet-api-2.4, like the other packages. Ok, I'll remove my repository and try again. Costin - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/03/14 10:44:03 Modified:.build.xml Log: - Add back precompilation as part of the build. Revision ChangesPath 1.109 +2 -0 jakarta-tomcat-5/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- build.xml 14 Mar 2003 18:39:50 - 1.108 +++ build.xml 14 Mar 2003 18:44:03 - 1.109 @@ -540,6 +540,8 @@ antcall target=fix-webapps / +antcall target=build-webapps-precompile / + /target target name=fix-webapps depends=init - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
costin 2003/03/14 14:42:43
Modified:.build.xml
Log:
Fix Filip's build.
It seems my clean workspace wasn't that clean after all.
This whole thing is unbelievable. I have no idea how we end up with this
mess.
( the fix is obviously a workaround that hides the real problem ).
Revision ChangesPath
1.111 +6 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- build.xml 14 Mar 2003 20:21:04 - 1.110
+++ build.xml 14 Mar 2003 22:42:43 - 1.111
@@ -144,8 +144,13 @@
target name=build-servletapi unless=servletapi.build.notrequired
echo== Building: ${servlet-api.jar}/echo
ant dir=${api.home}/jsr154 target=dist
-property name=servlet-api.dist value=${servlet-api.home} /
+!--property name=servlet-api.dist value=${servlet-api.home} /
+ --
/ant
+mkdir dir=${servlet-api.home}
+copy todir=${servlet-api.home}
+ fileset dir=${api.home}/jsr154/dist includes=** /
+/copy
/target
target name=build-jspapi unless=jspapi.build.notrequired
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
jfarcand2003/03/13 11:32:56
Modified:.build.xml
Log:
Proper file this time.
Revision ChangesPath
1.102 +1 -6 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- build.xml 13 Mar 2003 19:24:07 - 1.101
+++ build.xml 13 Mar 2003 19:32:56 - 1.102
@@ -10,6 +10,7 @@
!-- If not set explicitely in one of the user overrides, set it here
--
+ property name=base.path location=../repository /
property file=build.properties.default/
@@ -82,7 +83,6 @@
mkdir dir=${tomcat.build}/classes /
mkdir dir=${tomcat.build}/server/lib /
mkdir dir=${tomcat.build}/common/lib /
-mkdir dir=${tomcat.build}/common/lib /
uptodate property=servletapi.build.notrequired
targetfile=${servletapi.jar}
@@ -251,7 +251,6 @@
mkdir dir=${ROOT.base}/WEB-INF/src /
mkdir dir=${ROOT.base}/WEB-INF/classes /
mkdir dir=${jsp-examples.base}/WEB-INF/src /
- echo message=${tomcat.build}/
path id=jspc.classpath
pathelement location=${java.home}/../lib/tools.jar/
@@ -963,10 +962,6 @@
/copy
copy todir=${tomcat.dist}/server/webapps
fileset dir=${tomcat.build}/server/webapps /
-/copy
-mkdir dir=${tomcat.dist}/shared/classes/
-copy todir=${tomcat.dist}/common/classes
- fileset dir=${tomcat.build}/common/classes /
/copy
!--
copy todir=${tomcat.dist}/shared/lib
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
