- Update packaging a bit.

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

diff --git a/.classpath b/.classpath
index d8000cb..25e23e5 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -2,7 +2,6 @@
 <classpath>\r
        <classpathentry excluding="**/.svn/**|org/apache/tomcat/util/net/puretls/" kind="src" path="java"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
-       <classpathentry kind="var" path="TOMCAT_LIBS_BASE/commons-logging-1.0.4/commons-logging.jar"/>\r
        <classpathentry kind="var" path="TOMCAT_LIBS_BASE/apache-ant-1.6.5/lib/ant.jar"/>\r
        <classpathentry kind="var" path="TOMCAT_LIBS_BASE/eclipse/plugins/org.eclipse.jdt.core_3.1.2.jar"/>\r
        <classpathentry kind="output" path=".settings/output"/>\r

diff --git a/build.xml b/build.xml
index 1333135..682d2da 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -36,6 +36,7 @@
 
   <!-- JAR artifacts -->
   <property name="bootstrap.jar" value="${tomcat.build}/bin/bootstrap.jar"/>
+  <property name="tomcat-juli.jar" value="${tomcat.build}/bin/tomcat-juli.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"/>
@@ -60,7 +61,6 @@
   <path id="tomcat.classpath">
     <pathelement location="${ant.jar}"/>
     <pathelement location="${jdt.jar}"/>
-    <pathelement location="${commons-logging.jar}"/>
   </path>
 
   <!-- Just build Tomcat -->
@@ -167,7 +167,6 @@
         <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/juli/**" />
         <include name="org/apache/naming/JndiPermission.class" />
         <include name="org/apache/tomcat/util/compat/*" />
         <!-- Javadoc and i18n exclusions -->
@@ -176,6 +175,16 @@
       </fileset>
     </jar>
 
+    <!-- Tomcat-juli JAR File -->
+    <jar jarfile="${tomcat-juli.jar}">
+      <fileset dir="${tomcat.classes}">
+        <include name="org/apache/juli/**" />
+        <!-- Javadoc and i18n exclusions -->
+        <exclude name="**/package.html" />
+        <exclude name="**/LocalStrings_*" />
+      </fileset>
+    </jar>
+
     <!-- Catalina Main JAR File -->
     <jar jarfile="${catalina.jar}">
       <fileset dir="${tomcat.classes}">
@@ -427,8 +436,6 @@
 
   <target name="deploy" depends="build-only,build-docs">
 
-    <copy file="${commons-logging-api.jar}" todir="${tomcat.build}/bin" />
-
     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
             file="${tomcat-native.tar.gz}" />
 
@@ -517,11 +524,6 @@
   <target name="download"
           description="Builds and download dependent components">
 
-    <antcall target="downloadgz">
-      <param name="sourcefile" value="${commons-logging.loc}"/>
-      <param name="destfile" value="${commons-logging.jar}"/>
-    </antcall>
-
     <antcall target="downloadfile">
       <param name="sourcefile" value="${tomcat-native.loc}"/>
       <param name="destfile" value="${tomcat-native.tar.gz}"/>

diff --git a/dist.xml b/dist.xml
index a2a9d77..c1965c0 100644 (file)
--- a/dist.xml
+++ b/dist.xml
@@ -254,54 +254,6 @@
 
   </target>
 
-  <!-- ====================== Deployer target =================== -->
-
-  <target name="deployer" description="Create the Tomcat deployer binary" >
-
-    <!-- Servlet and JSP -->
-    <copy todir="${tomcat.deployer}/lib">
-      <fileset dir="${tomcat.build}/lib">
-        <include name="el-api.jar"/>
-        <include name="jasper-el.jar"/>
-        <include name="jsp-api.jar"/>
-        <include name="jasper.jar"/>
-        <include name="servlet-api.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Digester and dependencies -->
-    <copy todir="${tomcat.deployer}/lib"
-           file="${tomcat.build}/lib/catalina-ant.jar"/>
-    <copy todir="${tomcat.deployer}/lib" file="${commons-logging-api.jar}"/>
-    <jar jarfile="${tomcat.deployer}/lib/catalina-deployer.jar">
-       <fileset dir="${tomcat.build}/classes">
-          <include name="org/apache/catalina/startup/DigesterFactory.class" />
-          <include name="org/apache/catalina/util/SchemaResolver.class" />
-          <include name="org/apache/catalina/util/StringManager.class" />
-          <include name="org/apache/tomcat/util/*" />
-          <include name="org/apache/tomcat/util/digester/*" />
-          <exclude name="**/package.html" />
-          <exclude name="**/LocalStrings_*" />
-       </fileset>
-    </jar>
-
-    <!-- Main build script -->
-    <copy todir="${tomcat.deployer}">
-      <fileset dir="${basedir}/res/deployer" />
-    </copy>
-
-    <!-- Copy deployer documentation -->
-    <copy todir="${tomcat.deployer}">
-      <fileset dir="${tomcat.build}/webapps/docs">
-        <include name="images/jakarta-logo.gif" />
-        <include name="images/tomcat.gif" />
-      </fileset>
-    </copy>
-    <copy tofile="${tomcat.deployer}/docs/manual.html"
-      file="${tomcat.build}/webapps/docs/printer/deployer-howto.html" />
-
-  </target>
-
   <!-- ====================== COMBO: Clean All Directories ================ -->
   <target name="clean"
    description="Clean all components">
@@ -402,18 +354,19 @@
     <!-- Servlet and JSP -->
     <copy todir="${tomcat.deployer}/lib">
       <fileset dir="${tomcat.build}/lib">
+        <include name="catalina-ant.jar"/>
         <include name="el-api.jar"/>
         <include name="jsp-api.jar"/>
         <include name="jasper.jar"/>
         <include name="jasper-el.jar"/>
         <include name="servlet-api.jar"/>
       </fileset>
+      <fileset dir="${tomcat.build}/bin">
+        <include name="tomcat-juli.jar"/>
+      </fileset>
     </copy>
 
     <!-- Digester and dependencies -->
-    <copy todir="${tomcat.deployer}/lib"
-           file="${tomcat.build}/lib/catalina-ant.jar"/>
-    <copy todir="${tomcat.deployer}/lib" file="${commons-logging.jar}"/>
     <jar jarfile="${tomcat.deployer}/lib/catalina-deployer.jar">
        <fileset dir="${tomcat.classes}">
           <include name="org/apache/catalina/startup/DigesterFactory.class" />

diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index fe9513c..bde76cb 100644 (file)
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -128,7 +128,7 @@ Section "Core" SecTomcatCore
   File /nonfatal /r temp\r
   SetOutPath $INSTDIR\bin\r
   File bin\bootstrap.jar\r
-  File bin\commons-logging-api.jar\r
+  File bin\tomcat-juli.jar\r
   File bin\*.exe\r
   SetOutPath $INSTDIR\conf\r
   File conf\*.*\r