Author: husted
Date: Tue Sep 6 14:05:47 2005
New Revision: 279109
URL: http://svn.apache.org/viewcvs?rev=279109&view=rev
Log:
Further minor changes.
Note that the Jakarta coding conventions simply adopt the Sun coding
conventions, so I changed our guidelines to adopt Sun's directly.
Modified:
struts/site/trunk/xdocs/acquiring.xml
struts/site/trunk/xdocs/bylaws.xml
struts/site/trunk/xdocs/javadoc.xml
struts/site/trunk/xdocs/navigation.xml
struts/site/trunk/xdocs/releases.xml
Modified: struts/site/trunk/xdocs/acquiring.xml
URL:
http://svn.apache.org/viewcvs/struts/site/trunk/xdocs/acquiring.xml?rev=279109&r1=279108&r2=279109&view=diff
==============================================================================
--- struts/site/trunk/xdocs/acquiring.xml (original)
+++ struts/site/trunk/xdocs/acquiring.xml Tue Sep 6 14:05:47 2005
@@ -200,7 +200,7 @@
<section>
<p class="right">
- Next: <a href="using.html">Using Struts</a>
+ Next: <a href="bylaws.html">PMC Bylaws</a>
</p>
</section>
Modified: struts/site/trunk/xdocs/bylaws.xml
URL:
http://svn.apache.org/viewcvs/struts/site/trunk/xdocs/bylaws.xml?rev=279109&r1=279108&r2=279109&view=diff
==============================================================================
--- struts/site/trunk/xdocs/bylaws.xml (original)
+++ struts/site/trunk/xdocs/bylaws.xml Tue Sep 6 14:05:47 2005
@@ -7,7 +7,7 @@
<body>
-<section name="Apache Struts Project Bylaws">
+<section name="Apache Struts Project G">
<subsection name="Charter">
Modified: struts/site/trunk/xdocs/javadoc.xml
URL:
http://svn.apache.org/viewcvs/struts/site/trunk/xdocs/javadoc.xml?rev=279109&r1=279108&r2=279109&view=diff
==============================================================================
--- struts/site/trunk/xdocs/javadoc.xml (original)
+++ struts/site/trunk/xdocs/javadoc.xml Tue Sep 6 14:05:47 2005
@@ -77,5 +77,12 @@
</section>
+ <section>
+ <p class="right">Next:
+ <a
href="http://svn.apache.org/viewcvs.cgi/struts/core/trunk/?root=Apache-SVN">
+ Source Repository</a>
+ </p>
+ </section>
+
</body>
</document>
Modified: struts/site/trunk/xdocs/navigation.xml
URL:
http://svn.apache.org/viewcvs/struts/site/trunk/xdocs/navigation.xml?rev=279109&r1=279108&r2=279109&view=diff
==============================================================================
--- struts/site/trunk/xdocs/navigation.xml (original)
+++ struts/site/trunk/xdocs/navigation.xml Tue Sep 6 14:05:47 2005
@@ -82,12 +82,16 @@
href="bylaws.html"
/>
<item
- name="Source Repository"
-
href="http://svn.apache.org/viewcvs.cgi/struts/core/trunk/?root=Apache-SVN"
+ name="Release Guidelines"
+ href="releases.html"
/>
<item
name="Javadoc Index"
href="javadoc.html"
+ />
+ <item
+ name="Source Repository"
+
href="http://svn.apache.org/viewcvs.cgi/struts/core/trunk/?root=Apache-SVN"
/>
</menu>
</body>
Modified: struts/site/trunk/xdocs/releases.xml
URL:
http://svn.apache.org/viewcvs/struts/site/trunk/xdocs/releases.xml?rev=279109&r1=279108&r2=279109&view=diff
==============================================================================
--- struts/site/trunk/xdocs/releases.xml (original)
+++ struts/site/trunk/xdocs/releases.xml Tue Sep 6 14:05:47 2005
@@ -9,9 +9,11 @@
<body>
<section name="Release Guidelines">
<a name="status"/>
- <p>This document describes the Struts
+ <p>This document describes the Apache Struts
<a href="#Releases">release process</a> and our
- <a href="#Coding">coding conventions</a>. Both stable and development
releases are
+ <a href="#Coding">coding conventions</a>,
+ which are applicable to all subprojects.
+ Both stable and development releases are
<a href="acquiring.html">available for download</a>.</p>
</section>
<section name="Release Guidelines">
@@ -35,7 +37,7 @@
<li><strong>Distributing</strong> - Checksum, sign, mirror, update
download page, announce.</li>
</ul></li>
<li>Committers are <b>required</b> to post a release plan before
tagging the repository and should wait the traditional 72 hours before
proceeding.</li>
- <li>A checklist format can be used for the <a
href="http://wiki.apache.org/struts/StrutsRelease126">release plan</a>, to help
step through the process. The plan may be maintained in the repository or on
the <a href="http://wiki.apache.org/struts/">Struts wiki</a>.</li>
+ <li>A checklist format can be used for the <a
href="http://wiki.apache.org/struts/StrutsReleasePlans">release plan</a>, to
help step through the process. The plan may be maintained in the repository or
on the <a href="http://wiki.apache.org/struts/">Struts wiki</a>.</li>
<li>Our dependencies on external JARs (including Commons JARs) should
be in line with our own release status. Our nightly build can be dependant on
another nightly build. Our beta can be dependant on another beta (or "release
candidate"), but should avoid a dependance on a nightly build.
Our General Availability release may only have dependencies on other
GA, final, or stable releases.</li>
<li>Use your own discretion as to detail needed by the Release Notes.
A high-level description of the changes is more important than providing
uninterpreted detail. At a minimum, new features and deprecations should be
summarized, since these are commonly asked questions. Ideally, the release
notes should be maintained continuously for the nightly build so that we they
do not need to be assembled at the last minute.</li>
@@ -43,7 +45,7 @@
<strong>latest production release of J2SE</strong>, to take advantage
of all available compiler enhancements.</li>
<li>If you have multiple J2SE versions configured, run the JUnit and
Cactus tests using the same configuration that will be used to build the
distribution.</li>
<li>There is a "release" target in the buildfile that will zip and tar
the distribution. Before uploading the distribution, extract the sample web
applications and deploy the WARs under each of the "supported" containers (if
you can). Play test each application under each container to be sure they
operate nominally.</li>
- <li>The test build can be posted to the internal distribution
directory (cvs.apache.org/struts/) and announced to the Struts DEV and PMC
lists (only!). Do not announce a test build on any other Apache lists or link
to it from an Apache website.</li>
+ <li>The test build can be posted to the internal distribution
directory (svn.apache.org/struts/) and announced to the Struts DEV and PMC
lists (only!). Do not announce a test build on any other Apache lists or link
to it from an Apache website.</li>
<li>If the test build is voted to Alpha, Beta, or GA status, the
release can announced to the User list and linked from the website.</li>
<li>Any formal release may be submitted for mirroring. All GA releases
<b>must</b> be mirrored.</li>
<li>After announcing a release, remember to update the Acquiring and
Announcements pages. If the release is to be mirrored, wait at least 24 hours
after submittal before making public announcements (as stated in the <a
href="http://apache.org/dev/mirrors.html">Apache Mirroring guidelines</a>).</li>
@@ -55,7 +57,11 @@
<p>Source code and documentation contributed to the Struts repositories
should observe the:</p>
<ul>
<li>
- <a href="http://jakarta.apache.org/site/source.html">Jakarta project
guidelines</a>,</li>
+ The
+ "<a
href="http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html">
+ Code Conventions for the Java Programming Language</a>",
+ as published by Sun.
+ </li>
<li>
<a href="http://www.ambysoft.com/elementsJavaStyle.html">Elements of
Java Style</a>, and</li>
<li>
@@ -92,22 +98,22 @@
<b>You do not need to change the copyright year unless you change the
file.</b>Every source file should include the ASF copyright notice and current
Apache License and copyright.</li>
<li>Provide high-level API compatibility for any changes made within
the same major release series (#.x.x). Changes which adversely affect
compatibility should be slotted for the next major release series
(++#.x.x).</li>
<li>Our favorite books about programming are
- <a
href="http://www.amazon.com/exec/obidos/ISBN=0201633612/hitchhikeguidetoA/">Design
Patterns</a>,
- <a
href="http://www.amazon.com/exec/obidos/ISBN=0201485672/hitchhikeguidetoA/">Refactoring</a>,
and
- <a
href="http://www.amazon.com/exec/obidos/ISBN=0735619670/hitchhikeguidetoA/">Code
Complete</a> (2d).</li>
+ <a
href="http://www.amazon.com/exec/obidos/ISBN=0201633612/apachesoftwar-20/">Design
Patterns</a>,
+ <a
href="http://www.amazon.com/exec/obidos/ISBN=0201485672/apachesoftwar-20/">Refactoring</a>,
and
+ <a
href="http://www.amazon.com/exec/obidos/ISBN=0735619670/apachesoftwar-20/">Code
Complete</a> (2d).</li>
<li>Our favorite book about open source development is the
- <a
href="http://www.amazon.com/exec/obidos/ISBN=1565927249/hitchhikeguidetoA/">The
Cathedral and the Bazaar</a>.</li>
+ <a
href="http://www.amazon.com/exec/obidos/ISBN=1565927249/apachesoftwar-20/">The
Cathedral and the Bazaar</a>.</li>
<li>Our favorite science fiction author is
<a href="http://www.nitrosyncretic.com/rah/">Robert Heinlein</a>.
- <a
href="http://www.tuxedo.org/~esr/jargon/html/entry/TANSTAAFL.html">TANSTAAFL</a>.
+ <a href="http://jargon.net/jargonfile/t/TANSTAAFL.html">TANSTAAFL</a>.
<br />(Except on Friday, when we favor
- <a href="http://carbon.cudenver.edu/~mstilman/zaphod/">Douglas
Adams</a>.
- <a href="http://news.bbc.co.uk/1/hi/uk/1326657.stm">SLATFATF</a>.)</li>
+ <a href="http://news.bbc.co.uk/1/hi/uk/1326657.stm">Douglas Adams</a>).
+ </li>
</ul>
</section>
<section>
<p class="right">Next:
- <a href="http://struts.apache.org/roadmap.html">Roadmap</a></p>
+ <a href="javadoc.html">Javadoc Index</a></p>
</section>
</body>
</document>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]