Author: remm
Date: Sun Oct 8 08:55:22 2006
New Revision: 454166
URL: http://svn.apache.org/viewvc?view=rev&rev=454166
Log:
- Update packaging a bit.
Modified:
tomcat/tc6.0.x/trunk/.classpath
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/res/tomcat.nsi
Modified: tomcat/tc6.0.x/trunk/.classpath
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/.classpath?view=diff&rev=454166&r1=454165&r2=454166
==============================================================================
--- tomcat/tc6.0.x/trunk/.classpath (original)
+++ tomcat/tc6.0.x/trunk/.classpath Sun Oct 8 08:55:22 2006
@@ -2,7 +2,6 @@
<classpath>
<classpathentry
excluding="**/.svn/**|org/apache/tomcat/util/net/puretls/" kind="src"
path="java"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var"
path="TOMCAT_LIBS_BASE/commons-logging-1.0.4/commons-logging.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/apache-ant-1.6.5/lib/ant.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/eclipse/plugins/org.eclipse.jdt.core_3.1.2.jar"/>
<classpathentry kind="output" path=".settings/output"/>
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?view=diff&rev=454166&r1=454165&r2=454166
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Sun Oct 8 08:55:22 2006
@@ -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}" />
@@ -516,11 +523,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}"/>
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?view=diff&rev=454166&r1=454165&r2=454166
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Sun Oct 8 08:55:22 2006
@@ -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" />
Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?view=diff&rev=454166&r1=454165&r2=454166
==============================================================================
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Sun Oct 8 08:55:22 2006
@@ -128,7 +128,7 @@
File /nonfatal /r temp
SetOutPath $INSTDIR\bin
File bin\bootstrap.jar
- File bin\commons-logging-api.jar
+ File bin\tomcat-juli.jar
File bin\*.exe
SetOutPath $INSTDIR\conf
File conf\*.*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
