- Fixes according to the directory structure.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@389806 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index b7f6438..093c482 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -38,9 +38,7 @@
   <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
@@ -142,30 +140,8 @@
       </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
+    <jar jarfile="${catalina.jar}" index="true" manifest="res/bootstrap.jar.manifest">\r
       <fileset dir="${tomcat.classes}">\r
         <include name="org/apache/catalina/**" />\r
         <!-- Javadoc and i18n exclusions -->\r
@@ -176,76 +152,8 @@
         <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
@@ -454,6 +362,17 @@
   </target>\r
 \r
   <target name="deploy" depends="build-only">\r
+\r
+    <copy file="${commons-logging-api.jar}" todir="${tomcat.build}/lib" />\r
+\r
+    <!-- Copy static resource files -->\r
+    <copy todir="${tomcat.build}/conf">\r
+      <fileset dir="conf">\r
+        <include name="*.xml"/>\r
+        <include name="*.properties"/>\r
+      </fileset>\r
+    </copy>\r
+\r
   </target>\r
 \r
   <target name="clean">\r

diff --git a/java/org/apache/catalina/startup/catalina.properties b/java/org/apache/catalina/startup/catalina.properties
index 94e65b6..1d8ea08 100644 (file)
--- a/java/org/apache/catalina/startup/catalina.properties
+++ b/java/org/apache/catalina/startup/catalina.properties
@@ -29,7 +29,7 @@ package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache
 #     "foo/*.jar": Add all the JARs of the specified folder as class \r
 #                  repositories\r
 #     "foo/bar.jar": Add bar.jar as a class repository\r
-common.loader=${catalina.home}/common/classes,${catalina.home}/common/i18n/*.jar,${catalina.home}/common/endorsed/*.jar,${catalina.home}/common/lib/*.jar\r
+common.loader=${catalina.home}/lib,${catalina.home}/lib/*.jar\r
 \r
 #\r
 # List of comma-separated paths defining the contents of the "server" \r
@@ -42,7 +42,7 @@ common.loader=${catalina.home}/common/classes,${catalina.home}/common/i18n/*.jar
 #     "foo/*.jar": Add all the JARs of the specified folder as class \r
 #                  repositories\r
 #     "foo/bar.jar": Add bar.jar as a class repository\r
-server.loader=${catalina.home}/server/classes,${catalina.home}/server/lib/*.jar\r
+server.loader=\r
 \r
 #\r
 # List of comma-separated paths defining the contents of the "shared" \r
@@ -56,7 +56,7 @@ server.loader=${catalina.home}/server/classes,${catalina.home}/server/lib/*.jar
 #     "foo/bar.jar": Add bar.jar as a class repository \r
 # Please note that for single jars, e.g. bar.jar, you need the URL form\r
 # starting with file:.\r
-shared.loader=${catalina.base}/shared/classes,${catalina.base}/shared/lib/*.jar\r
+shared.loader=\r
 \r
 #\r
 # String cache configuration.\r

diff --git a/res/bootstrap.jar.manifest b/res/bootstrap.jar.manifest
index df6917f..045e7a7 100644 (file)
--- a/res/bootstrap.jar.manifest
+++ b/res/bootstrap.jar.manifest
@@ -1,5 +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
+Class-Path: commons-daemon.jar commons-logging-api.jar tomcat-juli.jar tomcat-util.jar\r
 Specification-Title: Catalina\r
-Specification-Version: 1.0
\ No newline at end of file
+Specification-Version: 6.0
\ No newline at end of file