Author: kkolinko
Date: Thu Jul 9 23:01:08 2009
New Revision: 792741
URL: http://svn.apache.org/viewvc?rev=792741&view=rev
Log:
Remove build-webapps-precompile target from dist.xml
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 Thu Jul 9 23:01:08 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77
7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,790405,791041,791184,791194,791243,791326,791328
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77
7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,790405,791041,791184,791194,791243,791326,791328,792740
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=792741&r1=792740&r2=792741&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 9 23:01:08 2009
@@ -124,13 +124,6 @@
+1: markt
-1:
-* Remove build-webapps-precompile target from dist.xml
- Discussion: http://markmail.org/thread/ymgbgqm3lav6rnjh
- Patch:
-
http://people.apache.org/~kkolinko/patches/2009-07-04_tc6_remove-webapps-precompile.patch
- +1: kkolinko, markt, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38797
Reverts previous fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=37933 and implements an
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=792741&r1=792740&r2=792741&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Thu Jul 9 23:01:08 2009
@@ -79,101 +79,6 @@
<property name="tomcat-dbcp.jar"
value="${tomcat-dbcp.home}/tomcat-dbcp.jar"/>
<property name="jasper-jdt.jar" value="${jasper-jdt.home}/jasper-jdt.jar"/>
- <target name="build-webapps-precompile" description="Precompile webapps" >
-
- <!-- JSPC -->
- <property name="ROOT.base" location="${tomcat.build}/webapps/ROOT" />
- <property name="jsp-examples.base"
location="${tomcat.build}/webapps/jsp-examples" />
-
- <mkdir dir="${ROOT.base}/WEB-INF/src" />
- <mkdir dir="${ROOT.base}/WEB-INF/classes" />
- <mkdir dir="${jsp-examples.base}/WEB-INF/src" />
-
- <path id="jspc.classpath">
- <pathelement location="${java.home}/../lib/tools.jar"/>
- <pathelement location="${commons-logging-api.jar}"/>
- <fileset dir="${tomcat.build}/lib">
- <include name="*.jar"/>
- </fileset>
- <pathelement location="${tomcat.build}/classes"/>
- </path>
-
- <taskdef classname="org.apache.jasper.JspC" name="jasper2" >
- <classpath refid="jspc.classpath"/>
- </taskdef>
-
- <jasper2
- compile="false"
- validateXml="false"
- uriroot="${ROOT.base}"
- webXmlFragment="${ROOT.base}/WEB-INF/generated_web.xml"
- addWebXmlMappings="true"
- outputDir="${ROOT.base}/WEB-INF/src" />
-
- <jasper2
- compile="false"
- validateXml="false"
- uriroot="${jsp-examples.base}"
- webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
- addWebXmlMappings="true"
- outputDir="${jsp-examples.base}/WEB-INF/src" />
-
- <javac destdir="${ROOT.base}/WEB-INF/classes"
- optimize="off"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- source="${compile.source}"
- failonerror="false"
- srcdir="${ROOT.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="${tomcat.build}/common/lib">
- <include name="*.jar"/>
- </fileset>
- <pathelement location="${tomcat.build}/classes"/>
- </classpath>
- <include name="**" />
- </javac>
-
- <mkdir dir="${jsp-examples.base}/WEB-INF/src/tags"/>
- <copy todir="${jsp-examples.base}/WEB-INF/classes">
- <fileset dir="${jsp-examples.base}/WEB-INF/src">
- <include name="**/*.class" />
- </fileset>
- </copy>
-
- <javac destdir="${jsp-examples.base}/WEB-INF/classes"
- optimize="off"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- source="${compile.source}"
- failonerror="false"
- srcdir="${jsp-examples.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="${jsp-examples.base}/WEB-INF/lib">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${tomcat.build}/common/lib">
- <include name="*.jar"/>
- </fileset>
- <pathelement location="${tomcat.build}/classes"/>
- <pathelement location="${jsp-examples.base}/WEB-INF/classes"/>
- </classpath>
- <include name="**" />
- <exclude name="tags/**" />
- </javac>
-
- </target>
-
<!-- ====================== COMBO: Clean All Directories ================ -->
<target name="clean"
description="Clean all components">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
