Author: kkolinko
Date: Wed Jun 24 13:53:14 2009
New Revision: 788022
URL: http://svn.apache.org/viewvc?rev=788022&view=rev
Log:
Provide documentation for deployer.
It is a fix for "cannot copy" warning observed when building a release.
We do not have "printer" versions of our documentation pages anymore, so I am
using the common version.
The document is not renamed and it is moved to the root folder, to remain
relative to the images.
Removed the "failonerror=false" flag.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 24 13:53:14 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,784453,784602,784614,785688,785768,785859,786468,786667,787627,787770
+/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,783863,784453,784602,784614,785688,785768,785859,786468,786667,787627,787770
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=788022&r1=788021&r2=788022&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun 24 13:53:14 2009
@@ -111,12 +111,6 @@
+1: markt, fhanik, mturk
-1:
-* Provide documentation for deployer.
- It is a fix for "cannot copy" warning observed during building a release.
- http://svn.apache.org/viewvc?rev=783863&view=rev
- +1: kkolinko, markt, fhanik
- -1:
-
* Update the build scripts, because there are no 64-bit GUI binaries.
(Fixes release build failure caused by
http://svn.apache.org/viewvc?view=rev&revision=779930
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=788022&r1=788021&r2=788022&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Wed Jun 24 13:53:14 2009
@@ -307,13 +307,12 @@
<!-- Copy deployer documentation -->
<copy todir="${tomcat.deployer}">
<fileset dir="${tomcat.build}/webapps/docs">
- <include name="images/jakarta-logo.gif" />
+ <include name="images/asf-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"
- failonerror="false"/>
+ <copy tofile="${tomcat.deployer}/deployer-howto.html"
+ file="${tomcat.build}/webapps/docs/deployer-howto.html"/>
</target>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=788022&r1=788021&r2=788022&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jun 24 13:53:14 2009
@@ -123,7 +123,8 @@
<update>
Remove the code that auto-detects the value for compilerSourceVM,
compilerTargetVM options of Jasper, because we know that this version
- of Tomcat cannot run on JDK 1.4 and thus the value is always "1.5".
(kkolinko)
+ of Tomcat cannot run on JDK 1.4 and thus the value is always "1.5".
+ (kkolinko)
</update>
</changelog>
</subsection>
@@ -131,7 +132,7 @@
<changelog>
<fix>
<bug>47235</bug>: Remove use of autoReconnect from MySQL examples.
- (mark)
+ (markt)
</fix>
</changelog>
</subsection>
@@ -161,6 +162,9 @@
Fix download task check for commons-pool and commons-dbcp in the
build scripts. (kkolinko)
</fix>
+ <add>
+ Included deployer-howto.html into the deployer distributive. (kkolinko)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
