remm 2002/10/09 03:06:07 Modified: . build.xml resources INSTALLLICENSE Added: . CHANGELOG RELEASE-NOTES resources welcome.bin.html welcome.main.html Log: - Improve release target, so that it will create a ready to upload package. Revision Changes Path 1.38 +46 -5 jakarta-tomcat-5/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- build.xml 8 Oct 2002 09:36:39 -0000 1.37 +++ build.xml 9 Oct 2002 10:06:07 -0000 1.38 @@ -44,6 +44,7 @@ <property name="servlet.home" value="../jakarta-servletapi-4/dist"/> <property name="tomcat.build" value="${basedir}/build"/> <property name="tomcat.dist" value="${basedir}/dist"/> + <property name="tomcat.release" value="${basedir}/release"/> <property name="webapps.build" value="${catalina.home}/webapps/build"/> <property name="webapps.dist" value="${catalina.home}/webapps/dist"/> @@ -129,6 +130,8 @@ <delete dir="${tomcat.dist}"/> + <delete dir="${tomcat.release}"/> + </target> @@ -418,7 +421,42 @@ <!-- ==================== RELEASE: Create Release ======================= --> <target name="release" depends="prepare-release,clean,dist,dist-source,installer,package-zip,package-tgz,package-src-zip,package-src-tgz" - description="Create a Tomcat 5 packaged distribution" /> + description="Create a Tomcat 5 packaged distribution" if="full-dist"> + + <mkdir dir="${tomcat.release}"/> + <mkdir dir="${tomcat.release}/v${version}"/> + <mkdir dir="${tomcat.release}/v${version}/bin"/> + <mkdir dir="${tomcat.release}/v${version}/src"/> + + <move file="${tomcat.dist}/${final.name}.tar.gz" + todir="${tomcat.release}/v${version}/bin"/> + <move file="${tomcat.dist}/${final.name}.zip" + todir="${tomcat.release}/v${version}/bin"/> + <move file="${tomcat.dist}/${final.name}.exe" + todir="${tomcat.release}/v${version}/bin"/> + + <move file="${tomcat.dist}/${final-src.name}.tar.gz" + todir="${tomcat.release}/v${version}/src"/> + <move file="${tomcat.dist}/${final-src.name}.zip" + todir="${tomcat.release}/v${version}/src"/> + + <filter token="VERSION" value="${version}"/> + <copy file="KEYS" + todir="${tomcat.release}/v${version}"/> + <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"/> + <copy file="resources/welcome.bin.html" + tofile="${tomcat.release}/v${version}/bin/README.html" + filtering="true"/> + + </target> <target name="package-zip"> <zip zipfile="${tomcat.dist}/${final.name}.zip"> @@ -445,11 +483,13 @@ <zipfileset dir="${tomcat.dist}" prefix="${final.name}" includes="README.txt" /> <zipfileset dir="${tomcat.dist}" prefix="${final.name}" - includes="RELEASE-NOTES-*" /> + includes="RELEASE-NOTES" /> <zipfileset dir="${tomcat.dist}" prefix="${final.name}" - includes="RELEASE-PLAN-*" /> + includes="CHANGELOG" /> <zipfileset dir="${tomcat.dist}" prefix="${final.name}" includes="RUNNING.txt" /> + <zipfileset dir="${tomcat.dist}" prefix="${final.name}" + includes="BENCHMARKS.txt" /> </zip> </target> @@ -479,9 +519,10 @@ <include name="temp/**" /> <include name="LICENSE" /> <include name="README.txt" /> - <include name="RELEASE-NOTES-*" /> - <include name="RELEASE-PLAN-*" /> + <include name="RELEASE-NOTES" /> + <include name="CHANGELOG" /> <include name="RUNNING.txt" /> + <include name="BENCHMARKS.txt" /> </fileset> </copy> <fixcrlf srcdir="${tomcat.dist}/${final.name}" 1.1 jakarta-tomcat-5/CHANGELOG <<Binary file>> 1.1 jakarta-tomcat-5/RELEASE-NOTES Index: RELEASE-NOTES =================================================================== Apache Tomcat Version @VERSION@ Release Notes $Id: RELEASE-NOTES,v 1.1 2002/10/09 10:06:07 remm Exp $ ============================ KNOWN ISSUES IN THIS RELEASE: ============================ * Tomcat 5.0 and JNI Based Applications * Tomcat 5.0 Standard APIs Available * Tomcat 5.0 and XML Parsers * Web application reloading and static fields in shared libraries * JAVAC leaking memory * Linux and Sun JDK 1.2.x - 1.3.x * Enabling SSI and CGI Support * Security manager URLs * Symlinking static resources * Enabling invoker servlet ------------------------------------- Tomcat 5.0 and JNI Based Applications: ------------------------------------- Applications that require native libraries must ensure that the libraries have been loaded prior to use. Typically, this is done with a call like: static { System.loadLibrary("path-to-library-file"); } in some class. However, the application must also ensure that the library is not loaded more than once. If the above code were placed in a class inside the web application (i.e. under /WEB-INF/classes or /WEB-INF/lib), and the application were reloaded, the loadLibrary() call would be attempted a second time. To avoid this problem, place classes that load native libraries outside of the web application, and ensure that the loadLibrary() call is executed only once during the lifetime of a particular JVM. ---------------------------------- Tomcat 5.0 Standard APIs Available: ---------------------------------- A standard installation of Tomcat 4 makes all of the following APIs available for use by web applications (by placing them in "common/lib" or "shared/lib"): * ant.jar (Apache Ant) * commons-collections.jar (Commons Collections) * commons-dbcp.jar (Commons DBCP 1.0) * commons-logging-api.jar (Commons Logging) * commons-pool.jar (Commons Pool) * jasper-compiler.jar (Jasper 2 Compiler) * jasper-runtime.jar (Jasper 2 Runtime) * jsp-api.jar (JSP 2.0 API) * jsp20el.jar (JSP 2.0 Expression Language) * naming-common.jar (JNDI Context implementation) * naming-factory.jar (JNDI object factories) * naming-resources.jar (JNDI DirContext implementations) * servlet-api.jar (Servlet 2.4 API) You can make additional APIs available to all of your web applications by putting unpacked classes into a "classes" directory (not created by default), or by placing them in JAR files in the "lib" directory. Tomcat 5.0 also makes available Xerces 2 to web applications. -------------------------- Tomcat 5.0 and XML Parsers: -------------------------- As described above, Tomcat 5.0 makes an XML parser (and many other standard APIs) available to web applications. This parser is also used internally to parse web.xml files and the server.xml configuration file. If you wish, you may replace the "xercesImpl.jar" file in "common/endorsed" with another XML parser, as long as it is compatible with the JAXP 1.1 APIs. --------------------------------------------------------------- Web application reloading and static fields in shared libraries: --------------------------------------------------------------- Some shared libraries (many are part of the JDK) keep references to objects instantiated by the web application. To avoid class loading related problems (ClassCastExceptions, messages indicating that the classloader is stopped, ...), the shared libraries state should be reinitialized. Something which could help is to avoid putting classes which would be referenced by a shared static field in the web application classloader, and put them in the shared classloader instead (the JARs should be put in the "lib" folder, and classes should be put in the "classes" folder). -------------------- JAVAC leaking memory: -------------------- The Java compiler leaks memory each time a class is compiled. Web applications containing hundreds of JSP files may as a result trigger out of memory errors once a significant number of pages have been accessed. The memory can only be freed by stopping Tomcat and then restarting it. The JSP command line compiler (JSPC) can also be used to precompile the JSPs. ------------------------------- Linux and Sun JDK 1.2.x - 1.3.x: ------------------------------- Virtual machine crashes can be experienced when using certain combinations of kernel / glibc under Linux with Sun Hotspot 1.2 to 1.3. The crashes were reported to occur mostly on startup. Sun JDK 1.4 does not exhibit the problems, and neither does IBM JDK for Linux. The problems can be fixed by reducing the default stack size. At bash shell, do "ulimit -s 2048"; use "limit stacksize 2048" for tcsh. GLIBC 2.2 / Linux 2.4 users should also define an environment variable: export LD_ASSUME_KERNEL=2.2.5 ---------------------------- Enabling SSI and CGI Support: ---------------------------- Having CGI and SSI available to web applications created security problems when using a security manager (as a malicious web application could use them to sidestep the security manager access control). In Tomcat 5.0, they have been disabled by default, as our goal is to provide a fully secure default configuration. However, CGI and SSI remain available. On Windows: * rename the file %CATALINA_HOME%\server\lib\servlets-cgi.renametojar to %CATALINA_HOME%\server\lib\servlets-cgi.jar. * rename the file %CATALINA_HOME%\server\lib\servlets-ssi.renametojar to %CATALINA_HOME%\server\lib\servlets-ssi.jar. * in %CATALINA_HOME%\conf\web.xml, uncomment the servlet declarations starting line 165 and 213, as well as the associated servlet mappings line 265 and 274. Alternately, these servlet declarations and mappings can be added to your web application deployment descriptor. On Unix: * rename the file $CATALINA_HOME/server/lib/servlets-cgi.renametojar to $CATALINA_HOME/server/lib/servlets-cgi.jar. * rename the file $CATALINA_HOME/server/lib/servlets-ssi.renametojar to $CATALINA_HOME/server/lib/servlets-ssi.jar. * in $CATALINA_HOME/conf/web.xml, uncomment the servlet declarations starting line 165 and 213, as well as the associated servlet mappings line 265 and 274. Alternately, these servlet declarations and mappings can be added to your web application deployment descriptor. --------------------- Security manager URLs: --------------------- The URLs to be used in the policy file to grant permissions to JARs located inside the web application repositories have changed in Tomcat 5.0. In Tomcat 4.0, codeBase URLs for JARs loaded from web application repositories were: jar:file:${catalina.home}/webapps/examples/WEB-INF/lib/driver.jar!/- In Tomcat 4.1 and 5.0, they should be: file:${catalina.home}/webapps/examples/WEB-INF/lib/driver.jar --------------------------- Symlinking static resources: --------------------------- Unix symlinks will not work when used in a web application to link resources located outside the web application root directory. This behavior is optional, and the "allowLinking" flag may be used to disable the check. ------------------------ Enabling invoker servlet: ------------------------ Starting with Tomcat 4.1.12, the invoker servlet is no longer available by default in all webapp. Enabling it for all webapps is possible by editing $CATALINA_HOME/conf/web.xml to uncomment the "/servlet/*" servlet-mapping definition. Using the invoker servlet in a production environment is not recommended and is unsupported. 1.2 +4 -4 jakarta-tomcat-5/resources/INSTALLLICENSE Index: INSTALLLICENSE =================================================================== RCS file: /home/cvs/jakarta-tomcat-5/resources/INSTALLLICENSE,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- INSTALLLICENSE 19 Jul 2002 00:39:13 -0000 1.1 +++ INSTALLLICENSE 9 Oct 2002 10:06:07 -0000 1.2 @@ -1,11 +1,11 @@ -========================================================== +===================================================== The Apache Software License, Version 1.1 Copyright (c) 1999, 2000, 2001 The Apache Software Foundation. All rights reserved. -========================================================== +===================================================== Redistribution and use in source and binary forms, with or without modi- fication, are permitted provided that the following conditions are met: @@ -51,10 +51,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -========================================================== +===================================================== This software consists of voluntary contributions made by many indivi- duals on behalf of the Apache Software Foundation. For more information on the Apache Software Foundation, please see <http://www.apache.org/>. -========================================================== +===================================================== 1.1 jakarta-tomcat-5/resources/welcome.bin.html Index: welcome.bin.html =================================================================== <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <HTML><HEAD><TITLE>Apache Tomcat @VERSION@</TITLE> <META http-equiv=Content-Type content="text/html; charset=windows-1252"> </HEAD> <BODY> <P> <H3>Apache Tomcat @VERSION@</H3> <p></p> <p>This version of Tomcat can use the AJP 1.3 protocol or JNI to connect to native webservers. Among the native connectors available from the Jakarta Tomcat Connectors subproject, using the JK 2 native connector is recommended. Binaries can be downloaded <a href="http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk2/release">here</a>.</p> <P></P></BODY></HTML> 1.1 jakarta-tomcat-5/resources/welcome.main.html Index: welcome.main.html =================================================================== <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <HTML><HEAD><TITLE>Apache Tomcat @VERSION@</TITLE> <META http-equiv=Content-Type content="text/html"> </HEAD> <BODY> <P> <H3>Apache Tomcat @VERSION@</H3> <P></P> <P>Please see the <a href="RELEASE-NOTES">RELEASE-NOTES</a> for important information about recent bug fixes and known issues. </P> <p><b>NOTE: The tar files in this distribution use GNU tar extensions, and must be untarred with a GNU compatible version of tar. The version of <CODE>tar</CODE> on Solaris and Mac OS X will not work with these files.</b></P> <P>Thank you for using <A href="http://jakarta.apache.org/tomcat">Tomcat</A>!. </P> <P><B>The Apache Jakarta Project</B> <BR><A href="http://jakarta.apache.org/">http://jakarta.apache.org/</A> </P> <P> <P></P></BODY></HTML>
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>