You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2006/03/29 15:58:05 UTC
svn commit: r389795 - in /tomcat/tc6.0.x/trunk: BUILDING.txt LICENSE
README.txt build.properties.default build.xml res/bootstrap.jar.manifest
Author: remm
Date: Wed Mar 29 05:58:04 2006
New Revision: 389795
URL: http://svn.apache.org/viewcvs?rev=389795&view=rev
Log:
- Add the usual set of JARs.
Added:
tomcat/tc6.0.x/trunk/BUILDING.txt
tomcat/tc6.0.x/trunk/LICENSE
tomcat/tc6.0.x/trunk/README.txt
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/res/bootstrap.jar.manifest
Modified:
tomcat/tc6.0.x/trunk/build.xml
Added: tomcat/tc6.0.x/trunk/BUILDING.txt
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/BUILDING.txt?rev=389795&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/BUILDING.txt (added)
+++ tomcat/tc6.0.x/trunk/BUILDING.txt Wed Mar 29 05:58:04 2006
@@ -0,0 +1,73 @@
+$Id: BUILDING.txt 304991 2002-07-16 19:30:53Z kinman $
+
+ Building The Tomcat 4.0 Servlet/JSP Container With Jasper2
+ ==========================================================
+
+Jasper2 is a reimplementation of the JSP Container for Tomcat 4.0 that is
+cleaner and easier to extend. It also forms the basis of the JSP 2.0
+implementation. Jasper2 will eventually replace the Jasper module
+built into the Tomcat distribution. In the meanwhile, you can build Jasper2
+alongside Tomcat 4.0 and replace Jasper.
+
+To build Jasper2, first make sure you have a working build environment for
+Tomcat 4.0. You can do so by following the instructions in the BUILDING.txt
+file in the Tomcat 4.0 workspace.
+
+Once you have a working build environment for Tomcat 4.0, do the following:
+
+(0) Modify your build.properties file in Tomcat 4.0
+
+* Add a line to your build.properties file for Tomcat 4.0 that
+ points the build script to Jasper2 instead of Jasper, as follows:
+
+ # ----- Jakarta Tomcat Jasper source path -----
+ jasper.home=${base.path}/jakarta-tomcat-jasper/jasper2
+
+ This directory is relative to the location of build.xml for Tomcat.
+
+(1) Use anonymous CVS (as described on the Jakarta web site at
+ <http://jakarta.apache.org/site/cvsindex.html>, or download a source
+ distribution of the "jakarta-taglibs" repository (7/15/2002 or later).
+
+ http://jakarta.apache.org/builds/jakarta-taglibs/nightly/projects/standard/
+
+* Unpack the package into a convenient location so that
+ it resides in its own subdirectory.
+
+* Follow the instructions in BUILDING.txt to set up the correct
+ build environment. Make sure you have a valid build.properties file.
+
+* Change directory to "standard" and build the special JSP 2.0 build target
+ for producing the JSP 2.0 Expression Language Evaluator. The ant target
+ is called jsp20el.dist.
+
+ cd standard
+ ant jsp20el.dist
+
+(2) Customize Build Properties for this subproject
+
+Most Jakarta subprojects allow you to customize Ant properties (with default
+values defined in the "build.xml" file. This is done by creating a text file
+named "build.properties" in the source distribution directory (for property
+definitions local to this subproject) and/or your user home directory (for
+property definitions shared across subprojects). You can use the included
+"build.properties.sample" file as a starting point for this.
+
+Jasper2 has external dependencies that are satisfied by configuring
+appropriate values in your build.properties file. The easiest
+way to satisfy these dependencies is to copy the "build.properties.sample"
+file (in the top-level Tomcat source directory) to "build.properties", and
+then edit it to suit your environment. On Unix, this would be done as:
+
+ cd ${jasper2.source}
+ cp build.properties.sample build.properties
+ emacs build.properties
+
+NOTE: Be *sure* that you do not check "build.properties" in to the CVS
+repository. This file is local to your own development environment, and
+each developer will have their own version.
+
+(3) Build A Binary Distribution
+
+Jasper2 is built as part of Tomcat. Follow the instructions in
+BUILDING.txt in the Tomcat project to build Tomcat with Jasper2.
Added: tomcat/tc6.0.x/trunk/LICENSE
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/LICENSE?rev=389795&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/LICENSE (added)
+++ tomcat/tc6.0.x/trunk/LICENSE Wed Mar 29 05:58:04 2006
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "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.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "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.
+
+ "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).
+
+ "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.
+
+ "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."
+
+ "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.
+
+ 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.
+
+ 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.
+
+ 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) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (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
+
+ (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.
+
+ 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.
+
+ 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.
+
+ 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.
+
+ 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.
+
+ 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.
+
+ 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.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ 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.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ 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.
Added: tomcat/tc6.0.x/trunk/README.txt
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/README.txt?rev=389795&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/README.txt (added)
+++ tomcat/tc6.0.x/trunk/README.txt Wed Mar 29 05:58:04 2006
@@ -0,0 +1,24 @@
+This project is a rewrite of Jasper for tomcat 4.x.
+
+1. Main goals:
+
+ * Cleanup of the current Jasper.
+ * Use for RI work for JSP 1.3
+ * Use for optimization work for generated servlet codes.
+
+2. Status
+
+ * Main jasper engine (parser, attribute validates, code generator)
+ basically complete.
+
+3. Todo
+
+ * Rewrite attribute parser for better spec comformance.
+ * More cleanup, especially jspc parts.
+ * Added large file option.
+ * Error messages.
+ * JSR045 support
+ * Expression language support (JSP1.3)
+ * Optimizations, optimizations, and optimizations
+
+
Added: tomcat/tc6.0.x/trunk/build.properties.default
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/build.properties.default?rev=389795&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/build.properties.default (added)
+++ tomcat/tc6.0.x/trunk/build.properties.default Wed Mar 29 05:58:04 2006
@@ -0,0 +1,49 @@
+# -----------------------------------------------------------------------------
+# build.properties.sample
+#
+# This is an example "build.properties" file, used to customize building
+# Jasper2 for your local environment. It defines the location of all external
+# modules that Jasper2 depends on. Copy this file to "build.properties"
+# in the top-level source directory, and customize it as needed.
+#
+# $Id: build.properties.sample 379500 2006-02-21 15:50:10Z remm $
+# -----------------------------------------------------------------------------
+
+# ----- Default Base Path for Dependent Packages -----
+# Please note this path must be absolute, not relative,
+# as it is referenced with different working directory
+# contexts by the various build scripts.
+base.path=/usr/share/java
+#base.path=C:/path/to/the/repository
+#base.path=/usr/local
+
+compile.source=1.5
+
+# ----- Servlet API v2.4 -----
+servlet-api.home=${base.path}/servlet-api-2.4
+servlet-api.lib=${servlet-api.home}/lib
+servlet-api.jar=${servlet-api.lib}/servlet-api.jar
+
+# ----- Commons Logging, version 1.0.1 or later -----
+commons-logging.home=${base.path}/commons-logging-1.0.4
+commons-logging.lib=${commons-logging.home}
+commons-logging-api.jar=${commons-logging.lib}/commons-logging-api.jar
+commons-logging.jar=${commons-logging.lib}/commons-logging.jar
+commons-logging.loc=${base-jakarta.loc}/commons/logging/binaries/commons-logging-1.0.4.tar.gz
+
+# ----- Commons Modeler, version 1.1 or later -----
+commons-modeler.home=${base.path}/commons-modeler-1.1
+commons-modeler.lib=${commons-modeler.home}
+commons-modeler.jar=${commons-modeler.lib}/commons-modeler.jar
+commons-modeler.loc=${base-jakarta.loc}/commons/modeler/binaries/modeler-1.1.tar.gz
+
+# ----- Eclipse JDT, version 3.1.2 or later -----
+jdt.home=${base.path}/eclipse/plugins
+jdt.lib=${jdt.home}
+jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.1.2.jar
+jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.1.2-200601181600/eclipse-JDT-3.1.2.zip
+
+# ----- Tomcat native library -----
+tomcat-native.home=${base.path}/tomcat-native-1.1.2
+tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
+tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-1.1.2.tar.gz
Modified: tomcat/tc6.0.x/trunk/build.xml
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/build.xml?rev=389795&r1=389794&r2=389795&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Wed Mar 29 05:58:04 2006
@@ -34,23 +34,31 @@
<!-- Can't be lower - jsp uses templates -->
<property name="compile.source" value="1.5"/>
- <!-- Defaults, if build.properties is missing. It is sometimes easier to
- just have one build file, and use properties to just override settings -->
- <property name="TOMCAT_LIBS_BASE" location="../repository"/>
-
- <property name="ant.jar" location="${TOMCAT_LIBS_BASE}/apache-ant-1.6.5/lib/ant.jar"/>
- <property name="jdt.jar" location="${TOMCAT_LIBS_BASE}/eclipse/plugins/org.eclipse.jdt.core_3.1.1.jar"/>
- <property name="commons-logging.jar" location="${TOMCAT_LIBS_BASE}/commons-logging-1.0.4/commons-logging.jar"/>
- <property name="commons-modeler.jar" location="${TOMCAT_LIBS_BASE}/commons-modeler-1.1/commons-modeler.jar"/>
-
-
<!-- JAR artifacts -->
- <property name="servlet-api.jar" value="${tomcat.build}/common/lib/servlet-api.jar"/>
- <property name="jsp-api.jar" value="${tomcat.build}/common/lib/jsp-api.jar"/>
- <property name="el-api.jar" value="${tomcat.build}/common/lib/el-api.jar"/>
- <property name="jasper-compiler.jar" value="${tomcat.build}/common/lib/jasper-compiler.jar"/>
- <property name="jasper-runtime.jar" value="${tomcat.build}/common/lib/jasper-runtime.jar"/>
- <property name="jasper-el.jar" value="${tomcat.build}/common/lib/jasper-el.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="bootstrap.jar" value="${tomcat.build}/bin/bootstrap.jar"/>
+ <property name="catalina.jar" value="${tomcat.build}/lib/catalina.jar"/>
+ <property name="catalina-optional.jar" value="${tomcat.build}/lib/catalina-optional.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="naming-factory.jar" value="${tomcat.build}/lib/naming-factory.jar"/>
+ <property name="naming-resources.jar" value="${tomcat.build}/lib/naming-resources.jar"/>
+ <property name="servlets-cgi.jar" value="${tomcat.build}/lib/servlets-cgi.renametojar"/>
+ <property name="servlets-default.jar" value="${tomcat.build}/lib/servlets-default.jar"/>
+ <property name="servlets-invoker.jar" value="${tomcat.build}/lib/servlets-invoker.jar"/>
+ <property name="servlets-ssi.jar" value="${tomcat.build}/lib/servlets-ssi.renametojar"/>
+ <property name="servlets-webdav.jar" value="${tomcat.build}/lib/servlets-webdav.jar"/>
+ <property name="tomcat-util.jar" value="${tomcat.build}/lib/tomcat-util.jar"/>
+ <property name="tomcat-coyote.jar" value="${tomcat.build}/lib/tomcat-coyote.jar"/>
+ <property name="tomcat-apr.jar" value="${tomcat.build}/lib/tomcat-apr.jar"/>
+ <property name="tomcat-ajp.jar" value="${tomcat.build}/lib/tomcat-ajp.jar"/>
+ <property name="tomcat-http.jar" value="${tomcat.build}/lib/tomcat-http.jar"/>
+
+ <property name="jasper-compiler.jar" value="${tomcat.build}/lib/jasper-compiler.jar"/>
+ <property name="jasper-runtime.jar" value="${tomcat.build}/lib/jasper-runtime.jar"/>
+ <property name="jasper-el.jar" value="${tomcat.build}/lib/jasper-el.jar"/>
<!-- Classpath -->
<path id="tomcat.classpath">
@@ -97,12 +105,13 @@
</copy>
</target>
-
+
<target name="build-only" depends="build-prepare,compile,package" />
-
+
<target name="package" >
+
<!-- Servlet 2.5 Implementation JAR File -->
- <jar jarfile="${servlet-api.jar}">
+ <jar jarfile="${servlet-api.jar}" index="true">
<fileset dir="${tomcat.classes}">
<include name="javax/servlet/*" />
<include name="javax/servlet/http/*" />
@@ -114,7 +123,7 @@
</jar>
<!-- JSP 2.1 Implementation JAR File -->
- <jar jarfile="${jsp-api.jar}">
+ <jar jarfile="${jsp-api.jar}" index="true">
<fileset dir="${tomcat.classes}">
<include name="javax/servlet/jsp/**" />
<!-- Javadoc and i18n exclusions -->
@@ -124,7 +133,7 @@
</jar>
<!-- JSP 2.1 EL Implementation JAR File -->
- <jar jarfile="${el-api.jar}">
+ <jar jarfile="${el-api.jar}" index="true">
<fileset dir="${tomcat.classes}">
<include name="javax/el/**" />
<!-- Javadoc and i18n exclusions -->
@@ -133,8 +142,274 @@
</fileset>
</jar>
+ <!-- Catalina Bootstrap JAR File -->
+ <jar jarfile="${bootstrap.jar}" index="true"
+ manifest="res/bootstrap.jar.manifest">
+ <fileset dir="${tomcat.classes}">
+ <include name="org/apache/catalina/startup/Bootstrap.class" />
+ <include name="org/apache/catalina/startup/catalina.properties" />
+ <include name="org/apache/catalina/startup/CatalinaProperties.class" />
+ <include name="org/apache/catalina/startup/ClassLoaderFactory.class" />
+ <include name="org/apache/catalina/startup/Tool.class" />
+ <include name="org/apache/catalina/loader/StandardClassLoader*.class" />
+ <include name="org/apache/catalina/loader/Extension.class" />
+ <include name="org/apache/catalina/loader/Reloader.class" />
+ <include name="org/apache/catalina/security/SecurityClassLoad.class" />
+ <include name="org/apache/catalina/launcher/CatalinaLaunchFilter.class" />
+ <include name="org/apache/naming/JndiPermission.class" />
+ <include name="org/apache/tomcat/util/compat/*" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
+
+ <!-- Catalina Main JAR File -->
+ <jar jarfile="${catalina.jar}" index="true">
+ <fileset dir="${tomcat.classes}">
+ <include name="org/apache/catalina/**" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ <!-- Modules -->
+ <exclude name="org/apache/catalina/ant/**" />
+ <exclude name="org/apache/catalina/cluster/**" />
+ <exclude name="org/apache/catalina/launcher/**" />
+ <exclude name="org/apache/catalina/servlets/**" />
+ <exclude name="org/apache/catalina/startup/Bootstrap.class" />
+ <exclude name="org/apache/catalina/storeconfig/**" />
+ <exclude name="org/apache/catalina/ssi/**" />
+ <exclude name="org/apache/naming/**" />
+ <!-- Catalina-optional classes -->
+ <exclude name="org/apache/catalina/realm/DataSourceRealm.class" />
+ <exclude name="org/apache/catalina/realm/JAAS*" />
+ <exclude name="org/apache/catalina/realm/JDBC*" />
+ <exclude name="org/apache/catalina/realm/JNDI*" />
+ <exclude name="org/apache/catalina/realm/Memory*" />
+ <exclude name="org/apache/catalina/session/StoreBase.class" />
+ <exclude name="org/apache/catalina/session/*Store.class" />
+ <exclude name="org/apache/catalina/session/PersistentManager*" />
+ <exclude name="org/apache/catalina/util/CGIProcessEnvironment.class" />
+ <exclude name="org/apache/catalina/util/CookieTools.class" />
+ <exclude name="org/apache/catalina/util/DateTool.class" />
+ <exclude name="org/apache/catalina/util/DOMWriter.class" />
+ <exclude name="org/apache/catalina/util/FastDateFormat.class" />
+ <exclude name="org/apache/catalina/util/IOTools.class" />
+ <exclude name="org/apache/catalina/util/MIME2Java.class" />
+ <exclude name="org/apache/catalina/util/Process*" />
+ <exclude name="org/apache/catalina/util/Queue.class" />
+ <exclude name="org/apache/catalina/util/Strftime.class" />
+ <exclude name="org/apache/catalina/util/XMLWriter.class" />
+ <exclude name="org/apache/catalina/valves/ExtendedAccessLogValve.class" />
+ <exclude name="org/apache/catalina/valves/FastCommonAccessLogValve.class" />
+ <exclude name="org/apache/catalina/valves/FieldInfo.class" />
+ <exclude name="org/apache/catalina/valves/JDBCAccessLogValve.class" />
+ <exclude name="org/apache/catalina/valves/PersistentValve.class" />
+ <exclude name="org/apache/catalina/valves/Remote*" />
+ <exclude name="org/apache/catalina/valves/RequestDumperValve.class" />
+ <exclude name="org/apache/catalina/valves/RequestFilterValve.class" />
+ <exclude name="org/apache/catalina/valves/SemaphoreValve.class" />
+ </fileset>
+ </jar>
+
+ <!-- Catalina Optional JAR File -->
+ <jar jarfile="${catalina-optional.jar}" index="true">
+ <fileset dir="${tomcat.classes}">
+ <include name="org/apache/catalina/realm/DataSourceRealm.class" />
+ <include name="org/apache/catalina/realm/JAAS*" />
+ <include name="org/apache/catalina/realm/JDBC*" />
+ <include name="org/apache/catalina/realm/JNDI*" />
+ <include name="org/apache/catalina/realm/Memory*" />
+ <include name="org/apache/catalina/session/StoreBase.class" />
+ <include name="org/apache/catalina/session/*Store.class" />
+ <include name="org/apache/catalina/session/PersistentManager*" />
+ <include name="org/apache/catalina/util/CGIProcessEnvironment.class" />
+ <include name="org/apache/catalina/util/CookieTools.class" />
+ <include name="org/apache/catalina/util/DateTool.class" />
+ <include name="org/apache/catalina/util/DOMWriter.class" />
+ <include name="org/apache/catalina/util/FastDateFormat.class" />
+ <include name="org/apache/catalina/util/IOTools.class" />
+ <include name="org/apache/catalina/util/MIME2Java.class" />
+ <include name="org/apache/catalina/util/Process*" />
+ <include name="org/apache/catalina/util/Queue.class" />
+ <include name="org/apache/catalina/util/Strftime.class" />
+ <include name="org/apache/catalina/util/XMLWriter.class" />
+ <include name="org/apache/catalina/valves/ExtendedAccessLogValve.class" />
+ <include name="org/apache/catalina/valves/FastCommonAccessLogValve.class" />
+ <include name="org/apache/catalina/valves/FieldInfo.class" />
+ <include name="org/apache/catalina/valves/JDBCAccessLogValve.class" />
+ <include name="org/apache/catalina/valves/PersistentValve.class" />
+ <include name="org/apache/catalina/valves/Remote*" />
+ <include name="org/apache/catalina/valves/RequestDumperValve.class" />
+ <include name="org/apache/catalina/valves/RequestFilterValve.class" />
+ <include name="org/apache/catalina/valves/SemaphoreValve.class" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
+
+ <!-- Catalina Ant Tasks JAR File -->
+ <jar jarfile="${catalina-ant.jar}" index="true">
+ <fileset dir="${tomcat.classes}">
+ <include name="org/apache/catalina/ant/*" />
+ <include name="org/apache/catalina/util/Base64.class" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
+
+ <!-- Catalina JMX Accessor Ant Tasks JAR File -->
+ <jar jarfile="${catalina-ant-jmx.jar}" index="true">
+ <fileset dir="${tomcat.classes}">
+ <include name="org/apache/catalina/ant/jmx/*" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
+
+ <!-- Naming - Factory JAR File -->
+ <jar jarfile="${naming-factory.jar}" index="true">
+ <fileset dir="${tomcat.classes}">
+ <include name="org/apache/naming/**" />
+ <exclude name="org/apache/naming/resources/**" />
+ <exclude name="org/apache/naming/JndiPermission.class" />
+ <exclude name="org/apache/naming/NameParserImpl.class" />
+ <exclude name="org/apache/naming/NamingContextBindingsEnumeration.class" />
+ <exclude name="org/apache/naming/NamingContextEnumeration.class" />
+ <exclude name="org/apache/naming/NamingEntry.class" />
+ <exclude name="org/apache/naming/StringManager.class" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
+
+ <!-- Naming - Resources JAR File -->
+ <jar jarfile="${naming-resources.jar}" index="true">
+ <fileset dir="${tomcat.classes}">
+ <include name="org/apache/naming/JndiPermission.class" />
+ <include name="org/apache/naming/NameParserImpl.class" />
+ <include name="org/apache/naming/NamingContextBindingsEnumeration.class" />
+ <include name="org/apache/naming/NamingContextEnumeration.class" />
+ <include name="org/apache/naming/NamingEntry.class" />
+ <include name="org/apache/naming/StringManager.class" />
+ <include name="org/apache/naming/resources/**" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
+
+ <!-- Servlets - CGI Servlet -->
+ <jar jarfile="${servlets-cgi.jar}" index="true">
+ <fileset dir="${tomcat.classes}">
+ <include name="org/apache/catalina/servlets/CGI*" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
+
+ <!-- Servlets - Default File-Serving Servlet -->
+ <jar jarfile="${servlets-default.jar}" index="true">
+ <fileset dir="${tomcat.classes}">
+ <include name="org/apache/catalina/servlets/Default*" />
+ <include name="org/apache/catalina/servlets/Constants.class" />
+ <include name="org/apache/catalina/servlets/LocalStrings.properties" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
+
+ <!-- Servlets - Invoker Servlet -->
+ <jar jarfile="${servlets-invoker.jar}" index="true">
+ <fileset dir="${tomcat.classes}">
+ <include name="org/apache/catalina/servlets/Invoker*" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
+
+ <!-- Servlets - SSI Servlet -->
+ <jar jarfile="${servlets-ssi.jar}" index="true">
+ <fileset dir="${tomcat.classes}">
+ <include name="org/apache/catalina/ssi/**" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
+
+ <!-- Servlets - Webdav Servlet -->
+ <jar jarfile="${servlets-webdav.jar}" index="true">
+ <fileset dir="${tomcat.classes}">
+ <include name="org/apache/catalina/servlets/Webdav*" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
+
+ <!-- Protocol handlers - Coyote -->
+ <jar jarfile="${tomcat-coyote.jar}" index="true">
+ <fileset dir="${tomcat.classes}">
+ <include name="org/apache/coyote/*" />
+ <include name="org/apache/coyote/memory/*" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
+
+ <!-- Protocol handlers - APR -->
+ <jar jarfile="${tomcat-apr.jar}" index="true">
+ <fileset dir="${tomcat.classes}">
+ <include name="org/apache/tomcat/jni/**" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
+
+ <!-- Protocol handlers - HTTP -->
+ <jar jarfile="${tomcat-http.jar}" index="true">
+ <fileset dir="${tomcat.classes}">
+ <include name="org/apache/coyote/http11/**" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
+
+ <!-- Protocol handlers - AJP -->
+ <jar jarfile="${tomcat-ajp.jar}" index="true">
+ <fileset dir="${tomcat.classes}">
+ <include name="org/apache/coyote/ajp/**" />
+ <include name="org/apache/jk/**" />
+ <exclude name="org/apache/jk/ant/**" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
+
+ <!-- Util JAR File -->
+ <jar jarfile="${tomcat-util.jar}" index="true">
+ <fileset dir="${tomcat.classes}">
+ <include name="org/apache/tomcat/util/**" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
+
<!-- Jasper Compiler JAR File -->
- <jar jarfile="${jasper-compiler.jar}">
+ <jar jarfile="${jasper-compiler.jar}" index="true">
<fileset dir="${tomcat.classes}">
<include name="org/apache/jasper/compiler/**" />
<include name="org/apache/jasper/xmlparser/**" />
@@ -150,7 +425,7 @@
</jar>
<!-- Jasper Runtime JAR File -->
- <jar jarfile="${jasper-runtime.jar}">
+ <jar jarfile="${jasper-runtime.jar}" index="true">
<fileset dir="${tomcat.classes}">
<include name="org/apache/jasper/Constants.class" />
<include name="org/apache/jasper/JasperException.class" />
@@ -167,7 +442,7 @@
</jar>
<!-- Jasper EL Implementation JAR File -->
- <jar jarfile="${jasper-el.jar}">
+ <jar jarfile="${jasper-el.jar}" index="true">
<fileset dir="${tomcat.classes}">
<include name="org/apache/el/**" />
<!-- Javadoc and i18n exclusions -->
@@ -181,4 +456,9 @@
<target name="deploy" depends="build-only">
</target>
+ <target name="clean">
+ <delete dir="${tomcat.classes}" />
+ <delete dir="${tomcat.build}" />
+ </target>
+
</project>
Added: tomcat/tc6.0.x/trunk/res/bootstrap.jar.manifest
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/res/bootstrap.jar.manifest?rev=389795&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/res/bootstrap.jar.manifest (added)
+++ tomcat/tc6.0.x/trunk/res/bootstrap.jar.manifest Wed Mar 29 05:58:04 2006
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Main-Class: org.apache.catalina.startup.Bootstrap
+Class-Path: jmx.jar commons-daemon.jar commons-logging-api.jar tomcat-juli.jar
+Specification-Title: Catalina
+Specification-Version: 1.0
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org