- Add the usual set of JARs.
authorremm <remm@13f79535-47bb-0310-9956-ffa450edef68>
Wed, 29 Mar 2006 13:58:04 +0000 (13:58 +0000)
committerremm <remm@13f79535-47bb-0310-9956-ffa450edef68>
Wed, 29 Mar 2006 13:58:04 +0000 (13:58 +0000)
git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@389795 13f79535-47bb-0310-9956-ffa450edef68

BUILDING.txt [new file with mode: 0644]
LICENSE [new file with mode: 0644]
README.txt [new file with mode: 0644]
build.properties.default [new file with mode: 0644]
build.xml
res/bootstrap.jar.manifest [new file with mode: 0644]

diff --git a/BUILDING.txt b/BUILDING.txt
new file mode 100644 (file)
index 0000000..5370a1a
--- /dev/null
@@ -0,0 +1,73 @@
+$Id: BUILDING.txt 304991 2002-07-16 19:30:53Z kinman $\r
+\r
+         Building The Tomcat 4.0 Servlet/JSP Container With Jasper2\r
+         ==========================================================\r
+\r
+Jasper2 is a reimplementation of the JSP Container for Tomcat 4.0 that is\r
+cleaner and easier to extend.  It also forms the basis of the JSP 2.0 \r
+implementation.  Jasper2 will eventually replace the Jasper module\r
+built into the Tomcat distribution.  In the meanwhile, you can build Jasper2\r
+alongside Tomcat 4.0 and replace Jasper.\r
+\r
+To build Jasper2, first make sure you have a working build environment for\r
+Tomcat 4.0.  You can do so by following the instructions in the BUILDING.txt\r
+file in the Tomcat 4.0 workspace.\r
+\r
+Once you have a working build environment for Tomcat 4.0, do the following:\r
+\r
+(0) Modify your build.properties file in Tomcat 4.0\r
+\r
+* Add a line to your build.properties file for Tomcat 4.0 that\r
+  points the build script to Jasper2 instead of Jasper, as follows:\r
+\r
+      # ----- Jakarta Tomcat Jasper source path -----\r
+      jasper.home=${base.path}/jakarta-tomcat-jasper/jasper2\r
+\r
+  This directory is relative to the location of build.xml for Tomcat.\r
+\r
+(1) Use anonymous CVS (as described on the Jakarta web site at\r
+    <http://jakarta.apache.org/site/cvsindex.html>, or download a source\r
+    distribution of the "jakarta-taglibs" repository (7/15/2002 or later).\r
+\r
+    http://jakarta.apache.org/builds/jakarta-taglibs/nightly/projects/standard/\r
+\r
+* Unpack the package into a convenient location so that\r
+  it resides in its own subdirectory.\r
+\r
+* Follow the instructions in BUILDING.txt to set up the correct \r
+  build environment.  Make sure you have a valid build.properties file.\r
+\r
+* Change directory to "standard" and build the special JSP 2.0 build target\r
+  for producing the JSP 2.0 Expression Language Evaluator.  The ant target\r
+  is called jsp20el.dist.\r
+\r
+        cd standard\r
+        ant jsp20el.dist\r
+\r
+(2) Customize Build Properties for this subproject\r
+\r
+Most Jakarta subprojects allow you to customize Ant properties (with default\r
+values defined in the "build.xml" file.  This is done by creating a text file\r
+named "build.properties" in the source distribution directory (for property\r
+definitions local to this subproject) and/or your user home directory (for\r
+property definitions shared across subprojects).  You can use the included\r
+"build.properties.sample" file as a starting point for this.\r
+\r
+Jasper2 has external dependencies that are satisfied by configuring\r
+appropriate values in your build.properties file.  The easiest\r
+way to satisfy these dependencies is to copy the "build.properties.sample"\r
+file (in the top-level Tomcat source directory) to "build.properties", and\r
+then edit it to suit your environment.  On Unix, this would be done as:\r
+\r
+  cd ${jasper2.source}\r
+  cp build.properties.sample build.properties\r
+  emacs build.properties\r
+\r
+NOTE:  Be *sure* that you do not check "build.properties" in to the CVS\r
+repository.  This file is local to your own development environment, and\r
+each developer will have their own version.\r
+\r
+(3) Build A Binary Distribution\r
+\r
+Jasper2 is built as part of Tomcat.  Follow the instructions in \r
+BUILDING.txt in the Tomcat project to build Tomcat with Jasper2.\r
diff --git a/LICENSE b/LICENSE
new file mode 100644 (file)
index 0000000..75b5248
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+\r
+                                 Apache License\r
+                           Version 2.0, January 2004\r
+                        http://www.apache.org/licenses/\r
+\r
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\r
+\r
+   1. Definitions.\r
+\r
+      "License" shall mean the terms and conditions for use, reproduction,\r
+      and distribution as defined by Sections 1 through 9 of this document.\r
+\r
+      "Licensor" shall mean the copyright owner or entity authorized by\r
+      the copyright owner that is granting the License.\r
+\r
+      "Legal Entity" shall mean the union of the acting entity and all\r
+      other entities that control, are controlled by, or are under common\r
+      control with that entity. For the purposes of this definition,\r
+      "control" means (i) the power, direct or indirect, to cause the\r
+      direction or management of such entity, whether by contract or\r
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the\r
+      outstanding shares, or (iii) beneficial ownership of such entity.\r
+\r
+      "You" (or "Your") shall mean an individual or Legal Entity\r
+      exercising permissions granted by this License.\r
+\r
+      "Source" form shall mean the preferred form for making modifications,\r
+      including but not limited to software source code, documentation\r
+      source, and configuration files.\r
+\r
+      "Object" form shall mean any form resulting from mechanical\r
+      transformation or translation of a Source form, including but\r
+      not limited to compiled object code, generated documentation,\r
+      and conversions to other media types.\r
+\r
+      "Work" shall mean the work of authorship, whether in Source or\r
+      Object form, made available under the License, as indicated by a\r
+      copyright notice that is included in or attached to the work\r
+      (an example is provided in the Appendix below).\r
+\r
+      "Derivative Works" shall mean any work, whether in Source or Object\r
+      form, that is based on (or derived from) the Work and for which the\r
+      editorial revisions, annotations, elaborations, or other modifications\r
+      represent, as a whole, an original work of authorship. For the purposes\r
+      of this License, Derivative Works shall not include works that remain\r
+      separable from, or merely link (or bind by name) to the interfaces of,\r
+      the Work and Derivative Works thereof.\r
+\r
+      "Contribution" shall mean any work of authorship, including\r
+      the original version of the Work and any modifications or additions\r
+      to that Work or Derivative Works thereof, that is intentionally\r
+      submitted to Licensor for inclusion in the Work by the copyright owner\r
+      or by an individual or Legal Entity authorized to submit on behalf of\r
+      the copyright owner. For the purposes of this definition, "submitted"\r
+      means any form of electronic, verbal, or written communication sent\r
+      to the Licensor or its representatives, including but not limited to\r
+      communication on electronic mailing lists, source code control systems,\r
+      and issue tracking systems that are managed by, or on behalf of, the\r
+      Licensor for the purpose of discussing and improving the Work, but\r
+      excluding communication that is conspicuously marked or otherwise\r
+      designated in writing by the copyright owner as "Not a Contribution."\r
+\r
+      "Contributor" shall mean Licensor and any individual or Legal Entity\r
+      on behalf of whom a Contribution has been received by Licensor and\r
+      subsequently incorporated within the Work.\r
+\r
+   2. Grant of Copyright License. Subject to the terms and conditions of\r
+      this License, each Contributor hereby grants to You a perpetual,\r
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\r
+      copyright license to reproduce, prepare Derivative Works of,\r
+      publicly display, publicly perform, sublicense, and distribute the\r
+      Work and such Derivative Works in Source or Object form.\r
+\r
+   3. Grant of Patent License. Subject to the terms and conditions of\r
+      this License, each Contributor hereby grants to You a perpetual,\r
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\r
+      (except as stated in this section) patent license to make, have made,\r
+      use, offer to sell, sell, import, and otherwise transfer the Work,\r
+      where such license applies only to those patent claims licensable\r
+      by such Contributor that are necessarily infringed by their\r
+      Contribution(s) alone or by combination of their Contribution(s)\r
+      with the Work to which such Contribution(s) was submitted. If You\r
+      institute patent litigation against any entity (including a\r
+      cross-claim or counterclaim in a lawsuit) alleging that the Work\r
+      or a Contribution incorporated within the Work constitutes direct\r
+      or contributory patent infringement, then any patent licenses\r
+      granted to You under this License for that Work shall terminate\r
+      as of the date such litigation is filed.\r
+\r
+   4. Redistribution. You may reproduce and distribute copies of the\r
+      Work or Derivative Works thereof in any medium, with or without\r
+      modifications, and in Source or Object form, provided that You\r
+      meet the following conditions:\r
+\r
+      (a) You must give any other recipients of the Work or\r
+          Derivative Works a copy of this License; and\r
+\r
+      (b) You must cause any modified files to carry prominent notices\r
+          stating that You changed the files; and\r
+\r
+      (c) You must retain, in the Source form of any Derivative Works\r
+          that You distribute, all copyright, patent, trademark, and\r
+          attribution notices from the Source form of the Work,\r
+          excluding those notices that do not pertain to any part of\r
+          the Derivative Works; and\r
+\r
+      (d) If the Work includes a "NOTICE" text file as part of its\r
+          distribution, then any Derivative Works that You distribute must\r
+          include a readable copy of the attribution notices contained\r
+          within such NOTICE file, excluding those notices that do not\r
+          pertain to any part of the Derivative Works, in at least one\r
+          of the following places: within a NOTICE text file distributed\r
+          as part of the Derivative Works; within the Source form or\r
+          documentation, if provided along with the Derivative Works; or,\r
+          within a display generated by the Derivative Works, if and\r
+          wherever such third-party notices normally appear. The contents\r
+          of the NOTICE file are for informational purposes only and\r
+          do not modify the License. You may add Your own attribution\r
+          notices within Derivative Works that You distribute, alongside\r
+          or as an addendum to the NOTICE text from the Work, provided\r
+          that such additional attribution notices cannot be construed\r
+          as modifying the License.\r
+\r
+      You may add Your own copyright statement to Your modifications and\r
+      may provide additional or different license terms and conditions\r
+      for use, reproduction, or distribution of Your modifications, or\r
+      for any such Derivative Works as a whole, provided Your use,\r
+      reproduction, and distribution of the Work otherwise complies with\r
+      the conditions stated in this License.\r
+\r
+   5. Submission of Contributions. Unless You explicitly state otherwise,\r
+      any Contribution intentionally submitted for inclusion in the Work\r
+      by You to the Licensor shall be under the terms and conditions of\r
+      this License, without any additional terms or conditions.\r
+      Notwithstanding the above, nothing herein shall supersede or modify\r
+      the terms of any separate license agreement you may have executed\r
+      with Licensor regarding such Contributions.\r
+\r
+   6. Trademarks. This License does not grant permission to use the trade\r
+      names, trademarks, service marks, or product names of the Licensor,\r
+      except as required for reasonable and customary use in describing the\r
+      origin of the Work and reproducing the content of the NOTICE file.\r
+\r
+   7. Disclaimer of Warranty. Unless required by applicable law or\r
+      agreed to in writing, Licensor provides the Work (and each\r
+      Contributor provides its Contributions) on an "AS IS" BASIS,\r
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
+      implied, including, without limitation, any warranties or conditions\r
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\r
+      PARTICULAR PURPOSE. You are solely responsible for determining the\r
+      appropriateness of using or redistributing the Work and assume any\r
+      risks associated with Your exercise of permissions under this License.\r
+\r
+   8. Limitation of Liability. In no event and under no legal theory,\r
+      whether in tort (including negligence), contract, or otherwise,\r
+      unless required by applicable law (such as deliberate and grossly\r
+      negligent acts) or agreed to in writing, shall any Contributor be\r
+      liable to You for damages, including any direct, indirect, special,\r
+      incidental, or consequential damages of any character arising as a\r
+      result of this License or out of the use or inability to use the\r
+      Work (including but not limited to damages for loss of goodwill,\r
+      work stoppage, computer failure or malfunction, or any and all\r
+      other commercial damages or losses), even if such Contributor\r
+      has been advised of the possibility of such damages.\r
+\r
+   9. Accepting Warranty or Additional Liability. While redistributing\r
+      the Work or Derivative Works thereof, You may choose to offer,\r
+      and charge a fee for, acceptance of support, warranty, indemnity,\r
+      or other liability obligations and/or rights consistent with this\r
+      License. However, in accepting such obligations, You may act only\r
+      on Your own behalf and on Your sole responsibility, not on behalf\r
+      of any other Contributor, and only if You agree to indemnify,\r
+      defend, and hold each Contributor harmless for any liability\r
+      incurred by, or claims asserted against, such Contributor by reason\r
+      of your accepting any such warranty or additional liability.\r
+\r
+   END OF TERMS AND CONDITIONS\r
+\r
+   APPENDIX: How to apply the Apache License to your work.\r
+\r
+      To apply the Apache License to your work, attach the following\r
+      boilerplate notice, with the fields enclosed by brackets "[]"\r
+      replaced with your own identifying information. (Don't include\r
+      the brackets!)  The text should be enclosed in the appropriate\r
+      comment syntax for the file format. We also recommend that a\r
+      file or class name and description of purpose be included on the\r
+      same "printed page" as the copyright notice for easier\r
+      identification within third-party archives.\r
+\r
+   Copyright [yyyy] [name of copyright owner]\r
+\r
+   Licensed under the Apache License, Version 2.0 (the "License");\r
+   you may not use this file except in compliance with the License.\r
+   You may obtain a copy of the License at\r
+\r
+       http://www.apache.org/licenses/LICENSE-2.0\r
+\r
+   Unless required by applicable law or agreed to in writing, software\r
+   distributed under the License is distributed on an "AS IS" BASIS,\r
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+   See the License for the specific language governing permissions and\r
+   limitations under the License.\r
diff --git a/README.txt b/README.txt
new file mode 100644 (file)
index 0000000..02f24a1
--- /dev/null
@@ -0,0 +1,24 @@
+This project is a rewrite of Jasper for tomcat 4.x.\r
+\r
+1. Main goals:\r
+\r
+   * Cleanup of the current Jasper.\r
+   * Use for RI work for JSP 1.3\r
+   * Use for optimization work for generated servlet codes.\r
+\r
+2. Status\r
+\r
+   * Main jasper engine (parser, attribute validates, code generator)\r
+     basically complete.\r
+\r
+3. Todo\r
+\r
+   * Rewrite attribute parser for better spec comformance.\r
+   * More cleanup, especially jspc parts.\r
+   * Added large file option.\r
+   * Error messages.\r
+   * JSR045 support\r
+   * Expression language support (JSP1.3)\r
+   * Optimizations, optimizations, and optimizations\r
+\r
+\r
diff --git a/build.properties.default b/build.properties.default
new file mode 100644 (file)
index 0000000..f049251
--- /dev/null
@@ -0,0 +1,49 @@
+# -----------------------------------------------------------------------------\r
+# build.properties.sample\r
+#\r
+# This is an example "build.properties" file, used to customize building \r
+# Jasper2 for your local environment.  It defines the location of all external\r
+# modules that Jasper2 depends on.  Copy this file to "build.properties"\r
+# in the top-level source directory, and customize it as needed.\r
+#\r
+# $Id: build.properties.sample 379500 2006-02-21 15:50:10Z remm $\r
+# -----------------------------------------------------------------------------\r
+\r
+# ----- Default Base Path for Dependent Packages -----\r
+# Please note this path must be absolute, not relative,\r
+# as it is referenced with different working directory\r
+# contexts by the various build scripts.\r
+base.path=/usr/share/java\r
+#base.path=C:/path/to/the/repository\r
+#base.path=/usr/local\r
+\r
+compile.source=1.5\r
+\r
+# ----- Servlet API v2.4 -----\r
+servlet-api.home=${base.path}/servlet-api-2.4\r
+servlet-api.lib=${servlet-api.home}/lib\r
+servlet-api.jar=${servlet-api.lib}/servlet-api.jar\r
+\r
+# ----- Commons Logging, version 1.0.1 or later -----\r
+commons-logging.home=${base.path}/commons-logging-1.0.4\r
+commons-logging.lib=${commons-logging.home}\r
+commons-logging-api.jar=${commons-logging.lib}/commons-logging-api.jar\r
+commons-logging.jar=${commons-logging.lib}/commons-logging.jar\r
+commons-logging.loc=${base-jakarta.loc}/commons/logging/binaries/commons-logging-1.0.4.tar.gz\r
+\r
+# ----- Commons Modeler, version 1.1 or later -----\r
+commons-modeler.home=${base.path}/commons-modeler-1.1\r
+commons-modeler.lib=${commons-modeler.home}\r
+commons-modeler.jar=${commons-modeler.lib}/commons-modeler.jar\r
+commons-modeler.loc=${base-jakarta.loc}/commons/modeler/binaries/modeler-1.1.tar.gz\r
+\r
+# ----- Eclipse JDT, version 3.1.2 or later -----\r
+jdt.home=${base.path}/eclipse/plugins\r
+jdt.lib=${jdt.home}\r
+jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.1.2.jar\r
+jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.1.2-200601181600/eclipse-JDT-3.1.2.zip\r
+\r
+# ----- Tomcat native library -----\r
+tomcat-native.home=${base.path}/tomcat-native-1.1.2\r
+tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz\r
+tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-1.1.2.tar.gz\r
index 3d5ad2c..b7f6438 100644 (file)
--- a/build.xml
+++ b/build.xml
   <!-- Can't be lower - jsp uses templates -->\r
   <property name="compile.source" value="1.5"/>\r
   \r
-  <!-- Defaults, if build.properties is missing. It is sometimes easier to \r
-       just have one build file, and use properties to just override settings -->\r
-  <property name="TOMCAT_LIBS_BASE" location="../repository"/>\r
-  \r
-  <property name="ant.jar" location="${TOMCAT_LIBS_BASE}/apache-ant-1.6.5/lib/ant.jar"/>\r
-  <property name="jdt.jar" location="${TOMCAT_LIBS_BASE}/eclipse/plugins/org.eclipse.jdt.core_3.1.1.jar"/>\r
-  <property name="commons-logging.jar" location="${TOMCAT_LIBS_BASE}/commons-logging-1.0.4/commons-logging.jar"/>\r
-  <property name="commons-modeler.jar" location="${TOMCAT_LIBS_BASE}/commons-modeler-1.1/commons-modeler.jar"/>\r
-      \r
-  \r
   <!-- JAR artifacts -->\r
-  <property name="servlet-api.jar" value="${tomcat.build}/common/lib/servlet-api.jar"/>\r
-  <property name="jsp-api.jar" value="${tomcat.build}/common/lib/jsp-api.jar"/>\r
-  <property name="el-api.jar" value="${tomcat.build}/common/lib/el-api.jar"/>\r
-  <property name="jasper-compiler.jar" value="${tomcat.build}/common/lib/jasper-compiler.jar"/>\r
-  <property name="jasper-runtime.jar" value="${tomcat.build}/common/lib/jasper-runtime.jar"/>\r
-  <property name="jasper-el.jar" value="${tomcat.build}/common/lib/jasper-el.jar"/>\r
+  <property name="servlet-api.jar" value="${tomcat.build}/lib/servlet-api.jar"/>\r
+  <property name="jsp-api.jar" value="${tomcat.build}/lib/jsp-api.jar"/>\r
+  <property name="el-api.jar" value="${tomcat.build}/lib/el-api.jar"/>\r
+  <property name="bootstrap.jar" value="${tomcat.build}/bin/bootstrap.jar"/>\r
+  <property name="catalina.jar" value="${tomcat.build}/lib/catalina.jar"/>\r
+  <property name="catalina-optional.jar" value="${tomcat.build}/lib/catalina-optional.jar"/>\r
+  <property name="catalina-ant.jar" value="${tomcat.build}/lib/catalina-ant.jar"/>\r
+  <property name="catalina-ant-jmx.jar" value="${tomcat.build}/lib/catalina-ant-jmx.jar"/>\r
+  <property name="naming-factory.jar" value="${tomcat.build}/lib/naming-factory.jar"/>\r
+  <property name="naming-resources.jar" value="${tomcat.build}/lib/naming-resources.jar"/>\r
+  <property name="servlets-cgi.jar" value="${tomcat.build}/lib/servlets-cgi.renametojar"/>\r
+  <property name="servlets-default.jar" value="${tomcat.build}/lib/servlets-default.jar"/>\r
+  <property name="servlets-invoker.jar" value="${tomcat.build}/lib/servlets-invoker.jar"/>\r
+  <property name="servlets-ssi.jar" value="${tomcat.build}/lib/servlets-ssi.renametojar"/>\r
+  <property name="servlets-webdav.jar" value="${tomcat.build}/lib/servlets-webdav.jar"/>\r
+  <property name="tomcat-util.jar" value="${tomcat.build}/lib/tomcat-util.jar"/>\r
+  <property name="tomcat-coyote.jar" value="${tomcat.build}/lib/tomcat-coyote.jar"/>\r
+  <property name="tomcat-apr.jar" value="${tomcat.build}/lib/tomcat-apr.jar"/>\r
+  <property name="tomcat-ajp.jar" value="${tomcat.build}/lib/tomcat-ajp.jar"/>\r
+  <property name="tomcat-http.jar" value="${tomcat.build}/lib/tomcat-http.jar"/>\r
+\r
+  <property name="jasper-compiler.jar" value="${tomcat.build}/lib/jasper-compiler.jar"/>\r
+  <property name="jasper-runtime.jar" value="${tomcat.build}/lib/jasper-runtime.jar"/>\r
+  <property name="jasper-el.jar" value="${tomcat.build}/lib/jasper-el.jar"/>\r
   \r
   <!-- Classpath -->\r
   <path id="tomcat.classpath">\r
     </copy>\r
 \r
   </target>\r
-    \r
+\r
   <target name="build-only" depends="build-prepare,compile,package" />\r
-  \r
+\r
   <target name="package" >  \r
+\r
     <!-- Servlet 2.5 Implementation JAR File -->\r
-    <jar  jarfile="${servlet-api.jar}">\r
+    <jar  jarfile="${servlet-api.jar}" index="true">\r
       <fileset dir="${tomcat.classes}">\r
         <include name="javax/servlet/*" />\r
         <include name="javax/servlet/http/*" />\r
     </jar>\r
 \r
     <!-- JSP 2.1 Implementation JAR File -->\r
-    <jar  jarfile="${jsp-api.jar}">\r
+    <jar  jarfile="${jsp-api.jar}" index="true">\r
       <fileset dir="${tomcat.classes}">\r
         <include name="javax/servlet/jsp/**" />\r
         <!-- Javadoc and i18n exclusions -->\r
     </jar>\r
 \r
     <!-- JSP 2.1 EL Implementation JAR File -->\r
-    <jar  jarfile="${el-api.jar}">\r
+    <jar  jarfile="${el-api.jar}" index="true">\r
       <fileset dir="${tomcat.classes}">\r
         <include name="javax/el/**" />\r
         <!-- Javadoc and i18n exclusions -->\r
       </fileset>\r
     </jar>\r
 \r
+    <!-- Catalina Bootstrap JAR File -->\r
+    <jar jarfile="${bootstrap.jar}" index="true"\r
+         manifest="res/bootstrap.jar.manifest">\r
+      <fileset dir="${tomcat.classes}">\r
+        <include name="org/apache/catalina/startup/Bootstrap.class" />\r
+        <include name="org/apache/catalina/startup/catalina.properties" />\r
+        <include name="org/apache/catalina/startup/CatalinaProperties.class" />\r
+        <include name="org/apache/catalina/startup/ClassLoaderFactory.class" />\r
+        <include name="org/apache/catalina/startup/Tool.class" />\r
+        <include name="org/apache/catalina/loader/StandardClassLoader*.class" />\r
+        <include name="org/apache/catalina/loader/Extension.class" />\r
+        <include name="org/apache/catalina/loader/Reloader.class" />\r
+        <include name="org/apache/catalina/security/SecurityClassLoad.class" />\r
+        <include name="org/apache/catalina/launcher/CatalinaLaunchFilter.class" />\r
+        <include name="org/apache/naming/JndiPermission.class" />\r
+        <include name="org/apache/tomcat/util/compat/*" />\r
+       <!-- Javadoc and i18n exclusions -->\r
+        <exclude name="**/package.html" />\r
+        <exclude name="**/LocalStrings_*" />\r
+      </fileset>\r
+    </jar>\r
+\r
+    <!-- Catalina Main JAR File -->\r
+    <jar jarfile="${catalina.jar}" index="true">\r
+      <fileset dir="${tomcat.classes}">\r
+        <include name="org/apache/catalina/**" />\r
+        <!-- Javadoc and i18n exclusions -->\r
+        <exclude name="**/package.html" />\r
+        <exclude name="**/LocalStrings_*" />\r
+        <!-- Modules -->\r
+        <exclude name="org/apache/catalina/ant/**" />\r
+        <exclude name="org/apache/catalina/cluster/**" />\r
+        <exclude name="org/apache/catalina/launcher/**" />\r
+        <exclude name="org/apache/catalina/servlets/**" />\r
+        <exclude name="org/apache/catalina/startup/Bootstrap.class" />\r
+        <exclude name="org/apache/catalina/storeconfig/**" />\r
+        <exclude name="org/apache/catalina/ssi/**" />\r
+        <exclude name="org/apache/naming/**" />\r
+        <!-- Catalina-optional classes -->\r
+        <exclude name="org/apache/catalina/realm/DataSourceRealm.class" />\r
+        <exclude name="org/apache/catalina/realm/JAAS*" />\r
+        <exclude name="org/apache/catalina/realm/JDBC*" />\r
+        <exclude name="org/apache/catalina/realm/JNDI*" />\r
+        <exclude name="org/apache/catalina/realm/Memory*" />\r
+        <exclude name="org/apache/catalina/session/StoreBase.class" />\r
+        <exclude name="org/apache/catalina/session/*Store.class" />\r
+        <exclude name="org/apache/catalina/session/PersistentManager*" />\r
+        <exclude name="org/apache/catalina/util/CGIProcessEnvironment.class" />\r
+        <exclude name="org/apache/catalina/util/CookieTools.class" />\r
+        <exclude name="org/apache/catalina/util/DateTool.class" />\r
+        <exclude name="org/apache/catalina/util/DOMWriter.class" />\r
+        <exclude name="org/apache/catalina/util/FastDateFormat.class" />\r
+        <exclude name="org/apache/catalina/util/IOTools.class" />\r
+        <exclude name="org/apache/catalina/util/MIME2Java.class" />\r
+        <exclude name="org/apache/catalina/util/Process*" />\r
+        <exclude name="org/apache/catalina/util/Queue.class" />\r
+        <exclude name="org/apache/catalina/util/Strftime.class" />\r
+        <exclude name="org/apache/catalina/util/XMLWriter.class" />\r
+        <exclude name="org/apache/catalina/valves/ExtendedAccessLogValve.class" />\r
+        <exclude name="org/apache/catalina/valves/FastCommonAccessLogValve.class" />\r
+        <exclude name="org/apache/catalina/valves/FieldInfo.class" />\r
+        <exclude name="org/apache/catalina/valves/JDBCAccessLogValve.class" />\r
+        <exclude name="org/apache/catalina/valves/PersistentValve.class" />\r
+        <exclude name="org/apache/catalina/valves/Remote*" />\r
+        <exclude name="org/apache/catalina/valves/RequestDumperValve.class" />\r
+        <exclude name="org/apache/catalina/valves/RequestFilterValve.class" />\r
+        <exclude name="org/apache/catalina/valves/SemaphoreValve.class" />\r
+      </fileset>\r
+    </jar>\r
+\r
+    <!-- Catalina Optional JAR File -->\r
+    <jar jarfile="${catalina-optional.jar}" index="true">\r
+      <fileset dir="${tomcat.classes}">\r
+        <include name="org/apache/catalina/realm/DataSourceRealm.class" />\r
+        <include name="org/apache/catalina/realm/JAAS*" />\r
+        <include name="org/apache/catalina/realm/JDBC*" />\r
+        <include name="org/apache/catalina/realm/JNDI*" />\r
+        <include name="org/apache/catalina/realm/Memory*" />\r
+        <include name="org/apache/catalina/session/StoreBase.class" />\r
+        <include name="org/apache/catalina/session/*Store.class" />\r
+        <include name="org/apache/catalina/session/PersistentManager*" />\r
+        <include name="org/apache/catalina/util/CGIProcessEnvironment.class" />\r
+        <include name="org/apache/catalina/util/CookieTools.class" />\r
+        <include name="org/apache/catalina/util/DateTool.class" />\r
+        <include name="org/apache/catalina/util/DOMWriter.class" />\r
+        <include name="org/apache/catalina/util/FastDateFormat.class" />\r
+        <include name="org/apache/catalina/util/IOTools.class" />\r
+        <include name="org/apache/catalina/util/MIME2Java.class" />\r
+        <include name="org/apache/catalina/util/Process*" />\r
+        <include name="org/apache/catalina/util/Queue.class" />\r
+        <include name="org/apache/catalina/util/Strftime.class" />\r
+        <include name="org/apache/catalina/util/XMLWriter.class" />\r
+        <include name="org/apache/catalina/valves/ExtendedAccessLogValve.class" />\r
+        <include name="org/apache/catalina/valves/FastCommonAccessLogValve.class" />\r
+        <include name="org/apache/catalina/valves/FieldInfo.class" />\r
+        <include name="org/apache/catalina/valves/JDBCAccessLogValve.class" />\r
+        <include name="org/apache/catalina/valves/PersistentValve.class" />\r
+        <include name="org/apache/catalina/valves/Remote*" />\r
+        <include name="org/apache/catalina/valves/RequestDumperValve.class" />\r
+        <include name="org/apache/catalina/valves/RequestFilterValve.class" />\r
+        <include name="org/apache/catalina/valves/SemaphoreValve.class" />\r
+        <!-- Javadoc and i18n exclusions -->\r
+        <exclude name="**/package.html" />\r
+        <exclude name="**/LocalStrings_*" />\r
+      </fileset>\r
+    </jar>\r
+\r
+    <!-- Catalina Ant Tasks JAR File -->\r
+    <jar jarfile="${catalina-ant.jar}" index="true">\r
+      <fileset dir="${tomcat.classes}">\r
+       <include name="org/apache/catalina/ant/*" />\r
+        <include name="org/apache/catalina/util/Base64.class" />\r
+       <!-- Javadoc and i18n exclusions -->\r
+        <exclude name="**/package.html" />\r
+        <exclude name="**/LocalStrings_*" />\r
+      </fileset>\r
+    </jar>\r
+\r
+       <!-- Catalina JMX Accessor Ant Tasks JAR File -->\r
+    <jar jarfile="${catalina-ant-jmx.jar}" index="true">\r
+      <fileset dir="${tomcat.classes}">\r
+       <include name="org/apache/catalina/ant/jmx/*" />\r
+       <!-- Javadoc and i18n exclusions -->\r
+        <exclude name="**/package.html" />\r
+        <exclude name="**/LocalStrings_*" />\r
+      </fileset>\r
+    </jar>\r
+\r
+       <!-- Naming - Factory JAR File -->\r
+    <jar jarfile="${naming-factory.jar}" index="true">\r
+      <fileset dir="${tomcat.classes}">\r
+        <include name="org/apache/naming/**" />\r
+        <exclude name="org/apache/naming/resources/**" />\r
+        <exclude name="org/apache/naming/JndiPermission.class" />\r
+       <exclude name="org/apache/naming/NameParserImpl.class" />\r
+       <exclude name="org/apache/naming/NamingContextBindingsEnumeration.class" />\r
+       <exclude name="org/apache/naming/NamingContextEnumeration.class" />\r
+       <exclude name="org/apache/naming/NamingEntry.class" />\r
+       <exclude name="org/apache/naming/StringManager.class" />\r
+        <!-- Javadoc and i18n exclusions -->\r
+        <exclude name="**/package.html" />\r
+        <exclude name="**/LocalStrings_*" />\r
+      </fileset>\r
+    </jar>\r
+\r
+    <!-- Naming - Resources JAR File -->\r
+    <jar jarfile="${naming-resources.jar}" index="true">\r
+      <fileset dir="${tomcat.classes}">\r
+        <include name="org/apache/naming/JndiPermission.class" />\r
+       <include name="org/apache/naming/NameParserImpl.class" />\r
+       <include name="org/apache/naming/NamingContextBindingsEnumeration.class" />\r
+       <include name="org/apache/naming/NamingContextEnumeration.class" />\r
+       <include name="org/apache/naming/NamingEntry.class" />\r
+       <include name="org/apache/naming/StringManager.class" />\r
+        <include name="org/apache/naming/resources/**" />\r
+        <!-- Javadoc and i18n exclusions -->\r
+        <exclude name="**/package.html" />\r
+        <exclude name="**/LocalStrings_*" />\r
+      </fileset>\r
+    </jar>\r
+\r
+    <!-- Servlets - CGI Servlet -->\r
+    <jar jarfile="${servlets-cgi.jar}" index="true">\r
+      <fileset dir="${tomcat.classes}">\r
+        <include name="org/apache/catalina/servlets/CGI*" />\r
+        <!-- Javadoc and i18n exclusions -->\r
+        <exclude name="**/package.html" />\r
+        <exclude name="**/LocalStrings_*" />\r
+      </fileset>\r
+    </jar>\r
+\r
+    <!-- Servlets - Default File-Serving Servlet -->\r
+    <jar jarfile="${servlets-default.jar}" index="true">\r
+      <fileset dir="${tomcat.classes}">\r
+        <include name="org/apache/catalina/servlets/Default*" />\r
+        <include name="org/apache/catalina/servlets/Constants.class" />\r
+        <include name="org/apache/catalina/servlets/LocalStrings.properties" />\r
+        <!-- Javadoc and i18n exclusions -->\r
+        <exclude name="**/package.html" />\r
+        <exclude name="**/LocalStrings_*" />\r
+      </fileset>\r
+    </jar>\r
+\r
+    <!-- Servlets - Invoker Servlet -->\r
+    <jar jarfile="${servlets-invoker.jar}" index="true">\r
+      <fileset dir="${tomcat.classes}">\r
+        <include name="org/apache/catalina/servlets/Invoker*" />\r
+        <!-- Javadoc and i18n exclusions -->\r
+        <exclude name="**/package.html" />\r
+        <exclude name="**/LocalStrings_*" />\r
+      </fileset>\r
+    </jar>\r
+\r
+    <!-- Servlets - SSI Servlet -->\r
+    <jar jarfile="${servlets-ssi.jar}" index="true">\r
+      <fileset dir="${tomcat.classes}">\r
+        <include name="org/apache/catalina/ssi/**" />\r
+        <!-- Javadoc and i18n exclusions -->\r
+        <exclude name="**/package.html" />\r
+        <exclude name="**/LocalStrings_*" />\r
+      </fileset>\r
+    </jar>\r
+\r
+    <!-- Servlets - Webdav Servlet -->\r
+    <jar jarfile="${servlets-webdav.jar}" index="true">\r
+      <fileset dir="${tomcat.classes}">\r
+        <include name="org/apache/catalina/servlets/Webdav*" />\r
+        <!-- Javadoc and i18n exclusions -->\r
+        <exclude name="**/package.html" />\r
+        <exclude name="**/LocalStrings_*" />\r
+      </fileset>\r
+    </jar>\r
+\r
+    <!-- Protocol handlers - Coyote -->\r
+    <jar jarfile="${tomcat-coyote.jar}" index="true">\r
+      <fileset dir="${tomcat.classes}">\r
+        <include name="org/apache/coyote/*" />\r
+        <include name="org/apache/coyote/memory/*" />\r
+        <!-- Javadoc and i18n exclusions -->\r
+        <exclude name="**/package.html" />\r
+        <exclude name="**/LocalStrings_*" />\r
+      </fileset>\r
+    </jar>\r
+\r
+    <!-- Protocol handlers - APR -->\r
+    <jar jarfile="${tomcat-apr.jar}" index="true">\r
+      <fileset dir="${tomcat.classes}">\r
+        <include name="org/apache/tomcat/jni/**" />\r
+        <!-- Javadoc and i18n exclusions -->\r
+        <exclude name="**/package.html" />\r
+        <exclude name="**/LocalStrings_*" />\r
+      </fileset>\r
+    </jar>\r
+\r
+    <!-- Protocol handlers - HTTP -->\r
+    <jar jarfile="${tomcat-http.jar}" index="true">\r
+      <fileset dir="${tomcat.classes}">\r
+        <include name="org/apache/coyote/http11/**" />\r
+        <!-- Javadoc and i18n exclusions -->\r
+        <exclude name="**/package.html" />\r
+        <exclude name="**/LocalStrings_*" />\r
+      </fileset>\r
+    </jar>\r
+\r
+    <!-- Protocol handlers - AJP -->\r
+    <jar jarfile="${tomcat-ajp.jar}" index="true">\r
+      <fileset dir="${tomcat.classes}">\r
+        <include name="org/apache/coyote/ajp/**" />\r
+        <include name="org/apache/jk/**" />\r
+        <exclude name="org/apache/jk/ant/**" />\r
+        <!-- Javadoc and i18n exclusions -->\r
+        <exclude name="**/package.html" />\r
+        <exclude name="**/LocalStrings_*" />\r
+      </fileset>\r
+    </jar>\r
+\r
+    <!-- Util JAR File -->\r
+    <jar jarfile="${tomcat-util.jar}" index="true">\r
+      <fileset dir="${tomcat.classes}">\r
+        <include name="org/apache/tomcat/util/**" />\r
+        <!-- Javadoc and i18n exclusions -->\r
+        <exclude name="**/package.html" />\r
+        <exclude name="**/LocalStrings_*" />\r
+      </fileset>\r
+    </jar>\r
+\r
     <!-- Jasper Compiler JAR File -->\r
-    <jar  jarfile="${jasper-compiler.jar}">\r
+    <jar  jarfile="${jasper-compiler.jar}" index="true">\r
        <fileset dir="${tomcat.classes}">\r
          <include name="org/apache/jasper/compiler/**" />\r
          <include name="org/apache/jasper/xmlparser/**" />\r
      </jar>\r
 \r
      <!-- Jasper Runtime JAR File -->\r
-     <jar  jarfile="${jasper-runtime.jar}">\r
+     <jar  jarfile="${jasper-runtime.jar}" index="true">\r
        <fileset dir="${tomcat.classes}">\r
          <include name="org/apache/jasper/Constants.class" />\r
          <include name="org/apache/jasper/JasperException.class" />\r
      </jar>\r
 \r
      <!-- Jasper EL Implementation JAR File -->\r
-     <jar  jarfile="${jasper-el.jar}">\r
+     <jar  jarfile="${jasper-el.jar}" index="true">\r
        <fileset dir="${tomcat.classes}">\r
          <include name="org/apache/el/**" />\r
          <!-- Javadoc and i18n exclusions -->\r
   <target name="deploy" depends="build-only">\r
   </target>\r
 \r
+  <target name="clean">\r
+    <delete dir="${tomcat.classes}" />\r
+    <delete dir="${tomcat.build}" />\r
+  </target>\r
+  \r
 </project>\r
diff --git a/res/bootstrap.jar.manifest b/res/bootstrap.jar.manifest
new file mode 100644 (file)
index 0000000..df6917f
--- /dev/null
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0\r
+Main-Class: org.apache.catalina.startup.Bootstrap\r
+Class-Path: jmx.jar commons-daemon.jar commons-logging-api.jar tomcat-juli.jar\r
+Specification-Title: Catalina\r
+Specification-Version: 1.0
\ No newline at end of file