Author: remy.maucherat(a)jboss.com Date: 2007-09-05 13:30:18 -0400 (Wed, 05 Sep 2007) New Revision: 270 Removed: trunk/README.txt trunk/extras.xml Modified: trunk/BUILDING.txt trunk/LICENSE trunk/NOTICE trunk/RUNNING.txt trunk/build.properties.default Log: - Additional updates. Modified: trunk/BUILDING.txt =================================================================== --- trunk/BUILDING.txt 2007-09-05 15:51:02 UTC (rev 269) +++ trunk/BUILDING.txt 2007-09-05 17:30:18 UTC (rev 270) @@ -1,10 +1,10 @@ $Id: BUILDING.txt 467221 2006-10-24 03:16:33Z markt $ - ==================================================== - Building The Apache Tomcat 6.0 Servlet/JSP Container - ==================================================== + ============================================ + Building The JBoss Web Servlet/JSP Container + ============================================ -This subproject contains the source code for Tomcat 6.0, a container that +This subproject contains the source code for JBoss Web, a container that implements the Servlet 2.5 and JSP 2.1 specifications from the Java Community Process <http://www.jcp.org/>;. In order to build a binary distribution version of the container from a source distribution, @@ -47,19 +47,19 @@ available, which will be used to actually perform the build. -(2) Building Tomcat 6.0 +(2) Building JBoss Web -(2.1) Checkout or obtain the source code for Tomcat 6.0 +(2.1) Checkout or obtain the source code for JBoss Web -* Tomcat SVN repository URL: - http://svn.apache.org/repos/asf/tomcat/tc6.0.x/ +* JBoss Web SVN repository URL: + http://svn.apache.org/repos/jbossweb/trunk * Download a source package from: - http://tomcat.apache.org/download-60.cgi + http://labs.jboss.com/jbossweb * Checkout the source using SVN, selecting the desired version or branch (current development source is at - http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/), or + http://svn.apache.org/repos/jbossweb/trunk), or unpack the source package. The location where the source has been placed will be referred as ${tomcat.source}. @@ -96,7 +96,7 @@ (3) Updating sources -It is recommended that you regularly update the downloaded Tomcat 6 sources +It is recommended that you regularly update the downloaded JBoss Web sources using your SVN client. (4) Rebuilds @@ -106,9 +106,9 @@ cd ${tomcat.source} ant -(5) Building the servlet and jsp API documentation +(5) Building the Servlet and JSP API documentation -The documentation can be easly built: +The documentation can be easily built: cd ${tomcat.source} ant -f dist.xml dist-javadoc Modified: trunk/LICENSE =================================================================== --- trunk/LICENSE 2007-09-05 15:51:02 UTC (rev 269) +++ trunk/LICENSE 2007-09-05 17:30:18 UTC (rev 270) @@ -1,202 +1,166 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. - 1. Definitions. - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. + 0. Additional Definitions. - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." + 1. Exception to Section 3 of the GNU GPL. - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. + 2. Conveying Modified Versions. - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and + 3. Object Code Incorporating Material from Library Header Files. - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. + b) Accompany the object code with a copy of the GNU GPL and this license + document. - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. + 4. Combined Works. - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. - END OF TERMS AND CONDITIONS + d) Do one of the following: - APPENDIX: How to apply the Apache License to your work. + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. - Copyright [yyyy] [name of copyright owner] + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at + 5. Combined Libraries. - http://www.apache.org/licenses/LICENSE-2.0 + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. Modified: trunk/NOTICE =================================================================== --- trunk/NOTICE 2007-09-05 15:51:02 UTC (rev 269) +++ trunk/NOTICE 2007-09-05 17:30:18 UTC (rev 270) @@ -1,3 +1,6 @@ +JBoss Web +Copyright 2006-2007 RedHat Inc + Apache Tomcat Copyright 1999-2007 The Apache Software Foundation Deleted: trunk/README.txt =================================================================== --- trunk/README.txt 2007-09-05 15:51:02 UTC (rev 269) +++ trunk/README.txt 2007-09-05 17:30:18 UTC (rev 270) @@ -1,58 +0,0 @@ -Install Rewrite Valve in Tomcat -------------------------------- - -Copy jbossweb-rewrite.jar to $CATALINA_BASE/server/lib - -server.xml (on context.xml files) -Add (to either Engine, Host or Context elements depending on the desired -rewrite scope): - <Valve className="org.jboss.web.rewrite.RewriteValve"/> - -Documentation: -http://labs.jboss.com/file-access/default/members/jbossweb/freezone/modules/rewrite/index.html - -Install PHP Servlet in Tomcat ------------------------------ - -Install PHP 5.1.x -Add PHP dir to PATH -Compile and copy php5servlet to PHP dir. -Copy servlets-php.jar to $CATALINA_BASE/server/lib - -server.xml -Add (to the main Server element): - <Listener className="org.apache.catalina.servlets.php.LifecycleListener"/> - -web.xml: -Add: - <servlet> - <servlet-name>php</servlet-name> - <servlet-class>org.apache.catalina.servlets.php.Handler</servlet-class> - <init-param> - <param-name>debug</param-name> - <param-value>0</param-value> - </init-param> - <load-on-startup>6</load-on-startup> - </servlet> - <servlet> - <servlet-name>phps</servlet-name> - <servlet-class>org.apache.catalina.servlets.php.Highlight</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>php</servlet-name> - <url-pattern>*.php</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>phps</servlet-name> - <url-pattern>*.phps</url-pattern> - </servlet-mapping> - -Documentation: -http://labs.jboss.com/file-access/default/members/jbossweb/freezone/modules/php/index.html - -Install .NET support in Tomcat ------------------------------- - -Documentation: -http://labs.jboss.com/file-access/default/members/jbossweb/freezone/modules/dotnet/index.html Modified: trunk/RUNNING.txt =================================================================== --- trunk/RUNNING.txt 2007-09-05 15:51:02 UTC (rev 269) +++ trunk/RUNNING.txt 2007-09-05 17:30:18 UTC (rev 270) @@ -1,10 +1,10 @@ $Id: RUNNING.txt 354430 2005-12-06 13:44:26Z yoavs $ - =================================================== - Running The Apache Tomcat 6.0 Servlet/JSP Container - =================================================== + =========================================== + Running The JBoss Web Servlet/JSP Container + =========================================== -Apache Tomcat 6.0 requires the Java 2 Standard Edition Runtime +JBoss Web requires the Java 2 Standard Edition Runtime Environment (JRE) version 5.0 or later. ============================= @@ -28,64 +28,64 @@ or /usr/local/java/j2sdk5.0. -(2) Download and Install the Tomcat Binary Distribution +(2) Download and Install the JBoss Web Binary Distribution NOTE: As an alternative to downloading a binary distribution, you can create -your own from the Tomcat source repository, as described in "BUILDING.txt". +your own from the JBoss Web source repository, as described in "BUILDING.txt". If you do this, the value to use for "${catalina.home}" will be the "dist" subdirectory of your source distribution. -(2.1) Download a binary distribution of Tomcat from: +(2.1) Download a binary distribution of JBoss Web from: - http://tomcat.apache.org + http://labs.jboss.com/jbossweb/ (2.2) Unpack the binary distribution into a convenient location so that the distribution resides in its own directory (conventionally named - "apache-tomcat-[version]"). For the purposes of the remainder of this document, + "jboss-web-[version]"). For the purposes of the remainder of this document, the symbolic name "$CATALINA_HOME" is used to refer to the full pathname of the release directory. -(3) Start Up Tomcat +(3) Start Up JBoss Web -(3.1) Tomcat can be started by executing the following commands: +(3.1) JBoss Web can be started by executing the following commands: $CATALINA_HOME\bin\startup.bat (Windows) $CATALINA_HOME/bin/startup.sh (Unix) -(3.2) After startup, the default web applications included with Tomcat will be +(3.2) After startup, the default web applications included with JBoss Web will be available by visiting: http://localhost:8080/ -(3.3) Further information about configuring and running Tomcat can be found in - the documentation included here, as well as on the Tomcat web site: +(3.3) Further information about configuring and running JBoss Web can be found in + the documentation included here, as well as on the JBoss Web web site: - http://tomcat.apache.org + http://labs.jboss.com/jbossweb/ -(4) Shut Down Tomcat +(4) Shut Down JBoss Web -(4.1) Tomcat can be shut down by executing the following command: +(4.1) JBoss Web can be shut down by executing the following command: $CATALINA_HOME\bin\shutdown (Windows) $CATALINA_HOME/bin/shutdown.sh (Unix) -================================================== -Advanced Configuration - Multiple Tomcat Instances -================================================== +===================================================== +Advanced Configuration - Multiple JBoss Web Instances +===================================================== -In many circumstances, it is desirable to have a single copy of a Tomcat +In many circumstances, it is desirable to have a single copy of a JBoss Web binary distribution shared among multiple users on the same server. To make this possible, you can pass a "-Dcatalina.base=$CATALINA_BASE" argument when executing the startup command (see (2)). In this "-Dcatalina.base=$CATALINA_BASE" argument, replace $CATALINA_BASE with the -directory that contains the files for your 'personal' Tomcat instance. +directory that contains the files for your 'personal' JBoss Web instance. -When you use this "-Dcatalina.base=$CATALINA_BASE" argument, Tomcat will +When you use this "-Dcatalina.base=$CATALINA_BASE" argument, JBoss Web will calculate all relative references for files in the following directories based on the value of $CATALINA_BASE instead of $CATALINA_HOME: @@ -112,11 +112,11 @@ ================ There are only really 3 things likely to go wrong during the stand-alone -Tomcat install: +JBoss Web install: (1) The most common hiccup is when another web server (or any process for that matter) has laid claim to port 8080. This is the default HTTP port that - Tomcat attempts to bind to at startup. To change this, open the file: + JBoss Web attempts to bind to at startup. To change this, open the file: $CATALINA_HOME/conf/server.xml @@ -124,8 +124,8 @@ greater than 1024, as ports less than or equal to 1024 require superuser access to bind under UNIX. - Restart Tomcat and you're in business. Be sure that you replace the "8080" - in the URL you're using to access Tomcat. For example, if you change the + Restart JBoss Web and you're in business. Be sure that you replace the "8080" + in the URL you're using to access JBoss Web. For example, if you change the port to 1977, you would request the URL http://localhost:1977/ in your browser. (2) An "out of environment space" error when running the batch files in Modified: trunk/build.properties.default =================================================================== --- trunk/build.properties.default 2007-09-05 15:51:02 UTC (rev 269) +++ trunk/build.properties.default 2007-09-05 17:30:18 UTC (rev 270) @@ -2,8 +2,8 @@ # build.properties.sample # # This is an example "build.properties" file, used to customize building -# Tomcat for your local environment. It defines the location of all external -# modules that Tomcat depends on. Copy this file to "build.properties" +# JBoss Web for your local environment. It defines the location of all external +# modules that JBoss Web depends on. Copy this file to "build.properties" # in the top-level source directory, and customize it as needed. # # $Id: build.properties.default 526202 2007-04-06 15:44:38Z remm $ Deleted: trunk/extras.xml =================================================================== --- trunk/extras.xml 2007-09-05 15:51:02 UTC (rev 269) +++ trunk/extras.xml 2007-09-05 17:30:18 UTC (rev 270) @@ -1,238 +0,0 @@ -<?xml version="1.0"?> -<project name="Tomcat 6.0" default="extras" basedir="."> - - - <!-- ===================== Initialize Property Values =================== --> - - <!-- See "build.properties.sample" in the top level directory for all --> - <!-- property values you must customize for successful building!!! --> - <property file="${user.home}/build.properties"/> - <property file="build.properties"/> - - <property file="build.properties.default"/> - - <!-- Project Properties --> - <property name="name" value="Apache Tomcat" /> - <property name="year" value="2007" /> - <property name="version.major" value="6" /> - <property name="version.minor" value="0" /> - <property name="version.build" value="0" /> - <property name="version.patch" value="0" /> - <property name="version" value="6.0.0-dev" /> - <property name="version.number" value="${version.major}.${version.minor}.${version.build}.${version.patch}" /> - - <property name="project" value="apache-tomcat" /> - <property name="final.name" value="${project}-${version}" /> - <property name="final-src.name" value="${project}-${version}-src" /> - - <!-- Build Defaults --> - <property name="tomcat.build" value="${basedir}/output/build"/> - <property name="tomcat.classes" value="${basedir}/output/classes"/> - <property name="tomcat.dist" value="${basedir}/output/dist"/> - <property name="tomcat.extras" value="${basedir}/output/extras"/> - <property name="tomcat.deployer" value="${basedir}/output/deployer"/> - <property name="tomcat.release" value="${basedir}/output/release"/> - <property name="test.failonerror" value="true"/> - <property name="test.runner" value="junit.textui.TestRunner"/> - - <!-- Can't be lower - jsp uses templates --> - <property name="compile.source" value="1.5"/> - - <!-- JAR artifacts --> - <property name="bootstrap.jar" value="${tomcat.build}/bin/bootstrap.jar"/> - - <property name="annotations-api.jar" value="${tomcat.build}/lib/annotations-api.jar"/> - <property name="servlet-api.jar" value="${tomcat.build}/lib/servlet-api.jar"/> - <property name="jsp-api.jar" value="${tomcat.build}/lib/jsp-api.jar"/> - <property name="el-api.jar" value="${tomcat.build}/lib/el-api.jar"/> - <property name="catalina.jar" value="${tomcat.build}/lib/catalina.jar"/> - <property name="catalina-ant.jar" value="${tomcat.build}/lib/catalina-ant.jar"/> - <property name="catalina-ant-jmx.jar" value="${tomcat.build}/lib/catalina-ant-jmx.jar"/> - <property name="tomcat-coyote.jar" value="${tomcat.build}/lib/tomcat-coyote.jar"/> - - <property name="jasper.jar" value="${tomcat.build}/lib/jasper.jar"/> - <property name="jasper-el.jar" value="${tomcat.build}/lib/jasper-el.jar"/> - - <property name="tomcat-dbcp.home" value="${base.path}/tomcat6-deps/dbcp" /> - <property name="jasper-jdt.home" value="${base.path}/tomcat6-deps/jdt" /> - <property name="tomcat-dbcp.jar" value="${tomcat-dbcp.home}/tomcat-dbcp.jar"/> - <property name="jasper-jdt.jar" value="${jasper-jdt.home}/jasper-jdt.jar"/> - - <property name="tomcat-juli.jar" value="${tomcat.extras}/tomcat-juli.jar"/> - <property name="tomcat-juli-adapters.jar" value="${tomcat.extras}/tomcat-juli-adapters.jar"/> - <property name="catalina-ws.jar" value="${tomcat.extras}/catalina-ws.jar"/> - - <!-- Classpath --> - <path id="tomcat.classpath"> - <pathelement location="${tomcat.classes}"/> - </path> - - <target name="prepare"> - <mkdir dir="${tomcat.extras}"/> - </target> - - <target name="clean"> - <delete dir="${tomcat.extras}"/> - </target> - - <target name="commons-logging"> - - <antcall target="downloadfile"> - <param name="sourcefile" value="${commons-logging-src.loc}"/> - <param name="destfile" value="${tomcat.extras}/logging/commons-logging-src.tar.gz"/> - <param name="destdir" value="${tomcat.extras}/logging/"/> - </antcall> - <gunzip src="${tomcat.extras}/logging/commons-logging-src.tar.gz" - dest="${tomcat.extras}/logging/commons-logging-src.tar"/> - <untar src="${tomcat.extras}/logging/commons-logging-src.tar" - dest="${tomcat.extras}/logging/"/> - - <replace dir="${tomcat.extras}/logging/commons-logging-1.1-src/src/java/org/apache/commons" > - <replacefilter token="org.apache.commons" - value="org.apache.juli" /> - </replace> - <mkdir dir="${tomcat.extras}/logging/commons-logging-1.1-src/src/java/org/apache/juli" /> - <move todir="${tomcat.extras}/logging/commons-logging-1.1-src/src/java/org/apache/juli"> - <fileset dir="${tomcat.extras}/logging/commons-logging-1.1-src/src/java/org/apache/commons" /> - </move> - - <replace dir="${tomcat.extras}/logging/commons-logging-1.1-src" > - <replacefilter token="org.apache.commons" - value="org.apache.juli" /> - <replacefilter token="org/apache/commons/" - value="org/apache/juli/" /> - </replace> - <copy tofile="${tomcat.extras}/logging/commons-logging-1.1-src/build2.xml" - file="${tomcat.extras}/logging/commons-logging-1.1-src/build.xml" /> - - <ant antfile="${tomcat.extras}/logging/commons-logging-1.1-src/build2.xml" - dir="${tomcat.extras}/logging/commons-logging-1.1-src" - target="getlibs" /> - <copy todir="${tomcat.extras}/logging/commons-logging-1.1-src"> - <fileset dir="${tomcat.extras}/logging/commons-logging-1.1-src/lib" /> - </copy> - <ant antfile="${tomcat.extras}/logging/commons-logging-1.1-src/build2.xml" - dir="${tomcat.extras}/logging/commons-logging-1.1-src" - target="compile" /> - - <jar jarfile="${tomcat-juli.jar}"> - <fileset dir="${tomcat.extras}/logging/commons-logging-1.1-src/target/classes"> - <include name="org/apache/juli/logging/*.class" /> - <include name="org/apache/juli/logging/impl/LogFactoryImpl*.class" /> - <include name="org/apache/juli/logging/impl/WeakHashtable*.class" /> - <include name="org/apache/juli/logging/impl/SimpleLog*.class" /> - <include name="org/apache/juli/logging/impl/NoOpLog*.class" /> - <include name="org/apache/juli/logging/impl/Jdk14Logger.class" /> - <include name="META-INF/LICENSE.txt" /> - <include name="META-INF/NOTICE.txt" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - </fileset> - <fileset dir="${tomcat.classes}"> - <include name="org/apache/juli/*" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - </fileset> - </jar> - <checksum file="${tomcat-juli.jar}" - forceOverwrite="yes" fileext=".md5" /> - - <jar jarfile="${tomcat-juli-adapters.jar}"> - <fileset dir="${tomcat.extras}/logging/commons-logging-1.1-src/target/classes"> - <include name="org/apache/juli/logging/impl/**.class" /> - <exclude name="org/apache/juli/logging/impl/WeakHashtable*.class" /> - <exclude name="org/apache/juli/logging/impl/LogFactoryImpl.class" /> - <include name="META-INF/LICENSE.txt" /> - <include name="META-INF/NOTICE.txt" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - </fileset> - </jar> - <checksum file="${tomcat-juli-adapters.jar}" - forceOverwrite="yes" fileext=".md5" /> - - </target> - - <target name="webservices"> - - <mkdir dir="${tomcat.extras}/webservices"/> - - <antcall target="downloadfile"> - <param name="sourcefile" value="${jaxrpc-src.loc}"/> - <param name="destfile" value="${tomcat.extras}/webservices/jaxrpc.jar"/> - <param name="destdir" value="${tomcat.extras}/webservices/"/> - </antcall> - - <antcall target="downloadfile"> - <param name="sourcefile" value="${wsdl4j-src.loc}"/> - <param name="destfile" value="${tomcat.extras}/webservices/wsdl4j.jar"/> - <param name="destdir" value="${tomcat.extras}/webservices/"/> - </antcall> - - <!-- Classpath --> - <path id="tomcat.webservices.classpath"> - <pathelement path="${tomcat.classpath}"/> - <fileset dir="${tomcat.extras}/webservices"> - <include name="jaxrpc.jar"/> - <include name="wsdl4j.jar"/> - </fileset> - </path> - - <!-- Compile internal server components --> - <javac srcdir="java" destdir="${tomcat.classes}" - debug="${compile.debug}" - deprecation="${compile.deprecation}" - source="${compile.source}" - optimize="${compile.optimize}"> - <classpath refid="tomcat.webservices.classpath" /> - <include name="org/apache/naming/factory/webservices/**" /> - </javac> - - <!-- Catalina Main JAR File --> - <jar jarfile="${catalina-ws.jar}"> - <fileset dir="${tomcat.classes}"> - <include name="org/apache/naming/factory/webservices/**" /> - <!-- Javadoc and i18n exclusions --> - <exclude name="**/package.html" /> - <exclude name="**/LocalStrings_*" /> - </fileset> - </jar> - <checksum file="${catalina-ws.jar}" - forceOverwrite="yes" fileext=".md5" /> - - </target> - - <target name="extras" depends="prepare,commons-logging,webservices"> - </target> - - <!-- Download and dependency building --> - <target name="proxyflags"> - <!-- check proxy parameters. --> - <condition property="useproxy"> - <equals arg1="${proxy.use}" arg2="on" /> - </condition> - </target> - - <target name="setproxy" depends="proxyflags" if="useproxy"> - <taskdef name="setproxy" - classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy" /> - <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" - proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> - <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> - </target> - - <target name="testexist"> - <echo message="Testing for ${destfile}"/> - <available file="${destfile}" property="exist"/> - </target> - - <target name="downloadfile" unless="exist" depends="setproxy,testexist"> - <!-- Download extract the file --> - <mkdir dir="${destdir}" /> - <get src="${sourcefile}" dest="${destfile}" /> - </target> - -</project>