Author: markt
Date: Sun Nov 30 16:07:06 2008
New Revision: 721937
URL: http://svn.apache.org/viewvc?rev=721937&view=rev
Log:
Clean up
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/dist.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 30 16:07:06 2008
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,710063,710125,710205,711126,711600,712461
+/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,710063,710125,710205,711126,711600,712461,718360
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=721937&r1=721936&r2=721937&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Nov 30 16:07:06 2008
@@ -171,11 +171,6 @@
0: remm (risky, would it be possible to stop backporting risky changes and
behavior modifications to 6.0.x ?)
-1:
-* Clean up dist.xml
- http://svn.apache.org/viewvc?rev=718360&view=rev
- +1: markt, remm, fhanik, pero
- -1:
-
* Make sure DIR deployment with context.xml works when configBase does no
exist.
This is required as a result of my previous changes to HostConfig
http://svn.apache.org/viewvc?rev=718436&view=rev
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=721937&r1=721936&r2=721937&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Sun Nov 30 16:07:06 2008
@@ -79,11 +79,9 @@
<target name="build-webapps-precompile" description="Precompile webapps" >
<!-- JSPC -->
- <property name="admin.base"
location="${tomcat.build}/server/webapps/admin" />
<property name="ROOT.base" location="${tomcat.build}/webapps/ROOT" />
<property name="jsp-examples.base"
location="${tomcat.build}/webapps/jsp-examples" />
- <mkdir dir="${admin.base}/WEB-INF/src/admin" />
<mkdir dir="${ROOT.base}/WEB-INF/src" />
<mkdir dir="${ROOT.base}/WEB-INF/classes" />
<mkdir dir="${jsp-examples.base}/WEB-INF/src" />
@@ -117,15 +115,6 @@
addWebXmlMappings="true"
outputDir="${jsp-examples.base}/WEB-INF/src" />
- <jasper2
- package="admin"
- compile="false"
- validateXml="false"
- uriroot="${admin.base}"
- webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
- addWebXmlMappings="true"
- outputDir="${admin.base}/WEB-INF/src/admin" />
-
<javac destdir="${ROOT.base}/WEB-INF/classes"
optimize="off"
debug="${compile.debug}"
@@ -180,98 +169,6 @@
<exclude name="tags/**" />
</javac>
- <javac destdir="${admin.base}/WEB-INF/classes"
- optimize="off"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- source="${compile.source}"
- failonerror="false"
- srcdir="${admin.base}/WEB-INF/src"
- excludes="**/*.smap">
- <classpath>
- <pathelement location="${java.home}/../lib/tools.jar"/>
- <fileset dir="${tomcat.build}/server/lib">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${admin.base}/WEB-INF/lib">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${tomcat.build}/common/lib">
- <include name="*.jar"/>
- </fileset>
- <pathelement location="${tomcat.build}/classes"/>
- </classpath>
- <include name="admin/**" />
- </javac>
- </target>
-
- <target name="fix-webapps">
- <!-- Extra build steps for webapps -->
-
- <filter token="VERSION" value="${version}"/>
-
- <!-- Add release notes to the root webapp -->
- <copy file="${basedir}/RELEASE-NOTES"
- tofile="${tomcat.build}/webapps/ROOT/RELEASE-NOTES.txt"
- filtering="true" />
-
- <!-- Add documents to the tomcat-docs webapp -->
- <copy file="${basedir}/resources/build.xml"
- todir="${tomcat.build}/webapps/tomcat-docs" />
- <copy file="./RELEASE-NOTES"
- tofile="${tomcat.build}/webapps/tomcat-docs/RELEASE-NOTES.txt"
- filtering="true" />
-
- <!-- Build JARs for webapps classes -->
- <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
- <jar
jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar"
- index="true">
- <fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">
- <include name="**/*.class" />
- <include name="**/*.properties" />
- </fileset>
- </jar>
- <mkdir dir="${tomcat.build}/server/webapps/manager/WEB-INF/lib" />
- <jar
jarfile="${tomcat.build}/server/webapps/manager/WEB-INF/lib/catalina-manager.jar"
- index="true">
- <fileset dir="${tomcat.build}/server/webapps/manager/WEB-INF/classes">
- <include name="**/*.class" />
- <include name="**/*.properties" />
- </fileset>
- </jar>
- <mkdir dir="${tomcat.build}/server/webapps/host-manager/WEB-INF/lib" />
- <jar
jarfile="${tomcat.build}/server/webapps/host-manager/WEB-INF/lib/catalina-host-manager.jar"
- index="true">
- <fileset
dir="${tomcat.build}/server/webapps/host-manager/WEB-INF/classes">
- <include name="**/*.class" />
- <include name="**/*.properties" />
- </fileset>
- </jar>
- <mkdir dir="${tomcat.build}/webapps/balancer/WEB-INF/lib" />
- <jar
jarfile="${tomcat.build}/webapps/balancer/WEB-INF/lib/catalina-balancer.jar"
- index="true">
- <fileset dir="${tomcat.build}/webapps/balancer/WEB-INF/classes">
- <include name="**/*.class" />
- <include name="**/*.properties" />
- </fileset>
- </jar>
- <mkdir dir="${tomcat.build}/webapps/ROOT/WEB-INF/lib" />
- <jar jarfile="${tomcat.build}/webapps/ROOT/WEB-INF/lib/catalina-root.jar"
- index="true">
- <fileset dir="${tomcat.build}/webapps/ROOT/WEB-INF/classes">
- <include name="**/*.class" />
- <include name="**/*.properties" />
- </fileset>
- </jar>
-
- <!-- Add XML declarations for admin, manager and balancer -->
- <copy file="${tomcat.build}/server/webapps/manager/manager.xml"
- todir="${tomcat.build}/conf/Catalina/localhost" />
- <copy file="${tomcat.build}/server/webapps/host-manager/host-manager.xml"
- todir="${tomcat.build}/conf/Catalina/localhost" />
- <copy file="${tomcat.build}/server/webapps/admin/admin.xml"
- todir="${tomcat.build}/conf/Catalina/localhost" />
-
</target>
<!-- ====================== COMBO: Clean All Directories ================ -->
@@ -341,7 +238,6 @@
<copy todir="${tomcat.dist}/webapps">
<fileset dir="${tomcat.build}/webapps">
- <exclude name="**/balancer/WEB-INF/classes/**" />
<exclude name="**/ROOT/WEB-INF/classes/**" />
<exclude name="**/WEB-INF/src/**" />
</fileset>
@@ -519,8 +415,6 @@
<include name="RELEASE-NOTES"/>
<include name="RUNNING.txt"/>
<include name="BENCHMARKS.txt"/>
- <exclude name="webapps/admin/**"/>
- <exclude name="conf/Catalina/localhost/admin.xml"/>
</zipfileset>
</zip>
@@ -546,26 +440,6 @@
message="${md5sum.binary-prefix}${final.name}-deployer.zip${line.separator}"
append="true" />
</target>
- <!-- Packages the admin webapp distro in zip format -->
- <target name="package-admin-zip">
- <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-admin.zip">
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}">
- <include name="webapps/admin/**"/>
- <include name="conf/Catalina/localhost/admin.xml"/>
- <exclude name="*.jsp" />
- </zipfileset>
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}"
includes="LICENSE" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}"
includes="NOTICE" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}"
includes="README.txt" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}"
includes="RELEASE-NOTES" />
- </zip>
-
- <checksum file="${tomcat.release}/v${version}/bin/${final.name}-admin.zip"
- forceOverwrite="yes" fileext=".md5" />
- <echo
file="${tomcat.release}/v${version}/bin/${final.name}-admin.zip.md5"
-
message="${md5sum.binary-prefix}${final.name}-admin.zip${line.separator}"
append="true" />
- </target>
-
<!-- Packages the core tar.gz distro -->
<target name="package-tgz">
<fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"/>
@@ -588,7 +462,6 @@
</tarfileset>
<tarfileset dir="${tomcat.dist}" mode="600" prefix="${final.name}">
<include name="conf/**" />
- <exclude name="conf/Catalina/localhost/admin.xml" />
</tarfileset>
<tarfileset dir="${tomcat.dist}" prefix="${final.name}">
<include name="bin/**" />
@@ -617,7 +490,6 @@
<exclude name="bin/version.sh" />
<exclude name="conf/**" />
<exclude name="src/**" />
- <exclude name="webapps/admin/**" />
</tarfileset>
</tar>
@@ -652,33 +524,6 @@
message="${md5sum.binary-prefix}${final.name}-deployer.tar.gz${line.separator}"
append="true" />
</target>
- <!-- Packages the admin webapp distro in tar.gz format -->
- <target name="package-admin-tgz">
- <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"/>
-
- <tar longfile="gnu" compression="gzip"
-
tarfile="${tomcat.release}/v${version}/bin/${final.name}-admin.tar.gz">
- <tarfileset dir="${tomcat.dist}" prefix="${final.name}">
- <include name="LICENSE" />
- <include name="NOTICE" />
- <include name="README.txt" />
- <include name="RELEASE-NOTES" />
- </tarfileset>
- <tarfileset dir="${tomcat.dist}" prefix="${final.name}">
- <include name="server/webapps/admin/**" />
- <exclude name="*.jsp" />
- </tarfileset>
- <tarfileset dir="${tomcat.dist}" mode="600" prefix="${final.name}">
- <include name="conf/Catalina/localhost/admin.xml" />
- </tarfileset>
- </tar>
-
- <checksum
file="${tomcat.release}/v${version}/bin/${final.name}-admin.tar.gz"
- forceOverwrite="yes" fileext=".md5" />
- <echo
file="${tomcat.release}/v${version}/bin/${final.name}-admin.tar.gz.md5"
-
message="${md5sum.binary-prefix}${final.name}-admin.tar.gz${line.separator}"
append="true" />
- </target>
-
<!-- Packages the documentation distro in tar.gz format -->
<target name="package-docs-tgz">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
