Author: crossley Date: Thu Sep 30 23:08:59 2004 New Revision: 47633 Added: cocoon/site/site/devinfo/ cocoon/site/site/devinfo/index.html (contents, props changed) cocoon/site/site/devinfo/releasing.html (contents, props changed) Modified: cocoon/site/site/community/contrib.html cocoon/site/site/community/mail-lists.html cocoon/site/site/history.html cocoon/site/site/incubation.html cocoon/site/site/index.html cocoon/site/site/link/livesites-2.0.html cocoon/site/site/link/livesites-2.1.html cocoon/site/site/link/projects.html cocoon/site/site/link/sites.html cocoon/site/site/news/archives.html cocoon/site/site/news/index.html cocoon/site/site/skin/page.css cocoon/site/site/versioning.html cocoon/site/site/whoweare.html Log: Update top-level website.
Modified: cocoon/site/site/community/contrib.html ============================================================================== --- cocoon/site/site/community/contrib.html (original) +++ cocoon/site/site/community/contrib.html Thu Sep 30 23:08:59 2004 @@ -98,37 +98,29 @@ <li> <font color="#CFDCED">Navigation</font> <ul> - <li> <a href="../index.html">Main</a> </li> - </ul> </li> <li> <font color="#CFDCED">Community</font> <ul> - <li> <a href="members.html">Members</a> </li> - <li> <span class="sel"><font color="#ffcc00">Contributing</font></span> </li> - <li> <a href="committer.html">Committer Tips</a> </li> - <li> <a href="mail-lists.html">Mail Lists</a> </li> - <li> <a href="mail-archives.html">Mail Archives</a> </li> - </ul> </li> </ul> Modified: cocoon/site/site/community/mail-lists.html ============================================================================== --- cocoon/site/site/community/mail-lists.html (original) +++ cocoon/site/site/community/mail-lists.html Thu Sep 30 23:08:59 2004 @@ -396,7 +396,7 @@ </p> <p>This list is for everyone (users and developers) to assist with building - the Cocoon documentation. Also, all <a href="http://wiki.cocoondev.org/">Wiki</a> + the Cocoon documentation. Also, all <a href="http://wiki.apache.org/cocoon/">Wiki</a> changes are automatically posted here. </p> <p> Added: cocoon/site/site/devinfo/index.html ============================================================================== --- (empty file) +++ cocoon/site/site/devinfo/index.html Thu Sep 30 23:08:59 2004 @@ -0,0 +1,251 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html> +<head> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>Cocoon Developer Info</title> +<link type="text/css" href="../skin/page.css" rel="stylesheet"> +</head> +<body text="#000000" bgcolor="#FFFFFF"> +<!--================= start Navigation Path ==================--> +<table summary="navigation path" width="100%" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td nowrap="nowrap" valign="middle" bgcolor="#CFDCED" height="20"><img height="1" width="5" alt="" src="../skin/images/spacer.gif" class="spacer"><!--===== breadcrumb trail (javascript-generated) ====--><font size="2" face="Arial, Helvetica, Sans-serif"><script src="../skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script></font></td> +</tr> +<tr> +<td bgcolor="#4C6C8F" height="2"><img height="2" width="2" alt="" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +</table> +<!--================= end Navigation Path ==================--> +<!--================= start Banner ==================--> +<table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0"> +<tr> +<!--================= start Group Logo ==================--> +<td bgcolor="#294563"><a href="http://cocoon.apache.org/"><img border="0" class="logoImage" alt="Apache Cocoon" src="../images/cocoon-project-logo.png"></a></td> +<!--================= end Group Logo ==================--> +<!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://cocoon.apache.org/"><img border="0" class="logoImage" alt="Apache Cocoon" src="../images/cocoon-logo.gif"></a></td> +<!--================= end Project Logo ==================--> +<!--================= start Search ==================--><td valign="top" rowspan="2" bgcolor="#294563"> +<form target="_blank" action="http://www.google.com/search" method="get"> +<table summary="search" border="0" cellspacing="0" cellpadding="0" bgcolor="#4C6C8F"> +<tr> +<td colspan="3"><img height="10" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +<tr> +<td><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td nowrap="nowrap"><input value="cocoon.apache.org" name="sitesearch" type="hidden"><input size="15" name="q" id="query" type="text"><img height="1" width="5" alt="" src="../skin/images/spacer.gif" class="spacer"><input name="Search" value="Search" type="submit"> +<br> +<font face="Arial, Helvetica, Sans-serif" size="2" color="white"> + the Apache Cocoon site + + + </font></td><td><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +<tr> +<td><img alt="" border="0" height="10" width="9" src="../skin/images/search-left.gif"></td><td><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td><img alt="" border="0" height="10" width="9" src="../skin/images/search-right.gif"></td> +</tr> +</table> +</form> +</td> +<!--================= start Search ==================--><td bgcolor="#294563"><img height="10" width="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +<tr> +<td valign="bottom" bgcolor="#294563" colspan="2"> +<!--================= start Tabs ==================--> +<div class="tab"> +<table summary="tab bar" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom"> +<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../index.html">Home</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td> +</tr> +</table> +</td> +</tr> +</table> +</div> +<!--================= end Tabs ==================--> +</td><td bgcolor="#294563"><img alt="" width="1" height="1" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +<tr> +<td bgcolor="#4C6C8F" colspan="4"><img width="1" height="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +</table> +<!--================= end Banner ==================--> +<!--================= start Menu, NavBar, Content ==================--> +<table summary="page content" bgcolor="#ffffff" width="100%" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td valign="top"> +<table summary="menu" border="0" cellspacing="0" cellpadding="0"> +<tr> +<!--================= start left top NavBar ==================--> +<td rowspan="3" valign="top"> +<table summary="blue line" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +<tr> +<td bgcolor="#CFDCED"><font color="#4C6C8F" size="4" face="Arial, Helvetica, Sans-serif"> </font></td> +</tr> +<tr> +<td bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +</table> +</td> +<!--================= end left top NavBar ==================--><td bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td valign="bottom" bgcolor="#4C6C8F"><img width="10" height="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td nowrap="nowrap" valign="top" bgcolor="#4C6C8F"> +<!--================= start Menu items ==================--> +<div class="menu"> +<ul> +<li> +<font color="#CFDCED">Navigation</font> +<ul> +<li> +<a href="../index.html">Main</a> +</li> +</ul> +</li> +<li> +<font color="#CFDCED">Developer Infos</font> +<ul> +<li> +<span class="sel"><font color="#ffcc00">Overview</font></span> +</li> +<li> +<a href="releasing.html">Releasing</a> +</li> +</ul> +</li> +</ul> +</div> +<!--================= end Menu items ==================--> +</td><td valign="bottom" bgcolor="#4C6C8F"><img width="10" height="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +<tr> +<td valign="bottom" align="left" colspan="2" rowspan="2" bgcolor="#4C6C8F"><img height="10" width="10" border="0" alt="" src="../skin/images/menu-left.gif"></td><td bgcolor="#4C6C8F"><img height="10" width="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td valign="bottom" align="right" colspan="2" rowspan="2" bgcolor="#4C6C8F"><img height="10" width="10" border="0" alt="" src="../skin/images/menu-right.gif"></td> +</tr> +<tr> +<td height="1" bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +</table> +</td><td valign="top" width="100%"> +<table summary="content" width="100%" border="0" cellpadding="0" cellspacing="0"> +<!--================= start middle NavBar ==================--> +<tr> +<td colspan="4" bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +<tr> +<td align="left" width="10" bgcolor="#CFDCED"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td align="left" width="50%" bgcolor="#CFDCED"><font color="#4C6C8F" size="3" face="Arial, Helvetica, Sans-serif"> + + + </font><img width="10" height="8" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td align="right" width="50%" bgcolor="#CFDCED"><font color="#4C6C8F" size="3" face="Arial, Helvetica, Sans-serif"> + + + </font><img width="10" height="8" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td width="10" bgcolor="#CFDCED"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +<tr> +<td colspan="4" bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +<!--================= end middle NavBar ==================--> +<!--================= start Content==================--> +<tr> +<td align="left" width="10"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td colspan="2" align="left" width="100%"> +<div class="content"> +<table class="title" summary=""> +<tr> +<td valign="middle"> +<h1>Cocoon Developer Info</h1> +</td> +</tr> +</table> +<ul class="minitoc"> +<li> +<a href="#Overview">Overview</a> +</li> +<li> +<a href="#Apache+Developer+Info">Apache Developer Info</a> +</li> +</ul> + +<a name="N1000C"></a><a name="Overview"></a> +<h3>Overview</h3> +<div style="margin-left: 0 ; border: 2px"> +<p> + This page lists resources and information useful to Apache Cocoon + committers. + </p> +<ul> + +<li> +<a href="releasing.html">Howto Release Cocoon</a> +</li> + +</ul> +</div> + +<a name="N1001E"></a><a name="Apache+Developer+Info"></a> +<h3>Apache Developer Info</h3> +<div style="margin-left: 0 ; border: 2px"> +<p> + Here are some interesting resources and information useful to all + Apache committers. More information can be obtained from the + [EMAIL PROTECTED] mailing list. + </p> +<ul> + +<li> +<a href="http://www.apache.org/dev">Apache Developer Info</a> +</li> + +<li> +<a href="http://www.apache.org/dev/contributors.html">Contributors Tech Guide</a> +</li> + +<li> +<a href="http://www.apache.org/dev/committers.html">Committers FAQ</a> +</li> + +<li> +<a href="http://www.apache.org/dev/pmc.html">PMC FAQ</a> +</li> + +<li> +<a href="http://www.apache.org/dev/version-control.html">Version Control FAQ</a> +</li> + +<li> +<a href="http://www.apache.org/dev/machines.html">Machines List</a> +</li> + +</ul> +</div> + +<div class="attribution"></div> +</div> +</td><td width="10"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +<!--================= end Content==================--> +</table> +</td> +</tr> +</table> +<!--================= end Menu, NavBar, Content ==================--> +<!--================= start Footer ==================--> +<table summary="footer" cellspacing="0" cellpadding="0" width="100%" border="0"> +<tr> +<td colspan="2" height="1" bgcolor="#4C6C8F"><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"><a href="../skin/images/label.gif"></a><a href="../skin/images/page.gif"></a><a href="../skin/images/chapter.gif"></a><a href="../skin/images/chapter_open.gif"></a><a href="../skin/images/current.gif"></a><a href="/favicon.ico"></a></td> +</tr> +<tr> +<td colspan="2" bgcolor="#CFDCED" class="copyright" align="center"><font size="2" face="Arial, Helvetica, Sans-Serif">Copyright © + 2003-2004 The Apache Software Foundation. All rights reserved.<script type="text/javascript" language="JavaScript"><!-- + document.write(" - "+"Last Published: " + document.lastModified); + // --></script></font></td> +</tr> +<tr> +<td colspan="2" align="left" bgcolor="#CFDCED" class="logos"> +<div> +<img alt="" height="1" width="10" src="../skin/images/spacer.gif"></div> +</td> +</tr> +</table> +<!--================= end Footer ==================--> +</body> +</html> Added: cocoon/site/site/devinfo/releasing.html ============================================================================== --- (empty file) +++ cocoon/site/site/devinfo/releasing.html Thu Sep 30 23:08:59 2004 @@ -0,0 +1,695 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html> +<head> +<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>Howto Release Cocoon</title> +<link type="text/css" href="../skin/page.css" rel="stylesheet"> +</head> +<body text="#000000" bgcolor="#FFFFFF"> +<!--================= start Navigation Path ==================--> +<table summary="navigation path" width="100%" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td nowrap="nowrap" valign="middle" bgcolor="#CFDCED" height="20"><img height="1" width="5" alt="" src="../skin/images/spacer.gif" class="spacer"><!--===== breadcrumb trail (javascript-generated) ====--><font size="2" face="Arial, Helvetica, Sans-serif"><script src="../skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script></font></td> +</tr> +<tr> +<td bgcolor="#4C6C8F" height="2"><img height="2" width="2" alt="" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +</table> +<!--================= end Navigation Path ==================--> +<!--================= start Banner ==================--> +<table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0"> +<tr> +<!--================= start Group Logo ==================--> +<td bgcolor="#294563"><a href="http://cocoon.apache.org/"><img border="0" class="logoImage" alt="Apache Cocoon" src="../images/cocoon-project-logo.png"></a></td> +<!--================= end Group Logo ==================--> +<!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://cocoon.apache.org/"><img border="0" class="logoImage" alt="Apache Cocoon" src="../images/cocoon-logo.gif"></a></td> +<!--================= end Project Logo ==================--> +<!--================= start Search ==================--><td valign="top" rowspan="2" bgcolor="#294563"> +<form target="_blank" action="http://www.google.com/search" method="get"> +<table summary="search" border="0" cellspacing="0" cellpadding="0" bgcolor="#4C6C8F"> +<tr> +<td colspan="3"><img height="10" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +<tr> +<td><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td nowrap="nowrap"><input value="cocoon.apache.org" name="sitesearch" type="hidden"><input size="15" name="q" id="query" type="text"><img height="1" width="5" alt="" src="../skin/images/spacer.gif" class="spacer"><input name="Search" value="Search" type="submit"> +<br> +<font face="Arial, Helvetica, Sans-serif" size="2" color="white"> + the Apache Cocoon site + + + </font></td><td><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +<tr> +<td><img alt="" border="0" height="10" width="9" src="../skin/images/search-left.gif"></td><td><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td><img alt="" border="0" height="10" width="9" src="../skin/images/search-right.gif"></td> +</tr> +</table> +</form> +</td> +<!--================= start Search ==================--><td bgcolor="#294563"><img height="10" width="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +<tr> +<td valign="bottom" bgcolor="#294563" colspan="2"> +<!--================= start Tabs ==================--> +<div class="tab"> +<table summary="tab bar" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom"> +<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../index.html">Home</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td> +</tr> +</table> +</td> +</tr> +</table> +</div> +<!--================= end Tabs ==================--> +</td><td bgcolor="#294563"><img alt="" width="1" height="1" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +<tr> +<td bgcolor="#4C6C8F" colspan="4"><img width="1" height="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +</table> +<!--================= end Banner ==================--> +<!--================= start Menu, NavBar, Content ==================--> +<table summary="page content" bgcolor="#ffffff" width="100%" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td valign="top"> +<table summary="menu" border="0" cellspacing="0" cellpadding="0"> +<tr> +<!--================= start left top NavBar ==================--> +<td rowspan="3" valign="top"> +<table summary="blue line" border="0" cellpadding="0" cellspacing="0"> +<tr> +<td bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +<tr> +<td bgcolor="#CFDCED"><font color="#4C6C8F" size="4" face="Arial, Helvetica, Sans-serif"> </font></td> +</tr> +<tr> +<td bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +</table> +</td> +<!--================= end left top NavBar ==================--><td bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td valign="bottom" bgcolor="#4C6C8F"><img width="10" height="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td nowrap="nowrap" valign="top" bgcolor="#4C6C8F"> +<!--================= start Menu items ==================--> +<div class="menu"> +<ul> +<li> +<font color="#CFDCED">Navigation</font> +<ul> + +<li> +<a href="../index.html">Main</a> +</li> + +</ul> +</li> +<li> +<font color="#CFDCED">Developer Infos</font> +<ul> + +<li> +<a href="index.html">Overview</a> +</li> + +<li> +<span class="sel"><font color="#ffcc00">Releasing</font></span> +</li> + +</ul> +</li> +</ul> +</div> +<!--================= end Menu items ==================--> +</td><td valign="bottom" bgcolor="#4C6C8F"><img width="10" height="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +<tr> +<td valign="bottom" align="left" colspan="2" rowspan="2" bgcolor="#4C6C8F"><img height="10" width="10" border="0" alt="" src="../skin/images/menu-left.gif"></td><td bgcolor="#4C6C8F"><img height="10" width="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td valign="bottom" align="right" colspan="2" rowspan="2" bgcolor="#4C6C8F"><img height="10" width="10" border="0" alt="" src="../skin/images/menu-right.gif"></td> +</tr> +<tr> +<td height="1" bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +</table> +</td><td valign="top" width="100%"> +<table summary="content" width="100%" border="0" cellpadding="0" cellspacing="0"> +<!--================= start middle NavBar ==================--> +<tr> +<td colspan="4" bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +<tr> +<td align="left" width="10" bgcolor="#CFDCED"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td align="left" width="50%" bgcolor="#CFDCED"><font color="#4C6C8F" size="3" face="Arial, Helvetica, Sans-serif"> + + + </font><img width="10" height="8" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td align="right" width="50%" bgcolor="#CFDCED"><font color="#4C6C8F" size="3" face="Arial, Helvetica, Sans-serif"> + + + </font><img width="10" height="8" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td width="10" bgcolor="#CFDCED"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +<tr> +<td colspan="4" bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +<!--================= end middle NavBar ==================--> +<!--================= start Content==================--> +<tr> +<td align="left" width="10"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td colspan="2" align="left" width="100%"> +<div class="content"> +<table class="title" summary=""> +<tr> +<td valign="middle"> +<h1>Howto Release Cocoon</h1> +</td> +</tr> +</table> +<ul class="minitoc"> +<li> +<a href="#Overview">Overview</a> +</li> +<li> +<a href="#Naming+Conventions">Naming Conventions</a> +</li> +<li> +<a href="#The+Release+Process">The Release Process</a> +<ul class="minitoc"> +<li> +<a href="#Code+Freeze">Code Freeze</a> +</li> +<li> +<a href="#Test+Phase">Test Phase</a> +</li> +<li> +<a href="#Voting+the+release+tarball">Voting the release tarball</a> +</li> +<li> +<a href="#Starting+the+Release+Process">Starting the Release Process</a> +</li> +<li> +<a href="#Get+the+Version">Get the Version</a> +</li> +<li> +<a href="#Set+Correct+Version+Information">Set Correct Version Information</a> +</li> +<li> +<a href="#Exclude+unstable+blocks+from+the+default+build">Exclude unstable blocks from the default build</a> +</li> +<li> +<a href="#Build+the+Distrubtion">Build the Distrubtion</a> +</li> +<li> +<a href="#Test+the+distribution">Test the distribution</a> +</li> +<li> +<a href="#Decide+what+to+do+next">Decide what to do next</a> +</li> +<li> +<a href="#Continuing+the+Release+Process">Continuing the Release Process</a> +</li> +<li> +<a href="#Starting+the+Next+Version">Starting the Next Version</a> +</li> +<li> +<a href="#Signing+the+Release">Signing the Release</a> +</li> +<li> +<a href="#Bugtracking">Bugtracking</a> +</li> +<li> +<a href="#Uploading+the+Release">Uploading the Release</a> +</li> +<li> +<a href="#Announcement">Announcement</a> +</li> +<li> +<a href="#Take+a+break...">Take a break...</a> +</li> +<li> +<a href="#Update+mirror+page">Update mirror page</a> +</li> +<li> +<a href="#Create+the+announcement+mail">Create the announcement mail</a> +</li> +<li> +<a href="#Register+final+version">Register final version</a> +</li> +<li> +<a href="#Update+the+site+docs">Update the site docs</a> +</li> +<li> +<a href="#Enter+new+version">Enter new version</a> +</li> +</ul> +</li> +<li> +<a href="#Publishing+and+linking">Publishing and linking</a> +</li> +</ul> + +<a name="N1000C"></a><a name="Overview"></a> +<h3>Overview</h3> +<div style="margin-left: 0 ; border: 2px"> +<p> + This info is for Cocoon committers who need to distribute a new release of Cocoon + or any subproject of Cocoon. + </p> +</div> + +<a name="N10016"></a><a name="Naming+Conventions"></a> +<h3>Naming Conventions</h3> +<div style="margin-left: 0 ; border: 2px"> +<p> + The name of each downloadable archive should be named after the following + regular expression: + </p> +<pre class="code"> + cocoon(-SUBPROJECT)?-VERSION(-VARIANT)?-(src|bin).(zip|tar.gz) + </pre> +<p> + Where: + </p> +<ul> + +<li>SUBPROJECT is the name of the eventual subproject (optional)</li> + +<li>VERSION is a version string without dashes (ex. 2.1.5, 2.2m1...)</li> + +<li>VARIANT identifies the "type of distribution" (ex. win32, jdk12, linux, jdk14...) (optional)</li> + +</ul> +<p> + So, all our archives shall be called something like: + <em>cocoon-2.0.4-jdk14-bin.tar.gz</em> or <em>cocoon-2.1m1-src.zip</em> + and so on... + </p> +<p> + Subprojects apply to the same rule, except that of course they add their + project name before the version information. For example for Lenya, the + name should be along the lines of <em>cocoon-lenya-1.0-bin.tar.gz</em>. + </p> +</div> + +<a name="N10043"></a><a name="The+Release+Process"></a> +<h3>The Release Process</h3> +<div style="margin-left: 0 ; border: 2px"> +<p> + This is a step-by-step procedure that covers the last eight days before + the actual release date. + </p> +<a name="N1004C"></a><a name="Code+Freeze"></a> +<h4>Code Freeze</h4> +<div style="margin-left: 0 ; border: 2px"> +<p> + Prior to the release day, a code freeze should be announced approx. + eight days in advance. + </p> +</div> +<a name="N10056"></a><a name="Test+Phase"></a> +<h4>Test Phase</h4> +<div style="margin-left: 0 ; border: 2px"> +<p> + During the code freeze the whole Cocoon community is invited to test + test distribution, find and fix bugs and update the documentation. if + desired an invitation to the community to help in polishing the release + can be send out to the mailing lists. + </p> +</div> +<a name="N10060"></a><a name="Voting+the+release+tarball"></a> +<h4>Voting the release tarball</h4> +<div style="margin-left: 0 ; border: 2px"> +<p> + Three days before the actual release date, a release tarball is generated + and put on a publically reachable location. Now a vote is started for the + next 72h if this tarball can be used as the final release. This tarball + only differs in the version information. + </p> +<p> + During this period, no commits should alter the repository. + </p> +<p> + If the vote is accepted, the release process is started. If the vote fails, + it has to be decided what to do next. + </p> +</div> +<a name="N10070"></a><a name="Starting+the+Release+Process"></a> +<h4>Starting the Release Process</h4> +<div style="margin-left: 0 ; border: 2px"> +<p> + Send a simple mail to the developer list. This is in order to ensure that + noone will check in during the release process. If someone checks in + during the building, testing and tagging, the release process has to + be started at the beginning again. Otherwise the release version is + not the one tagged in CVS. + </p> +</div> +<a name="N1007A"></a><a name="Get+the+Version"></a> +<h4>Get the Version</h4> +<div style="margin-left: 0 ; border: 2px"> +<p> + Check-out a fresh copy from the cvs on a unix platform (this is important, + do not use windows!) + </p> +</div> +<a name="N10084"></a><a name="Set+Correct+Version+Information"></a> +<h4>Set Correct Version Information</h4> +<div style="margin-left: 0 ; border: 2px"> +<p> + Change the version information in <em>src/java/org/apache/cocoon/cocoon.properties</em> + by removing <em>-dev</em> and eventually add new release information like m1, b1 etc. + If this release is a final version, change the <em>released.version</em> info + to the new version as well. + </p> +<p> + And also change the version accordingly in <em>forrest.properties</em>. + But don't check-in this yet! + </p> +</div> +<a name="N1009D"></a><a name="Exclude+unstable+blocks+from+the+default+build"></a> +<h4>Exclude unstable blocks from the default build</h4> +<div style="margin-left: 0 ; border: 2px"> +<p> + Edit the blocks.properties file and exclude all unstable blocks. + Since it's a release they should not get compiled by default. + </p> +</div> +<a name="N100A7"></a><a name="Build+the+Distrubtion"></a> +<h4>Build the Distrubtion</h4> +<div style="margin-left: 0 ; border: 2px"> +<p> + Make sure that you make a clean build and that you are really not using windows: + </p> +<pre class="code"> +# ./build.sh clean-dist +# ./build.sh dist + </pre> +</div> +<a name="N100B6"></a><a name="Test+the+distribution"></a> +<h4>Test the distribution</h4> +<div style="margin-left: 0 ; border: 2px"> +<p> + Unarchive the build distribution and test it. These tests should include + different platforms (windows and unix) and different JDKs (1.3 and 1.4). + Testing includes building Cocoon from the release version and trying out the samples. + Please also run 'build test'. + </p> +</div> +<a name="N100C0"></a><a name="Decide+what+to+do+next"></a> +<h4>Decide what to do next</h4> +<div style="margin-left: 0 ; border: 2px"> +<p> + If any problem occurs during building and/or testing, you have to decide whether + this is a blocker and has to be fixed or if this problem can be ignored. + If it is a blocker, the problem must be fixed and after that you have to restart + at the beginning. This decision is a from case to case decision and it's + the release manager who decides if it's a blocker or not :) + </p> +</div> +<a name="N100CA"></a><a name="Continuing+the+Release+Process"></a> +<h4>Continuing the Release Process</h4> +<div style="margin-left: 0 ; border: 2px"> +<p> + Now check-in the changed version from the first step and tag the release in cvs. + Currently three files should have been changed in the last steps: + </p> +<ul> + +<li> +<em>src/java/org/apache/cocoon/cocoon.properties</em> : Version information</li> + +<li> +<em>forrest.properties</em> : Version information</li> + +<li> +<em>blocks.properties</em> : Disable unstable blocks</li> + +</ul> +<p> + Use RELEASE_{VERSION} as the tag for tagging the release, like RELEASE_2_1_5. + </p> +</div> +<a name="N100E9"></a><a name="Starting+the+Next+Version"></a> +<h4>Starting the Next Version</h4> +<div style="margin-left: 0 ; border: 2px"> +<p> + Change the version in <em>src/java/org/apache/cocoon/cocoon.properties</em> + by increasing the version information and adding "-dev" at the end, + for example 2.1m3-dev. + </p> +<p> + Change the version in <em>forrest.properties</em> to the same value. + </p> +<p> + Update the <em>blocks.properties</em> and enable all blocks that you have + disabled for the release. + </p> +<p> + Change <em>status.xml</em> by adding the release with proper version + and date and start a new release section with placeholders. Add a dummy + action here. + </p> +<p> + Check-in all these changes. + </p> +</div> +<a name="N1010B"></a><a name="Signing+the+Release"></a> +<h4>Signing the Release</h4> +<div style="margin-left: 0 ; border: 2px"> +<p> + Therefore you have to put your public key in the KEYS file (before the + starting the release process!). + In addition create a md5 file for the distribution + </p> +</div> +<a name="N10115"></a><a name="Bugtracking"></a> +<h4>Bugtracking</h4> +<div style="margin-left: 0 ; border: 2px"> +<p> + Enter the new version into bugzilla, so users can file entries against it. + </p> +</div> +<a name="N1011F"></a><a name="Uploading+the+Release"></a> +<h4>Uploading the Release</h4> +<div style="margin-left: 0 ; border: 2px"> +<p> + The only (ONLY) place where distributions shall reside is inside the + <em>/www/www.apache.org/dist/cocoon</em> on <em>www.apache.org</em>. + </p> +<p> + This directory contains three subdirectories: + </p> +<ul> + +<li>BINARIES: this is where the binary distribution tar/zipballs are located.</li> + +<li>SOURCES: this is where the source distribution tar/zipballs are located.</li> + +<li>OLD: all old and deprecated distributions.</li> + +</ul> +<p> + Upload the release (including signatures and MD5 files) + to <em>www.apache.org</em> and put it under <em>/www/www.apache.org/dist/cocoon</em> + into the correct directories (SOURCES and BINARIES). Make sure that you set + the permissions correctly. It's important to give the group write access! + </p> +<p> + Add/change the links from the cocoon directory to the new version in + the sources/binaries directory. Update the README.html and the HEADER.html. + For more information see below. + </p> +<p> + In the future, when other subprojects of Cocoon will start putting out their + own releases, new directories will be created under the top level directory, + with the same structure. For example the final directory will look something + like: + </p> +<pre class="code"> +www/www.apache.org/dist/cocoon/ +| ++- BINARIES/ +| | +| +- cocoon-2.0.3-bin.tar.gz +| | +| \- cocoon-2.0.4-bin.tar.gz +| ++- SOURCES/ +| | +| +- cocoon-2.0.3-src.tar.gz +| | +| +- cocoon-2.0.4-src.tar.gz +| | +| +- cocoon-2.1m1-src.tar.gz +| | +| \- cocoon-2.1m2-src.tar.gz +| ++- OLD/ +| | +| +- cocoon-1.8.1.tar.gz +| | +| \- cocoon-1.8.2.tar.gz +| ++- cocoon-latest-bin.tar.gz -> BINARIES/cocoon-2.0.4-bin.tar.gz +| ++- cocoon-latest-src.tar.gz -> SOURCES/cocoon-2.0.4-src.tar.gz +| ++- lenya/ +| | +| +- BINARIES/ +| | | +| | \- cocoon-lenya-1.0-bin.tar.gz +| | +| +- SOURCES/ +| | | +| | \- cocoon-lenya-1.0-src.tar.gz +| | +| +- cocoon-lenya-latest-bin.tar.gz -> BINARIES/cocoon-lenya-1.0-bin.tar.gz +| | +| \- cocoon-lenya-latest-src.tar.gz -> SOURCES/cocoon-lenya-1.0-src.tar.gz +| +\- license.txt + </pre> +</div> +<a name="N10152"></a><a name="Announcement"></a> +<h4>Announcement</h4> +<div style="margin-left: 0 ; border: 2px"> +<p> + Announce to the developer list that the release process is finished + and end a possible code freeze. + </p> +</div> +<a name="N1015C"></a><a name="Take+a+break..."></a> +<h4>Take a break...</h4> +<div style="margin-left: 0 ; border: 2px"> +<p> + Now wait for 24h so the mirror sites can pick up the new version. + You can have a look at <a href="http://www.apache.org/mirrors/">mirror info page</a> + to see the status of the mirrors. + </p> +</div> +<a name="N1016A"></a><a name="Update+mirror+page"></a> +<h4>Update mirror page</h4> +<div style="margin-left: 0 ; border: 2px"> +<p> + Change the mirror.html in the cocoon-site module as well and update this + single file on the website. For more information see below. + </p> +</div> +<a name="N10174"></a><a name="Create+the+announcement+mail"></a> +<h4>Create the announcement mail</h4> +<div style="margin-left: 0 ; border: 2px"> +<p> + Currently this is hand-typed (or copied) - we have to reinstall the + announcement target. Send this email to wherever appropriate. + Currently it goes to (dev at cocoon.apache.org, users at cocoon.apache.org, + general at xml.apache.org and announcements at xml.apache.org) + </p> +<p> + Remember that the locations to mention in any announcements when downloads + are involved is <em>http://cocoon.apache.org/mirror.cgi</em>. + So that people will actually __use__ the mirrors and not peg the Foundation's + bandwidth (which is quite expensive). + </p> +</div> +<a name="N10184"></a><a name="Register+final+version"></a> +<h4>Register final version</h4> +<div style="margin-left: 0 ; border: 2px"> +<p> + Enter a final version (no betas or milestones) into Freshmeat. + </p> +</div> +<a name="N1018E"></a><a name="Update+the+site+docs"></a> +<h4>Update the site docs</h4> +<div style="margin-left: 0 ; border: 2px"> +<p> + Update the site docs as described <a href="http://wiki.apache.org/cocoon/CocoonWebsiteUpdate">here</a>. + </p> +</div> +<a name="N1019C"></a><a name="Enter+new+version"></a> +<h4>Enter new version</h4> +<div style="margin-left: 0 ; border: 2px"> +<p> + Update the latest version on the <a href="http://wiki.apache.org/cocoon/LatestRelease">Wiki</a>. + </p> +</div> +</div> + +<a name="N101AA"></a><a name="Publishing+and+linking"></a> +<h3>Publishing and linking</h3> +<div style="margin-left: 0 ; border: 2px"> +<p> +Once the distribution ball is rolled following the naming convention and +copied in the appropriate directory as outlined above, make sure that the +following links are present (and only those links) in the root directory for +the project/subproject: + </p> +<p> +- A link to the latest released stable version for each tar/zipball: + for example, if the latest release is 2.0.4, and this release includes + 3 different balls, 2 for binaries and 1 for sources, the following + links must be done: + </p> +<pre class="code"> + # cd /www/www.apache.org/dist/cocoon + # ln -s BINARIES/cocoon-2.0.4-vm14-bin.tar.gz cocoon-2.0.4-vm14-bin.tar.gz + # ln -s BINARIES/cocoon-2.0.4-vm14-bin.zip cocoon-2.0.4-vm14-bin.zip + # ln -s BINARIES/cocoon-2.0.4-bin.tar.gz cocoon-2.0.4-bin.tar.gz + # ln -s BINARIES/cocoon-2.0.4-bin.zip cocoon-2.0.4-bin.zip + # ln -s SOURCES/cocoon-2.0.4-src.tar.gz cocoon-2.0.4-src.tar.gz + # ln -s SOURCES/cocoon-2.0.4-src.zip cocoon-2.0.4-src.zip + </pre> +<p> +- A link to the latest milestone version for each tar/zipball (if present): + for example, if 2.1m1 publishes only one ball, the source one: + </p> +<pre class="code"> + # cd /www/www.apache.org/dist/cocoon + # ln -s SOURCES/cocoon-2.1-src.tar.gz cocoon-2.1-src.tar.gz + # ln -s SOURCES/cocoon-2.1-src.zip cocoon-2.1-src.zip + </pre> +<p> +- A link to the LATEST STABLE DOWNLOADABLE with the "version" string + replaced by the "latest" keyword. If the above example of 2.0.4 is still + valid: + </p> +<pre class="code"> + # cd /www/www.apache.org/dist/cocoon + # ln -s BINARIES/ccoon-2.0.4-vm14-bin.tar.gz cocoon-latest-vm14-bin.tar.gz + # ln -s BINARIES/cocoon-2.0.4-vm14-bin.zip cocoon-latest-vm14-bin.zip + # ln -s BINARIES/cocoon-2.0.4-bin.tar.gz cocoon-latest-bin.tar.gz + # ln -s BINARIES/cocoon-2.0.4-bin.zip cocoon-latest-bin.zip + # ln -s SOURCES/cocoon-2.0.4-src.tar.gz cocoon-latest-src.tar.gz + # ln -s SOURCES/cocoon-2.0.4-src.zip cocoon-latest-src.zip + </pre> +<p> +Make sure to change the "latest version" strings and URLs in the README.html +and HEADER.html files in the /www/www.apache.org/dist/cocoon/ directory and +the mirror.html file in the /www/cocoon.apache.org/ directory. + </p> +</div> + +<div class="attribution"></div> +</div> +</td><td width="10"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td> +</tr> +<!--================= end Content==================--> +</table> +</td> +</tr> +</table> +<!--================= end Menu, NavBar, Content ==================--> +<!--================= start Footer ==================--> +<table summary="footer" cellspacing="0" cellpadding="0" width="100%" border="0"> +<tr> +<td colspan="2" height="1" bgcolor="#4C6C8F"><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"><a href="../skin/images/label.gif"></a><a href="../skin/images/page.gif"></a><a href="../skin/images/chapter.gif"></a><a href="../skin/images/chapter_open.gif"></a><a href="../skin/images/current.gif"></a><a href="/favicon.ico"></a></td> +</tr> +<tr> +<td colspan="2" bgcolor="#CFDCED" class="copyright" align="center"><font size="2" face="Arial, Helvetica, Sans-Serif">Copyright © + 2003-2004 The Apache Software Foundation. All rights reserved.<script type="text/javascript" language="JavaScript"><!-- + document.write(" - "+"Last Published: " + document.lastModified); + // --></script></font></td> +</tr> +<tr> +<td colspan="2" align="left" bgcolor="#CFDCED" class="logos"></td> +</tr> +</table> +<!--================= end Footer ==================--> +</body> +</html> Modified: cocoon/site/site/history.html ============================================================================== --- cocoon/site/site/history.html (original) +++ cocoon/site/site/history.html Thu Sep 30 23:08:59 2004 @@ -174,7 +174,7 @@ <ul> <li> -<a href="http://wiki.cocoondev.org/">Wiki docs</a> +<a href="http://wiki.apache.org/cocoon/">Wiki docs</a> </li> <li> @@ -228,6 +228,16 @@ <li> <a href="link/hosting.html">Cocoon Hosting</a> +</li> + +</ul> +</li> +<li> +<font color="#CFDCED">Developer Infos</font> +<ul> + +<li> +<a href="devinfo/index.html">Developer Infos</a> </li> </ul> Modified: cocoon/site/site/incubation.html ============================================================================== --- cocoon/site/site/incubation.html (original) +++ cocoon/site/site/incubation.html Thu Sep 30 23:08:59 2004 @@ -174,7 +174,7 @@ <ul> <li> -<a href="http://wiki.cocoondev.org/">Wiki docs</a> +<a href="http://wiki.apache.org/cocoon/">Wiki docs</a> </li> <li> @@ -228,6 +228,16 @@ <li> <a href="link/hosting.html">Cocoon Hosting</a> +</li> + +</ul> +</li> +<li> +<font color="#CFDCED">Developer Infos</font> +<ul> + +<li> +<a href="devinfo/index.html">Developer Infos</a> </li> </ul> Modified: cocoon/site/site/index.html ============================================================================== --- cocoon/site/site/index.html (original) +++ cocoon/site/site/index.html Thu Sep 30 23:08:59 2004 @@ -174,7 +174,7 @@ <ul> <li> -<a href="http://wiki.cocoondev.org/">Wiki docs</a> +<a href="http://wiki.apache.org/cocoon/">Wiki docs</a> </li> <li> @@ -232,6 +232,16 @@ </ul> </li> +<li> +<font color="#CFDCED">Developer Infos</font> +<ul> + +<li> +<a href="devinfo/index.html">Developer Infos</a> +</li> + +</ul> +</li> </ul> </div> <!--================= end Menu items ==================--> @@ -334,7 +344,7 @@ The documentation is located in each module and on the website under each specific Cocoon version. There is also the community effort to maintain the extensive - <a href="http://wiki.cocoondev.org/">Cocoon Wiki</a>. + <a href="http://wiki.apache.org/cocoon/">Cocoon Wiki</a>. </p> </div> Modified: cocoon/site/site/link/livesites-2.0.html ============================================================================== --- cocoon/site/site/link/livesites-2.0.html (original) +++ cocoon/site/site/link/livesites-2.0.html Thu Sep 30 23:08:59 2004 @@ -370,10 +370,13 @@ <li> <a href="http://www.stocklottery.com/">Stock Lottery</a> </li> + +<li> +<a href="http://www.projektinter.net/">projektinter.net</a> - Cocoon-based CMS, eCommerce, eBusiness and web-based GIS solution provider (German)</li> </ul> </div> -<a name="N100B8"></a><a name="Cocoon+2.0.3"></a> +<a name="N100BE"></a><a name="Cocoon+2.0.3"></a> <h4>Cocoon 2.0.3</h4> <div style="margin-left: 0 ; border: 2px"> <ul> @@ -431,7 +434,7 @@ </ul> </div> -<a name="N10110"></a><a name="Cocoon+2.0.2"></a> +<a name="N10116"></a><a name="Cocoon+2.0.2"></a> <h4>Cocoon 2.0.2</h4> <div style="margin-left: 0 ; border: 2px"> <ul> @@ -466,7 +469,7 @@ </ul> </div> -<a name="N1013C"></a><a name="unknown+version"></a> +<a name="N10142"></a><a name="unknown+version"></a> <h4>unknown version</h4> <div style="margin-left: 0 ; border: 2px"> <ul> @@ -532,7 +535,7 @@ </div> -<a name="N10193"></a><a name="How+to+get+listed"></a> +<a name="N10199"></a><a name="How+to+get+listed"></a> <h3>How to get listed</h3> <div style="margin-left: 0 ; border: 2px"> <p> Modified: cocoon/site/site/link/livesites-2.1.html ============================================================================== --- cocoon/site/site/link/livesites-2.1.html (original) +++ cocoon/site/site/link/livesites-2.1.html Thu Sep 30 23:08:59 2004 @@ -264,7 +264,7 @@ <a href="#How+to+get+listed">How to get listed</a> </li> </ul> - <!--<li><link href=""></link></li>--> + <!--<li><link href=""></link></li>--> <a name="N10015"></a><a name="Live+Sites+powered+by+Apache+Cocoon+2.1"></a> <h3>Live Sites powered by Apache Cocoon 2.1</h3> @@ -293,10 +293,27 @@ <li> <a href="http://www.computeractive.co.uk/">Computeractive - simple clear computer advice</a> </li> + +<li> +<a href="http://roetgesbuettel-info.de/">Rötgesbüttel</a>- a small town in Germany</li> + +<li> +<a href="http://www.zki.caf.dlr.de/">Center for Satellite Based Crisis Information (ZKI)</a> + - engaged in the acquisition, analysis and provision of satellite based + information products on natural disasters, for humanitarian relief + actions and in the context of civil security</li> + +<li> +<a href="http://www.coalfire.caf.dlr.de/">Coal Fire Research Project</a> + - a Sino-German Initiative to understand and combat the processes + leading to and influencing the development of coal fires in China.</li> + +<li> +<a href="http://www.learnkey.de/">LearnKey</a> - Computer Based Trainings, Lernprogramme für die MS Office Familie</li> </ul> </div> -<a name="N10043"></a><a name="Cocoon+2.1.4"></a> +<a name="N1005B"></a><a name="Cocoon+2.1.4"></a> <h4>Cocoon 2.1.4</h4> <div style="margin-left: 0 ; border: 2px"> <ul> @@ -308,7 +325,7 @@ <a href="http://www.olympic-plaza.com.ua/">Olympic Plaza Megamall, Kiev, Ukraine</a> (English, Russian)</li> <li> -<a href="http://commerce.wi.gov/">Wisconsin Department of Commerce</a> +<a href="http://commerce.wi.gov/housing/">Wisconsin Department of Commerce - Bureau of Housing</a> </li> <li> @@ -345,7 +362,7 @@ </ul> </div> -<a name="N10094"></a><a name="Cocoon+2.1.3"></a> +<a name="N100AC"></a><a name="Cocoon+2.1.3"></a> <h4>Cocoon 2.1.3</h4> <div style="margin-left: 0 ; border: 2px"> <ul> @@ -378,7 +395,7 @@ </ul> </div> -<a name="N100CB"></a><a name="Cocoon+2.1.2"></a> +<a name="N100E3"></a><a name="Cocoon+2.1.2"></a> <h4>Cocoon 2.1.2</h4> <div style="margin-left: 0 ; border: 2px"> <ul> @@ -409,7 +426,7 @@ </ul> </div> -<a name="N100F4"></a><a name="Cocoon+2.1.1"></a> +<a name="N1010C"></a><a name="Cocoon+2.1.1"></a> <h4>Cocoon 2.1.1</h4> <div style="margin-left: 0 ; border: 2px"> <ul> @@ -436,7 +453,7 @@ </ul> </div> -<a name="N10119"></a><a name="Cocoon+2.1"></a> +<a name="N10131"></a><a name="Cocoon+2.1"></a> <h4>Cocoon 2.1</h4> <div style="margin-left: 0 ; border: 2px"> <ul> @@ -461,7 +478,7 @@ </ul> </div> -<a name="N10148"></a><a name="Cocoon+2.1-dev"></a> +<a name="N10160"></a><a name="Cocoon+2.1-dev"></a> <h4>Cocoon 2.1-dev</h4> <div style="margin-left: 0 ; border: 2px"> <ul> @@ -514,7 +531,7 @@ </div> -<a name="N1018F"></a><a name="How+to+get+listed"></a> +<a name="N101A7"></a><a name="How+to+get+listed"></a> <h3>How to get listed</h3> <div style="margin-left: 0 ; border: 2px"> <p> Modified: cocoon/site/site/link/projects.html ============================================================================== --- cocoon/site/site/link/projects.html (original) +++ cocoon/site/site/link/projects.html Thu Sep 30 23:08:59 2004 @@ -318,11 +318,15 @@ <a href="http://xreporter.cocoondev.org/">xReporter</a> is an Avalon/Cocoon-based database reporting application that makes use of XML report definitions to produce HTML, CSV, Excel and PDF reports available across a web interface.</li> +<li> +<a href="http://cocoongallery.sourceforge.net/">CocoonGallery</a> is a Cocoon based photogallery mainly written in XSLT. +It makes it possible to publish images easily by just dropping them in a folder, thumbnails are generated on the fly.</li> + </ul> </div> -<a name="N10061"></a><a name="Cocoon-related+Projects"></a> +<a name="N10067"></a><a name="Cocoon-related+Projects"></a> <h3>Cocoon-related Projects</h3> <div style="margin-left: 0 ; border: 2px"> <ul> @@ -381,7 +385,7 @@ </div> -<a name="N1009B"></a><a name="How+to+get+listed"></a> +<a name="N100A1"></a><a name="How+to+get+listed"></a> <h3>How to get listed</h3> <div style="margin-left: 0 ; border: 2px"> <p> Modified: cocoon/site/site/link/sites.html ============================================================================== --- cocoon/site/site/link/sites.html (original) +++ cocoon/site/site/link/sites.html Thu Sep 30 23:08:59 2004 @@ -248,8 +248,8 @@ <ul> <li> -<a href="http://wiki.cocoondev.org/">CocoDocoWiki</a>, the Cocoon -Documentation Wiki.</li> +<a href="http://wiki.apache.org/cocoon/">Cocoon Wiki</a> +</li> <li> <a href="http://outerthought.net/">http://outerthought.net/</a> @@ -313,7 +313,7 @@ </div> -<a name="N10065"></a><a name="How+to+get+listed"></a> +<a name="N10064"></a><a name="How+to+get+listed"></a> <h3>How to get listed</h3> <div style="margin-left: 0 ; border: 2px"> <p> Modified: cocoon/site/site/news/archives.html ============================================================================== --- cocoon/site/site/news/archives.html (original) +++ cocoon/site/site/news/archives.html Thu Sep 30 23:08:59 2004 @@ -271,8 +271,9 @@ <a name="N1006F"></a><a name="Wiki+Moving"></a> <h3>Wiki Moving</h3> <div style="margin-left: 0 ; border: 2px"> -<p>The popular Cocoon Wiki has moved: <a href="http://wiki.cocoondev.org/">http://wiki.cocoondev.org/</a> is - the new place to be.</p> +<p>The popular Cocoon Wiki was hosted by <a href="http://www.cocoondev.org/">http://www.cocoondev.org/</a> + +</p> </div> <a name="N1007D"></a><a name="Cocoon+GetTogether"></a> @@ -299,7 +300,7 @@ <li> -<a href="http://wiki.cocoondev.org/">Cocoon Wiki</a> focuses on content development for the Cocoon project. It is designed to facilitate document development and collaboration from all levels of Cocoon users. Documents include FAQs, snippets, how-tos, tutorials, RTs (random thoughts), dreams, surveys, and more. The preliminary focus of this the wiki is to serve as a documentation "breeding ground," where docs can "grow" until mature enough to become official cvs docs. However, it already represents a lively and valid document resource in its own right. +<a href="http://wiki.apache.org/cocoon/">Cocoon Wiki</a> focuses on content development for the Cocoon project. It is designed to facilitate document development and collaboration from all levels of Cocoon users. Documents include FAQs, snippets, how-tos, tutorials, RTs (random thoughts), dreams, surveys, and more. The preliminary focus of this the wiki is to serve as a documentation "breeding ground," where docs can "grow" until mature enough to become official cvs docs. However, it already represents a lively and valid document resource in its own right. </li> <li> Modified: cocoon/site/site/news/index.html ============================================================================== --- cocoon/site/site/news/index.html (original) +++ cocoon/site/site/news/index.html Thu Sep 30 23:08:59 2004 @@ -158,6 +158,9 @@ </table> <ul class="minitoc"> <li> +<a href="#July+2004">July 2004</a> +</li> +<li> <a href="#May+2004">May 2004</a> </li> <li> @@ -181,23 +184,33 @@ </li> </ul> -<a name="N1000C"></a><a name="May+2004"></a> +<a name="N1000C"></a><a name="July+2004"></a> +<h3>July 2004</h3> +<div style="margin-left: 0 ; border: 2px"> +<p> + Released Cocoon 2.1.5.1 on July, 9th. The license was missing in + the original release of 2.1.5. This version is the same as 2.1.5 + but with the additional files. + </p> +</div> + +<a name="N10016"></a><a name="May+2004"></a> <h3>May 2004</h3> <div style="margin-left: 0 ; border: 2px"> <p>Released Cocoon 2.1.5 on May, 24th.</p> </div> -<a name="N10016"></a><a name="February+2004"></a> +<a name="N10020"></a><a name="February+2004"></a> <h3>February 2004</h3> <div style="margin-left: 0 ; border: 2px"> <p>Released Cocoon 2.1.4 on Feburary, 12th.</p> </div> -<a name="N10020"></a><a name="November+2003"></a> +<a name="N1002A"></a><a name="November+2003"></a> <h3>November 2003</h3> <div style="margin-left: 0 ; border: 2px"> <p>Released Cocoon 2.1.3 on November, 13th.</p> -<a name="N10029"></a><a name="ApacheCon+US+2003"></a> +<a name="N10033"></a><a name="ApacheCon+US+2003"></a> <h4>ApacheCon US 2003</h4> <div style="margin-left: 0 ; border: 2px"> <p> @@ -207,10 +220,10 @@ </div> </div> -<a name="N10038"></a><a name="October+2003"></a> +<a name="N10042"></a><a name="October+2003"></a> <h3>October 2003</h3> <div style="margin-left: 0 ; border: 2px"> -<a name="N1003E"></a><a name="Cocoon+GetTogether+2003"></a> +<a name="N10048"></a><a name="Cocoon+GetTogether+2003"></a> <h4>Cocoon GetTogether 2003</h4> <div style="margin-left: 0 ; border: 2px"> <p> Modified: cocoon/site/site/skin/page.css ============================================================================== --- cocoon/site/site/skin/page.css (original) +++ cocoon/site/site/skin/page.css Thu Sep 30 23:08:59 2004 @@ -45,12 +45,13 @@ .note { border: solid 1px #7099C5; background-color: #f0f0ff; } .note .label { background-color: #7099C5; color: #ffffff; } +.note .label { background-color: #7099C5; color: #ffffff; padding: 5px 5px 5px 10px; } .warning { border: solid 1px #D00000; background-color: #fff0f0; } -.warning .label { background-color: #D00000; color: #ffffff; } +.warning .label { background-color: #D00000; color: #ffffff; padding: 5px 5px 5px 10px; } .fixme { border: solid 1px #C6C600; background-color: #FAF9C3; } -.fixme .label { background-color: #C6C600; color: #ffffff; } +.fixme .label { background-color: #C6C600; color: #ffffff; padding: 5px 5px 5px 10px; } .code { border-color: #CFDCED; border-style: solid; border-width: 1px; } .codefrag { font-family: "Courier New", Courier, monospace; } Modified: cocoon/site/site/versioning.html ============================================================================== --- cocoon/site/site/versioning.html (original) +++ cocoon/site/site/versioning.html Thu Sep 30 23:08:59 2004 @@ -174,7 +174,7 @@ <ul> <li> -<a href="http://wiki.cocoondev.org/">Wiki docs</a> +<a href="http://wiki.apache.org/cocoon/">Wiki docs</a> </li> <li> @@ -228,6 +228,16 @@ <li> <a href="link/hosting.html">Cocoon Hosting</a> +</li> + +</ul> +</li> +<li> +<font color="#CFDCED">Developer Infos</font> +<ul> + +<li> +<a href="devinfo/index.html">Developer Infos</a> </li> </ul> Modified: cocoon/site/site/whoweare.html ============================================================================== --- cocoon/site/site/whoweare.html (original) +++ cocoon/site/site/whoweare.html Thu Sep 30 23:08:59 2004 @@ -174,7 +174,7 @@ <ul> <li> -<a href="http://wiki.cocoondev.org/">Wiki docs</a> +<a href="http://wiki.apache.org/cocoon/">Wiki docs</a> </li> <li> @@ -232,6 +232,16 @@ </ul> </li> +<li> +<font color="#CFDCED">Developer Infos</font> +<ul> + +<li> +<a href="devinfo/index.html">Developer Infos</a> +</li> + +</ul> +</li> </ul> </div> <!--================= end Menu items ==================--> @@ -290,6 +300,12 @@ <li>Nicola Ken Barozzi</li> +<li>Ugo Cei</li> + + +<li>Tony Collen</li> + + <li>Marcus Crafter</li> @@ -317,19 +333,19 @@ <li>Joerg Heinicke</li> -<li>Geoff Howard</li> +<li>Unico Hommes</li> -<li>Bernhard Huber</li> +<li>Geoff Howard</li> -<li>Ivelin Ivanov</li> +<li>Bernhard Huber</li> <li>Matthew Langham</li> -<li>Berin Loritsch</li> +<li>Timothy Larson</li> <li>Stefano Mazzocchi</li> @@ -338,22 +354,16 @@ <li>Michael Melhem</li> -<li>John Morrison</li> - - <li>Steven Noels</li> -<li>Andrew C. Oliver</li> - - <li>Giacomo Pati</li> -<li>Konstantin Piroumian</li> +<li>Reinhard Poetz</li> -<li>Ovidiu Predescu</li> +<li>Marc Portier</li> <li>Jeremy Quinn</li> @@ -366,12 +376,9 @@ <li>Andrew Savory</li> - -<li>Diana Shannon</li> - -<li>Jeff Turner</li> +<li>Upayavira</li> <li>Sylvain Wallez</li> @@ -386,7 +393,7 @@ <p>The Cocoon PMC can be contacted at <span class="codefrag">pmc<at>cocoon.apache.org</span> - and is currently chaired by Steven Noels.</p> + and is currently chaired by Sylvain Wallez.</p> <div class="attribution"></div> </div>