Author: crossley
Date: Tue Feb 15 06:35:43 2011
New Revision: 1070786
URL: http://svn.apache.org/viewvc?rev=1070786&view=rev
Log:
Publish from forrestbot
Modified:
forrest/site/docs_0_100/changes.html
forrest/site/docs_0_100/changes.rss
forrest/site/docs_0_100/changes.xml
forrest/site/dtdx/document-v13.pdf
forrest/site/dtdx/document-v20.pdf
forrest/site/forrest-issues.html
forrest/site/procedures/release/How_to_release.html
Modified: forrest/site/docs_0_100/changes.html
URL:
http://svn.apache.org/viewvc/forrest/site/docs_0_100/changes.html?rev=1070786&r1=1070785&r2=1070786&view=diff
==============================================================================
--- forrest/site/docs_0_100/changes.html (original)
+++ forrest/site/docs_0_100/changes.html Tue Feb 15 06:35:43 2011
@@ -326,6 +326,9 @@ document.write("Last Published: " + docu
<a href="#version_0.10-dev">Version 0.10-dev (not yet released)</a>
<ul class="minitoc">
<li>
+<a href="#code_0.10-dev">Changes to the Code Base</a>
+</li>
+<li>
<a href="#docs_0.10-dev">Changes to Documentation</a>
</li>
<li>
@@ -536,6 +539,14 @@ document.write("Last Published: " + docu
See each <a href="../pluginDocs/plugins_0_100/index.html">plugin</a>
for its
detailed changes.
</p>
+<a name="code_0.10-dev"></a>
+<h3 class="underlined_5">Changes to the Code Base</h3>
+<ul>
+<li>
+<img class="icon" alt="update" src="../images/update.jpg">
+ Upgraded packaged Jetty to version 6.1.26 from version 4.2.19.
+ Committed by BMD. See Issue <a
href="http://issues.apache.org/jira/browse/FOR-1222";>FOR-1222</a>.</li>
+</ul>
<a name="docs_0.10-dev"></a>
<h3 class="underlined_5">Changes to Documentation</h3>
<ul>
@@ -549,7 +560,7 @@ document.write("Last Published: " + docu
<a name="contributors_0.10-dev"></a>
<h3 class="underlined_5">Contributors to this release</h3>
<p>We thank the following people for their contributions to this release.</p>
-<p>This is a list of all people who participated as committers:<br>David
Crossley (DC).</p>
+<p>This is a list of all people who participated as committers:<br>Brian M.
Dube (BMD), David Crossley (DC).</p>
</div>
<a name="version_0.9"></a>
Modified: forrest/site/docs_0_100/changes.rss
URL:
http://svn.apache.org/viewvc/forrest/site/docs_0_100/changes.rss?rev=1070786&r1=1070785&r2=1070786&view=diff
==============================================================================
--- forrest/site/docs_0_100/changes.rss (original)
+++ forrest/site/docs_0_100/changes.rss Tue Feb 15 06:35:43 2011
@@ -64,6 +64,17 @@
upgrading to v0.10-dev
</description></item>
+ <item><title>Apache Forrest code update
+ (bug FOR-1222)
+
</title><link>http://forrest.apache.org//changes.html</link><description>code
update
+ by
+ BMD
+ (fixes bug FOR-1222)
+
+ :
+
+ Upgraded packaged Jetty to version 6.1.26 from version 4.2.19.
+ </description></item>
<item><title>Apache Forrest docs
add</title><link>http://forrest.apache.org//changes.html</link><description>docs
add
@@ -6669,4 +6680,14 @@
Added document to facilitate
upgrading to v0.10-dev
+ </description></item><item><title>Apache Forrest code update
+ (bug FOR-1222)
+
</title><link>http://forrest.apache.org//changes.html</link><description>code
update
+ by
+ BMD
+ (fixes bug FOR-1222)
+
+ :
+
+ Upgraded packaged Jetty to version 6.1.26 from version 4.2.19.
</description></item></channel></rss>
\ No newline at end of file
Modified: forrest/site/docs_0_100/changes.xml
URL:
http://svn.apache.org/viewvc/forrest/site/docs_0_100/changes.xml?rev=1070786&r1=1070785&r2=1070786&view=diff
==============================================================================
--- forrest/site/docs_0_100/changes.xml (original)
+++ forrest/site/docs_0_100/changes.xml Tue Feb 15 06:35:43 2011
@@ -5,11 +5,13 @@
See each <link href="site:plugins/index">plugin</link> for its
detailed changes.
</p>
- <section id="docs_0.10-dev"><title>Changes to
Documentation</title><ul><li><icon alt="add" src="../images/add.jpg"/>
+ <section id="code_0.10-dev"><title>Changes to the Code
Base</title><ul><li><icon alt="update" src="../images/update.jpg"/>
+ Upgraded packaged Jetty to version 6.1.26 from version 4.2.19.
+ Committed by BMD. See Issue <link
href="http://issues.apache.org/jira/browse/FOR-1222";>FOR-1222</link>.</li></ul></section><section
id="docs_0.10-dev"><title>Changes to Documentation</title><ul><li><icon
alt="add" src="../images/add.jpg"/>
<!-- Please keep this action at the top -->
Added document to facilitate
<link href="site:upgrading_010">upgrading to v0.10-dev</link>
- Committed by DC.</li></ul></section><section
id="contributors_0.10-dev"><title>Contributors to this release</title><p>We
thank the following people for their contributions to this release.</p><p>This
is a list of all people who participated as committers:<br/>David Crossley
(DC).</p></section></section>
+ Committed by DC.</li></ul></section><section
id="contributors_0.10-dev"><title>Contributors to this release</title><p>We
thank the following people for their contributions to this release.</p><p>This
is a list of all people who participated as committers:<br/>Brian M. Dube
(BMD), David Crossley (DC).</p></section></section>
<section id="version_0.9"><title>Version 0.9 (2011-02-07)</title><section
id="build_0.9"><title>Changes to Build</title><ul><li><icon alt="add"
src="../images/add.jpg"/>
Added standalone 'validate-status' build target to validate the project
status changes file.
Modified: forrest/site/dtdx/document-v13.pdf
URL:
http://svn.apache.org/viewvc/forrest/site/dtdx/document-v13.pdf?rev=1070786&r1=1070785&r2=1070786&view=diff
==============================================================================
Binary files - no diff available.
Modified: forrest/site/dtdx/document-v20.pdf
URL:
http://svn.apache.org/viewvc/forrest/site/dtdx/document-v20.pdf?rev=1070786&r1=1070785&r2=1070786&view=diff
==============================================================================
Binary files - no diff available.
Modified: forrest/site/forrest-issues.html
URL:
http://svn.apache.org/viewvc/forrest/site/forrest-issues.html?rev=1070786&r1=1070785&r2=1070786&view=diff
==============================================================================
--- forrest/site/forrest-issues.html (original)
+++ forrest/site/forrest-issues.html Tue Feb 15 06:35:43 2011
@@ -201,6 +201,9 @@ document.write("Last Published: " + docu
<div id="minitoc-area">
<ul class="minitoc">
<li>
+<a
href="#%5BFOR-855%5D+verify+the+license+situation+prior+to+each+release">[FOR-855]
verify the license situation prior to each release</a>
+</li>
+<li>
<a href="#%5BFOR-911%5D+decide+content+of+release">[FOR-911] decide content of
release</a>
</li>
<li>
@@ -210,9 +213,6 @@ document.write("Last Published: " + docu
<a href="#%5BFOR-1108%5D+Dispatcher%2C+Cocoon+2.1+and+Windows">[FOR-1108]
Dispatcher, Cocoon 2.1 and Windows</a>
</li>
<li>
-<a
href="#%5BFOR-855%5D+verify+the+license+situation+prior+to+each+release">[FOR-855]
verify the license situation prior to each release</a>
-</li>
-<li>
<a
href="#%5BFOR-572%5D+run+a+memory+profiler+while+forrest+is+operating">[FOR-572]
run a memory profiler while forrest is operating</a>
</li>
<li>
@@ -228,12 +228,21 @@ document.write("Last Published: " + docu
<a
href="#%5BFOR-1092%5D+review+our+sitemaps+*.xmap+to+compare+with+Cocoon-2.1">[FOR-1092]
review our sitemaps *.xmap to compare with Cocoon-2.1</a>
</li>
<li>
+<a
href="#%5BFOR-1219%5D+the+directory+structure+of+our+site-author+docs+needs+re-arrangement">[FOR-1219]
the directory structure of our site-author docs needs re-arrangement</a>
+</li>
+<li>
<a href="#%5BFOR-560%5D+Remove+duplicate+jars+from+eclipse+plugins">[FOR-560]
Remove duplicate jars from eclipse plugins</a>
</li>
<li>
<a
href="#%5BFOR-217%5D+Certain+patterns+are+claimed+by+the+default+sitemaps">[FOR-217]
Certain patterns are claimed by the default sitemaps</a>
</li>
<li>
+<a
href="#%5BFOR-1220%5D+trouble+with+config+variable+and+skins%2C+only+in+WAR+mode">[FOR-1220]
trouble with config variable and skins, only in WAR mode</a>
+</li>
+<li>
+<a
href="#%5BFOR-915%5D+changes+with+PNGs+generated+on+different+platforms">[FOR-915]
changes with PNGs generated on different platforms</a>
+</li>
+<li>
<a
href="#%5BFOR-705%5D+Target+of+LocationMap+rewriteDemo+causes+build+failure+when+target+not+available">[FOR-705]
Target of LocationMap rewriteDemo causes build failure when target not
available</a>
</li>
<li>
@@ -266,15 +275,6 @@ document.write("Last Published: " + docu
<li>
<a
href="#%5BFOR-1073%5D+link+elements+with+no+href+are+created+by+html-to-document.xsl+for+a%2Fname">[FOR-1073]
link elements with no href are created by html-to-document.xsl for a/name</a>
</li>
-<li>
-<a
href="#%5BFOR-1066%5D+Dispatcher+started+failing+on+seed+sample+site+recently+with+out-of-memory+error">[FOR-1066]
Dispatcher started failing on seed sample site recently with out-of-memory
error</a>
-</li>
-<li>
-<a
href="#%5BFOR-1184%5D+using+unreleased+code+for+some+supporting+products">[FOR-1184]
using unreleased code for some supporting products</a>
-</li>
-<li>
-<a href="#%5BFOR-1150%5D+regularly+ensure+valid+HTML">[FOR-1150] regularly
ensure valid HTML</a>
-</li>
</ul>
</div>
</div>
@@ -289,6 +289,30 @@ document.write("Last Published: " + docu
open issues). The listing below is regenerated on each Forrest run.
</div>
</div>
+<a name="%5BFOR-855%5D+verify+the+license+situation+prior+to+each+release"></a>
+<h2 class="underlined_10">[FOR-855] verify the license situation prior to each
release</h2>
+<div class="section">
+<p>
+<a
href="https://issues.apache.org/jira/browse/FOR-855";>https://issues.apache.org/jira/browse/FOR-855</a>
+</p>
+<p>This should be continually happening anyway, but immediately prior to each
release we need to verify that our license situation is in order. This issue
should not ever be closed, rather just move the &quot;Fix for
Version&quot; on to the next release.
+<br/>
+
+<br/>
+Here are some of the tasks:
+<br/>
+
+<br/>
+A) Ensure that all supporting libraries have a corresponding license.
Basically every jar file or other external package needs to have a
*.license.txt file. Ensure that any license conditions are met, e.g. for some
we must add an entry to NOTICE.txt, while for some others we must not. Remember
to abide by the ASF guidelines (e.g. nothing more restrictive than the Apache
License).
+<br/>
+
+<br/>
+B) Scan the whole trunk repository to add missing ASF license headers to
source files and to ensure that the ASF license headers have not been
accidently added to external files. See etc/relicense.txt
+<br/>
+
+<br/>
+C) Remove any author tags.</p>
+</div>
<a name="%5BFOR-911%5D+decide+content+of+release"></a>
<h2 class="underlined_10">[FOR-911] decide content of release</h2>
<div class="section">
@@ -325,30 +349,6 @@ We should chage the projectInfo plugin s
</p>
<p>Since the update to Cocoon 2.1 Forrest and Dispatcher have broken on
windows.</p>
</div>
-<a name="%5BFOR-855%5D+verify+the+license+situation+prior+to+each+release"></a>
-<h2 class="underlined_10">[FOR-855] verify the license situation prior to each
release</h2>
-<div class="section">
-<p>
-<a
href="https://issues.apache.org/jira/browse/FOR-855";>https://issues.apache.org/jira/browse/FOR-855</a>
-</p>
-<p>This should be continually happening anyway, but immediately prior to each
release we need to verify that our license situation is in order. This issue
should not ever be closed, rather just move the &quot;Fix for
Version&quot; on to the next release.
-<br/>
-
-<br/>
-Here are some of the tasks:
-<br/>
-
-<br/>
-A) Ensure that all supporting libraries have a corresponding license.
Basically every jar file or other external package needs to have a
*.license.txt file. Ensure that any license conditions are met, e.g. for some
we must add an entry to NOTICE.txt, while for some others we must not. Remember
to abide by the ASF guidelines (e.g. nothing more restrictive than the Apache
License).
-<br/>
-
-<br/>
-B) Scan the whole trunk repository to add missing ASF license headers to
source files and to ensure that the ASF license headers have not been
accidently added to external files. See etc/relicense.txt
-<br/>
-
-<br/>
-C) Remove any author tags.</p>
-</div>
<a name="%5BFOR-572%5D+run+a+memory+profiler+while+forrest+is+operating"></a>
<h2 class="underlined_10">[FOR-572] run a memory profiler while forrest is
operating</h2>
<div class="section">
@@ -403,6 +403,14 @@ This could be CSS, or something else, I
</p>
<p>Compare our main sitemap files with Cocoon-2.1 where some properties are
configurable via WEB-INF/properties/ files.</p>
</div>
+<a
name="%5BFOR-1219%5D+the+directory+structure+of+our+site-author+docs+needs+re-arrangement"></a>
+<h2 class="underlined_10">[FOR-1219] the directory structure of our
site-author docs needs re-arrangement</h2>
+<div class="section">
+<p>
+<a
href="https://issues.apache.org/jira/browse/FOR-1219";>https://issues.apache.org/jira/browse/FOR-1219</a>
+</p>
+<p>The &quot;project.content-dir=.&quot; is causing the content and
other resources to be missing when the WAR archive is packed.</p>
+</div>
<a name="%5BFOR-560%5D+Remove+duplicate+jars+from+eclipse+plugins"></a>
<h2 class="underlined_10">[FOR-560] Remove duplicate jars from eclipse
plugins</h2>
<div class="section">
@@ -421,6 +429,58 @@ This could be CSS, or something else, I
<br/>
</p>
</div>
+<a
name="%5BFOR-1220%5D+trouble+with+config+variable+and+skins%2C+only+in+WAR+mode"></a>
+<h2 class="underlined_10">[FOR-1220] trouble with config variable and skins,
only in WAR mode</h2>
+<div class="section">
+<p>
+<a
href="https://issues.apache.org/jira/browse/FOR-1220";>https://issues.apache.org/jira/browse/FOR-1220</a>
+</p>
+<p>When using a WAR, and our provided skins, it seems that the $config (i.e.
//skinconf) variable is not instantiated until it has actually been used. In a
stylesheet (e.g. main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl) the
$config variable is set by the imported &quot;common&quot; related
stylesheet. The first use of the $config variable (i.e. motd) is failing in WAR
mode, but all is fine in &#39;forrest run&#39; and &#39;forrest
site&#39; modes. The fix seems to be to actually use the variable (e.g.
with count() function) before trying to process it.
+<br/>
+
+<br/>
+This seems to be only a problem on Java 1.5 and is okay on Java 6.</p>
+</div>
+<a name="%5BFOR-915%5D+changes+with+PNGs+generated+on+different+platforms"></a>
+<h2 class="underlined_10">[FOR-915] changes with PNGs generated on different
platforms</h2>
+<div class="section">
+<p>
+<a
href="https://issues.apache.org/jira/browse/FOR-915";>https://issues.apache.org/jira/browse/FOR-915</a>
+</p>
+<p><a
href="http://marc.theaimsgroup.com/?t=115450117900002&r=1&w=2">http://marc.theaimsgroup.com/?t=115450117900002&amp;r=1&amp;w=2</a>
+<br/>
+&gt; &gt; Modified:
+<br/>
+&gt; &gt; forrest/site/committed-1.png
+<br/>
+&gt; &gt; forrest/site/live-sites.html
+<br/>
+&gt; &gt; forrest/site/live-sites.pdf
+<br/>
+&gt; &gt; forrest/site/skin/images/rc-b-l-15-1body-2menu-3menu.png
+<br/>
+&gt; &gt; forrest/site/skin/images/rc-b-r-15-1body-2menu-3menu.png
+<br/>
+&gt; &gt;
forrest/site/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png
+<br/>
+&gt; &gt;
forrest/site/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png
+<br/>
+&gt; &gt;
forrest/site/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png
+<br/>
+&gt; &gt;
forrest/site/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png
+<br/>
+&gt; &gt; forrest/site/skin/images/rc-t-r-15-1body-2menu-3menu.png
+<br/>
+&gt; &gt;
forrest/site/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png
+<br/>
+&gt; &gt;
forrest/site/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png
+<br/>
+&gt; &gt;
forrest/site/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png
+<br/>
+
+<br/>
+We cannot explain why this changes occur.</p>
+</div>
<a
name="%5BFOR-705%5D+Target+of+LocationMap+rewriteDemo+causes+build+failure+when+target+not+available"></a>
<h2 class="underlined_10">[FOR-705] Target of LocationMap rewriteDemo causes
build failure when target not available</h2>
<div class="section">
@@ -565,46 +625,6 @@ See discussion in:
<br/>
There was also a mention of it previously on the dev list surrounding the
recent FOP update branch work.</p>
</div>
-<a
name="%5BFOR-1066%5D+Dispatcher+started+failing+on+seed+sample+site+recently+with+out-of-memory+error"></a>
-<h2 class="underlined_10">[FOR-1066] Dispatcher started failing on seed sample
site recently with out-of-memory error</h2>
-<div class="section">
-<p>
-<a
href="https://issues.apache.org/jira/browse/FOR-1066";>https://issues.apache.org/jira/browse/FOR-1066</a>
-</p>
-<p>cd $FORREST_HOME/main
-<br/>
-./build.sh test
-<br/>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp
;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<br/>
-The first stage (the skins-based site) builds fine.
-<br/>
-The second stage (the dispatcher-based site) hangs.
-<br/>
-
-<br/>
-See email:
-<br/>
-<a
href="http://mail-archives.apache.org/mod_mbox/forrest-dev/200801.mbox/%3c20080131070310.ge2...@igg.indexgeo.com.au%3e">http://mail-archives.apache.org/mod_mbox/forrest-dev/200801.mbox/%3c20080131070310.ge2...@igg.indexgeo.com.au%3e</a>
-<br/>
-Re: dispatcher hanging with out of memory errors</p>
-</div>
-<a
name="%5BFOR-1184%5D+using+unreleased+code+for+some+supporting+products"></a>
-<h2 class="underlined_10">[FOR-1184] using unreleased code for some supporting
products</h2>
-<div class="section">
-<p>
-<a
href="https://issues.apache.org/jira/browse/FOR-1184";>https://issues.apache.org/jira/browse/FOR-1184</a>
-</p>
-<p>After the last release, an issue was brought to our attention about using
unreleased code from other projects.</p>
-</div>
-<a name="%5BFOR-1150%5D+regularly+ensure+valid+HTML"></a>
-<h2 class="underlined_10">[FOR-1150] regularly ensure valid HTML</h2>
-<div class="section">
-<p>
-<a
href="https://issues.apache.org/jira/browse/FOR-1150";>https://issues.apache.org/jira/browse/FOR-1150</a>
-</p>
-<p>Ensure that HTML validates okay for the test document referred to in the
parent issue. Use <a
href="http://validator.w3.org/">http://validator.w3.org/</a></p>
-</div>
</div>
<!--+
|end content
Modified: forrest/site/procedures/release/How_to_release.html
URL:
http://svn.apache.org/viewvc/forrest/site/procedures/release/How_to_release.html?rev=1070786&r1=1070785&r2=1070786&view=diff
==============================================================================
--- forrest/site/procedures/release/How_to_release.html (original)
+++ forrest/site/procedures/release/How_to_release.html Tue Feb 15 06:35:43 2011
@@ -864,6 +864,12 @@ document.write("Last Published: " + docu
<v0.9 label="0.9 (current)" href="site:v0.90//index"/>
<v0.8 label="0.8" href="site:v0.80//index"/>
<versions></pre>
+
+<p>
+ Similarly for <span class="codefrag"><pluginVersions</span>
+
+</p>
+
</li>
</ol>
@@ -896,15 +902,26 @@ document.write("Last Published: " + docu
<li>Edit version numbers in xdocs/pluginDocs/index.xml</li>
+<li>Edit version numbers in tools/forrestbar/</li>
+
<li>Edit version numbers in MOTD section of site-author/skinconf.xml</li>
<li>Edit version numbers in main/fresh-site/..../site.xml and tabs.xml</li>
<li>
<p>
- Remove the past versions (0.7) docs directory by doing 'svn rm
- site-author/content/xdocs/docs_0_70
- </p>
+ Copy the past "Upgrading" notes from the past version.
+ Do: <span class="codefrag">svn cp
site-author/content/xdocs/docs_0_70/upgrading_07.xml
site-author/content/xdocs/trash/</span>
+
+</p>
+</li>
+
+<li>
+<p>
+ Remove the past versions (0.7) docs directory. Do:
+ <span class="codefrag">svn rm
site-author/content/xdocs/docs_0_70</span>
+
+</p>
</li>
<li>
@@ -942,12 +959,19 @@ document.write("Last Published: " + docu
<pre class="code">
svn mkdir docs_0_100
svn copy docs_0_90/index.xml docs_0_100
-svn copy docs_0_90/upgrading.xml docs_0_100
+svn copy docs_0_90/upgrading_09.xml docs_0_100/upgrading_010.xml
... edit those docs to suit. Emphasise developers and encourage svn.</pre>
</li>
-<li>Temporarily remove the "dev" note from upgrading_xy.xml</li>
+<li>
+ Start the next set of development pluginDocs. Do:
+ <span class="codefrag">svn cp pluginDocs/plugins_0_90
pluginDocs/plugins_0_100</span>
+
+</li>
+
+<li>Remove the "dev" note from <span
class="codefrag">docs_0_90/index.xml</span> and <span
class="codefrag">docs_0_90/upgrading_09.xml</span>
+</li>
<li>
<p>
@@ -961,7 +985,12 @@ svn copy docs_0_90/upgrading.xml docs_0_
</li>
<li>
- In the top-level quickstart <span
class="codefrag">$FORREST_HOME/index.html</span>
+ Edit version numbers in the top-level quickstart <span
class="codefrag">$FORREST_HOME/index.html</span>
+
+</li>
+
+<li>
+ Undo the exclusions of docs_0_80 etc. in <span
class="codefrag">site-author/conf/cli.xconf</span>
</li>
@@ -981,14 +1010,27 @@ svn copy docs_0_90/upgrading.xml docs_0_
</p>
</li>
+<li>
+ Check that the download page looks correct. Can get an idea with
+ <span class="codefrag">localhost:8888/mirrors.html</span>
+
+</li>
+
<li>Search (e.g. with find and grep) to ensure that no version numbers
have been missed. Sometimes people add more hard-coded version
numbers
since the last release. If you find any, then add them to the list
above (or better still, automate them).
</li>
+<li>
+ Edit <span class="codefrag">site-author/conf/cli.xconf</span>
+ to ensure that only the old docs_0_80 are excluded.
+ </li>
+
<li>Commit all of the above changes after the code-freeze has started
- in the next section.</li>
+ in the next section.
+ However do not build-and-deploy until after the release.
+ </li>
</ol>
<div class="fixme">
@@ -1027,6 +1069,7 @@ svn copy docs_0_90/upgrading.xml docs_0_
<li>
<p>
Update your SVN working copy to include any last minute changes.
+ Keep an eye on the svn@ mail list.
</p>
</li>
@@ -1167,7 +1210,7 @@ to:
<li>
Edit 3 files in tools/forrestbar to update the version
number to match the new release:
<pre class="code">
-xpi/install.rdf, line 24: <em:version>0.9<em:version>
+xpi/install.rdf, line 23: <em:version>0.9<em:version>
xpi/install.js, line 19: var err = initInstall("ForrestBar", "forrestbar",
"0.9");
@@ -1185,6 +1228,8 @@ xpi/chrome/content/contents.rdf, line 25
<li>Commit all of the above changes.</li>
+<li>Do 'svn up'</li>
+
<li>
<p>
Take note of the SVN revision number of your trunk by running
@@ -1227,14 +1272,11 @@ svn status --no-ignore</pre>
<p>Tag SVN trunk for the release candidate:</p>
-<pre class="code">svn copy -m "Create tag forrest_###xy###_rc# from trunk" \
+<pre class="code">svn copy -r ####### -m "Create tag forrest_09_rc# from trunk
r#######" \
https://svn.apache.org/repos/asf/forrest/trunk \
- https://svn.apache.org/repos/asf/forrest/tags/forrest_###xy###_rc#</pre>
+ https://svn.apache.org/repos/asf/forrest/tags/forrest_09_rc#</pre>
<p>
- where '###xy###' is a compact (without the dots) form of the
version
- number (e.g. 04, 041, 05).
- <br>
where 'rc#' is the release candidate number (e.g. rc1, rc2).
</p>
@@ -1295,10 +1337,9 @@ md5sum apache-forrest-0.9.tar.gz</pre>
<pre class="code">
svn copy -r ##### -m "Create the 0.9 release branch from r#####" \
https://svn.apache.org/repos/asf/forrest/trunk \
- https://svn.apache.org/repos/asf/forrest/branches/forrest_#xy#_branch
+ https://svn.apache.org/repos/asf/forrest/branches/forrest_09_branch
where
- '#xy#' is a compact form of the version (e.g. 04, 041, 05).
'#####' is the SVN revision number that the branch was created from,
which was the revision that the release candidate packages were generated
from.
(Remember that you recorded this number earlier.)
@@ -1307,7 +1348,7 @@ where
<p>
See
<a
href="http://svn.apache.org/repos/asf/forrest/branches/";>http://svn.apache.org/repos/asf/forrest/branches/</a>
- for examples of past branches, e.g. forrest_07_branch
+ for examples of past branches, e.g. forrest_08_branch
</p>
</li>
@@ -1379,7 +1420,7 @@ where
<div class="label">Note</div>
<div class="content">
It is vitally important that people review and vote against the actual
- final release candidate source packages (and not just against their
SVN working copy).
+ final source release candidate source packages (and not just against
their SVN working copy).
</div>
</div>
</div>
@@ -1430,14 +1471,9 @@ where
Tag SVN by doing:
</p>
-<pre class="code">svn copy -m "Create tag forrest_###xy###_release from
release branch" \
- https://svn.apache.org/repos/asf/forrest/branches/forrest_###xy###_branch \
- https://svn.apache.org/repos/asf/forrest/tags/forrest_###xy###_release</pre>
-
-<p>
- where '###xy###' is a compact (without the dots) form of the
version
- number (e.g. 04, 041, 05).
- </p>
+<pre class="code">svn copy -m "Create tag forrest_09_release from release
branch" \
+ https://svn.apache.org/repos/asf/forrest/branches/forrest_09_branch \
+ https://svn.apache.org/repos/asf/forrest/tags/forrest_09_release</pre>
<p>
See
@@ -1460,14 +1496,10 @@ where
Tag the "site" SVN by doing:
</p>
-<pre class="code">svn copy -m "Create tag forrest_###xy###_release_site from
site" \
+<pre class="code">svn copy -m "Create tag forrest_09_release_site from site" \
https://svn.apache.org/repos/asf/forrest/site \
-
https://svn.apache.org/repos/asf/forrest/tags/forrest_###xy###_release_site</pre>
+ https://svn.apache.org/repos/asf/forrest/tags/forrest_09_release_site</pre>
-<p>
- where '###xy###' is a compact (without the dots) form of the
version
- number (e.g. 04, 041, 05).
- </p>
</li>
<li>
@@ -1499,13 +1531,15 @@ where
<li>Create a copy of current dev-docs in trunk for the next development phase
...
<pre class="code">
cd site-author/content/xdocs
-svn copy docs_0_90 docs_0_100
+svn rm docs_0_100/index.xml
+svn copy docs_0_90/* docs_0_100
svn copy pluginDocs/plugins_0_90 plugins_0_100</pre>
</li>
<li>Edit site.xml and add a copy of the most current versioned section (e.g.
<v0.90>) above it.
Increment the first decimal of the section's name to reflect the
next planned release (e.g. <v0.100>).
+ Note that some of this was already done above.
</li>
<li>
@@ -1521,12 +1555,13 @@ svn copy pluginDocs/plugins_0_90 plugins
<introduction>
...
</release>
- <release version="0.9" date="2007-08-18">
+ <release version="0.9" date="2011-02-07">
<action
...</pre>
</li>
-<li>Return the "dev" note to upgrading_xy.xml and add some of the orginal
+<li>Return the "dev" note to docs_0_100/index.xml and to
docs_0_100/upgrading_010.xml
+ and add some of the orginal
general points that still apply.</li>
<li>Edit site-author/conf/cli.xconf to exclude the old docs again.</li>
@@ -1540,13 +1575,13 @@ svn mkdir plugins/0.10</pre>
<li>
<p>
Edit main/build.xml, increment the version and add a -dev tag:
- around line 45: <property name="version" value="0.10-dev"/>
+ around line 48: <property name="version" value="0.10-dev"/>
</p>
</li>
<li>
<p>
- Edit main/forrest.build.xml and update the version: around line 32:
+ Edit main/forrest.build.xml and update the version: around line 28:
</p>
<pre class="code"><property name="version" value="0.10-dev"/></pre>
@@ -1582,15 +1617,14 @@ svn mkdir plugins/0.10</pre>
</li>
<li>
- Commit all of the above changes. Either wait for the cronjob,
- or ssh in and do 'svn up'
+ Commit all of the above changes.
</li>
-<li>Remember that there is then a one hour rsync delay.</li>
+<li>Remember do not publish the website yet.</li>
<li>Send email to the dev list to remind people about the new docs set
docs_0_100
and that we don't update docs_0_70 set. Also remind about the new
release branch
- of svn. See example email from the 0.8 release.</li>
+ of svn. See example email from the previous release.</li>
</ul>
</div>
@@ -1667,6 +1701,15 @@ svn mkdir plugins/0.10</pre>
</li>
<li>
+ Wait for the various mirrors to pick up the new files.
+ </li>
+
+<li>
+ Now that the propagation is underway, return to the previous
+ <a href="#prepSite">section</a> to continue with documentation
preparation.
+ </li>
+
+<li>
<p>
Wait for the various mirrors to pick up the new files.
</p>
@@ -1709,11 +1752,18 @@ svn mkdir plugins/0.10</pre>
sure to use the new version of trunk for building the docs. Refer
to
<a href="../../procedures/How_to_publish_docs.html">Publishing
Forrest Documentation</a>
for details. Beware, there is a forrestbot bug whereby with a
brand new
- forrest installation, the first deploy only does the added files.
So deploy again.
+ forrest installation, the first deploy only does the added files.
+ So do the "build and deploy" again.
</p>
</li>
-<li>Test the new Forrest <a href="http://forrest.apache.org/";>website</a>
+<li>
+ Use the proxy trick to do a quick review before the publishing rsync
+ happens (see <a href="http://apache.org/dev/project-site.html";>infra
notes</a>).
+ There might still be a chance to re-deploy.
+ </li>
+
+<li>After rsync, test the new Forrest <a
href="http://forrest.apache.org/";>website</a>
and the redirects
<a href="http://forrest.apache.org/docs/";>f.a.o/docs/</a> and
<a href="http://forrest.apache.org/docs/dev/";>f.a.o/docs/dev/</a>
and the
@@ -1787,12 +1837,16 @@ svn mkdir plugins/0.10</pre>
<li>
<p>
- Remove old dist files from the /www/www.apache.org/dist/forrest/
+ One day later, remove old dist files from the
/www/www.apache.org/dist/forrest/
directory. They have already been automatically archived at
archive.apache.org/dist/forrest/
</p>
<p>
+ Tidy the archive area, being very careful.
+ </p>
+
+<p>
See Henk's cleanup
<a href="http://people.apache.org/~henkp/tlps/";>notes</a>.
</p>
@@ -1844,6 +1898,11 @@ svn mkdir plugins/0.10</pre>
<li>Deploy the Forrest site again. It will automatically rebuild the
<a href="../../forrest-issues.html">Open Issues</a> page.
</li>
+
+<li>
+ Review Henk's
+ <a href="http://people.apache.org/~henkp/";>pgp checks and md5
checks</a>.
+ </li>
</ol>
</div>
