Author: markt
Date: Sat Aug 15 18:03:46 2009
New Revision: 804501
URL: http://svn.apache.org/viewvc?rev=804501&view=rev
Log:
Port Rainer's comment improvement from trunk
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/extras.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 15 18:03:46 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,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,797168,797607
+/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,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,797168,797425,797607
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=804501&r1=804500&r2=804501&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Sat Aug 15 18:03:46 2009
@@ -20,8 +20,15 @@
<!-- ===================== Initialize Property Values =================== -->
- <!-- See "build.properties.sample" in the top level directory for all -->
- <!-- property values you must customize for successful building!!! -->
+ <!-- We read customizable properties from the file
"build.properties.default" -->
+ <!-- and also from "build.properties" if it exists.
-->
+ <!-- The values in "build.properties" have stronger preference.
-->
+ <!-- If you want to customize your build, you can either change the values
-->
+ <!-- directly in the default file, or create a new build.properties and set
-->
+ <!-- the values there. This way you don't have to change a file which is
part -->
+ <!-- of the original project source code.
-->
+ <!-- See "build.properties.default" in the top level directory for some
-->
+ <!-- property values you may customize.
-->
<property file="${user.home}/build.properties"/>
<property file="build.properties"/>
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=804501&r1=804500&r2=804501&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Sat Aug 15 18:03:46 2009
@@ -20,8 +20,15 @@
<!-- ===================== Initialize Property Values =================== -->
- <!-- See "build.properties.sample" in the top level directory for all -->
- <!-- property values you must customize for successful building!!! -->
+ <!-- We read customizable properties from the file
"build.properties.default" -->
+ <!-- and also from "build.properties" if it exists.
-->
+ <!-- The values in "build.properties" have stronger preference.
-->
+ <!-- If you want to customize your build, you can either change the values
-->
+ <!-- directly in the default file, or create a new build.properties and set
-->
+ <!-- the values there. This way you don't have to change a file which is
part -->
+ <!-- of the original project source code.
-->
+ <!-- See "build.properties.default" in the top level directory for some
-->
+ <!-- property values you may customize.
-->
<property file="${user.home}/build.properties"/>
<property file="build.properties"/>
Modified: tomcat/tc6.0.x/trunk/extras.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/extras.xml?rev=804501&r1=804500&r2=804501&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/extras.xml (original)
+++ tomcat/tc6.0.x/trunk/extras.xml Sat Aug 15 18:03:46 2009
@@ -20,8 +20,15 @@
<!-- ===================== Initialize Property Values =================== -->
- <!-- See "build.properties.sample" in the top level directory for all -->
- <!-- property values you must customize for successful building!!! -->
+ <!-- We read customizable properties from the file
"build.properties.default" -->
+ <!-- and also from "build.properties" if it exists.
-->
+ <!-- The values in "build.properties" have stronger preference.
-->
+ <!-- If you want to customize your build, you can either change the values
-->
+ <!-- directly in the default file, or create a new build.properties and set
-->
+ <!-- the values there. This way you don't have to change a file which is
part -->
+ <!-- of the original project source code.
-->
+ <!-- See "build.properties.default" in the top level directory for some
-->
+ <!-- property values you may customize.
-->
<property file="${user.home}/build.properties"/>
<property file="build.properties"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
