You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2010/04/29 19:34:20 UTC

svn commit: r939398 - /geronimo/site/trunk/template/GMOxSITE_autoexport_template.xml

Author: jbohn
Date: Thu Apr 29 17:34:20 2010
New Revision: 939398

URL: http://svn.apache.org/viewvc?rev=939398&view=rev
Log:
updates to autoexport template necessary to get content rendering again after upgrade in confluence and new custom autoexport plugin was added - mostly inlining of the macros due to a current Velocity issue

Modified:
    geronimo/site/trunk/template/GMOxSITE_autoexport_template.xml

Modified: geronimo/site/trunk/template/GMOxSITE_autoexport_template.xml
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/template/GMOxSITE_autoexport_template.xml?rev=939398&r1=939397&r2=939398&view=diff
==============================================================================
--- geronimo/site/trunk/template/GMOxSITE_autoexport_template.xml (original)
+++ geronimo/site/trunk/template/GMOxSITE_autoexport_template.xml Thu Apr 29 17:34:20 2010
@@ -1,339 +1,27 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-##
-#set ($images = "http://geronimo.apache.org/images")
-#set ($siteroot = "http://geronimo.apache.org")
-#set ($pageContentHeaderEnabled = false)
-##
-#macro (spacer $width $height)
-    ##
-    ## Note: Replaced the spacer.gif with a table because IE wont honor the image height
-    ## 
-    ## <img src="$images/spacer.gif" width="$width" height="$height" border="0">
-    ##
-    <table> <!-- spacer -->
-        <tr>
-            <td width="$width" height="$height"></td>
-        </tr>
-    </table>
-#end
-##
-#macro (renderPage $title)
-    #set($globalHelper = $action.getGlobalHelper())
-    #set($renderer = $globalHelper.getWikiStyleRenderer())
-    
-    ##
-    ## FIXME: Must be a more efficient way to find a page...
-    ##
-    
-    #foreach ($child in $page.space.pages)
-        #if ($child.title.equals($title))
-            #set ($content = $renderer.convertWikiToXHtml($child.toPageContext(), $child.content).trim())
-            
-            ##
-            ## HACK: Remove the leading <P> and trailing </P>
-            ##
-            
-            #set ($content = $content.substring(3, $content.length()))
-            #set ($end = $content.length() - 4)
-            #set ($content = $content.substring(0, $end))
-            
-            $content
-        #end
-    #end
-#end
-##
-#macro (topNav)
-    <table valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="$images/header_bg_1x86.gif">
-        <tr>
-            <td valing="top" align="left">
-                <a href="$siteroot"><img src="$images/topleft_logo_437x64.gif" border="0"></a>
-            </td>
-            
-            <td width="100%">
-                &nbsp;
-            </td>
-            <!-- Adds the edit page link to the top banner-->
-            <td valign="bottom">
-                <div style="padding: 2px 10px; margin: 0px;">
-                    <a href="$confluenceUri/pages/editpage.action?pageId=$page.id">
-                    <img src="http://geronimo.apache.org/images/notep_16_blue.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page" alt="Edit Page"></a>
-                </div>
-            </td>
-##
-## NOTE: Turn off the top-nav links
-##
-##            <td valign="top" align="right">
-##                <img src="$images/subnav_angle_15x18.gif" width="15" height="18" alt="" border="0">
-##            </td>
-##            
-##            <td valign="top" align="right" nowrap="true">
-##                <div class="quicklinks" style="background-color: #5D9ACD">
-##                    #spacer(1 14)
-##                    <font color="#003366" face="Verdana, Helvetica, Arial">
-##                        #renderPage("Overview")
-##                    </font>
-##                    #spacer(4 1)    
-##                </div>
-##            </td>
-        </tr>
-    </table>
-#end
-##
-#macro (pageControls)
-   <div align="right" style="padding: 2px 10px; margin: 0px;">
-        <a href="$confluenceUri/pages/editpage.action?pageId=$page.id">
-            <img src="http://geronimo.apache.org/images/notep_16_blue.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page" alt="Edit Page"></a>
-##
-## NOTE: Turn off the browse/add page links
-##
-##        &nbsp;
-##        <a href="$confluenceUri/pages/listpages.action?key=$page.spaceKey">
-##            <img src="$images/icons/browse_space.gif" border="0" align="absmiddle" title="Browse Space"></a>
-##        &nbsp;
-##        <a href="$confluenceUri/pages/createpage.action?spaceKey=$page.spaceKey&fromPageId=$page.id">
-##            <img src="$images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
-
-        &nbsp;
-        ###
-        ### HACK: AutoExport does something crazy to this URL... so split it up into bits and write with Javascript
-        ###       to force the correct values to be rendererd
-        ###
-        ###
-        ###  Turned off printing and PDF export
-        ###
-        ###    <script type="text/javascript" language="javascript">
-        ###        document.write('<a href="$confluenceUri/pages/viewpage');
-        ###        document.write('.action?pageId=$page.id&decorator=printable">');
-        ###    </script>
-        ###    <img src="http://cwiki.apache.org/confluence/images/icons/print_16.gif" height="16" width="16" border="0" align="absmiddle" title="Print"></a>
-        ### &nbsp;
-        ### <a href="$confluenceUri/pages/doexportpage.action?pageId=$page.id&type=TYPE_PDF">
-        ###    <img src="http://cwiki.apache.org/confluence/images/icons/attachments/pdf.gif" height="16" width="16" border="0" align="absmiddle" title="Export PDF"></a>
-    
-   </div>
-#end
-##
-## #macro (tabs)
-## 
-## Turn off tabs, no longer in use.
-## <table valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="$images/menu_bgstretch_1x22.gif">
-##         <tr align="left">
-##             <td valign="top" align="left">
-##                 <a href="$siteroot/index.html">
-##                     <img src="$images/menu_home_off_63x19.gif" width="63" height="19" border="0"></a>
-##             </td>
-##             <td valign="top" align="left">
-##                 <a href="$siteroot/documentation.html">
-##                     <img src="$images/menu_doc_off_116x19.gif" width="116" height="19" border="0"></a>
-##             </td>
-##             <td valign="top" align="left">
-##                 <a href="$siteroot/downloads.html">
-##                     <img src="$images/menu_download_off_85x19.gif" width="85" height="19" border="0"></a>
-##             </td>
-##             <td valign="top" align="left">
-##                 <a href="$siteroot/get-involved.html">
-##                     <img src="$images/menu_comm_off_96x19.gif" width="96" height="19" border="0"></a>
-##             </td>
-##             <td valign="top" align="left">
-##                 <a href="$siteroot/development.html">
-##                     <img src="$images/menu_dev_off_104x19.gif" width="104" height="19" border="0"></a>
-##             </td>
-##             <td width="100%" align="right">
-##                 #pageControls()
-##             </td>
-##         </tr>
-##     </table>
-## #end
-##
-#macro (breadCrumbs)
-    <table border="0" cellpadding="2" cellspacing="0" width="100%">
-        <tr class="topBar">
-            <td align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
-                &nbsp;$autoexport.breadcrumbs($page)
-            </td>
-            
-            <td align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
-            <a href="http://n3.nabble.com/Users-f328036.html">User List</a> | <a href="http://n3.nabble.com/Development-f342155.html">Dev List</a> | <a href="http://cwiki.apache.org/geronimo">Wiki</a> | <a href="http://issues.apache.org/jira/browse/GERONIMO">Issue Tracker</a>&nbsp;&nbsp;
-            </td>
-        </tr>
-    </table>
-#end
-##
-#macro (sideNavSection $title)
-    #set ($pagename = "SideNav $title")
-    
-    <table bgcolor="#5FA3D6" border="0" cellspacing="1" cellpadding="0">
-        <tr>
-            <td>
-                <table border="0" cellspacing="0" cellpadding="4">
-                    <tr>
-                        <td class="sideNavSectionTitle" bgcolor="#5FA3D6" width="175">
-                            <font color="#FFFFFF" style="font-size:12px" face="Verdana, Helvetica, Arial">
-                                <strong>&nbsp; $title</strong>
-                            </font>
-                        </td>
-                    </tr>
-                    
-                    <tr>
-                        <td bgcolor="#F3F4F5">
-                            <table>
-                                <tr>
-                                    <td width="8"></td>
-                                    <td align="left" width="100%">#renderPage($pagename)</td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </td>
-        </tr>
-    </table>
-    
-    #spacer(175 2)
-#end
-##
-#macro (sideNav)
-    #sideNavSection("Overview")
-    <table bgcolor="#5fa3d6" border="0" cellpadding="0" cellspacing="1">
-        <tbody>
-		    <tr>
-			    <td>
-					<table border="0" cellpadding="4" cellspacing="0">
-						<tbody><tr>
-                            <td class="sideNavSectionTitle" bgcolor="#5fa3d6" width="175">
-                                <font style="font-size: 12px;" color="#ffffff" face="Verdana, Helvetica, Arial">
-                                    <strong>&nbsp; Search</strong>
-								</font>
-							</td>
-						</tr>
-						<tr>
-							<td bgcolor="#f3f4f5">
-								<table>
-									<tbody>
-										<tr>
-											<td width="8"></td>
-											<td align="center" width="100%">
-												<FORM action="http://www.google.com/search" method="get" style="font-size: 10px;">
-													<INPUT name="ie" type="hidden" value="UTF-8"></INPUT>
-													<INPUT name="oe" type="hidden" value="UTF-8"></INPUT>
-													<INPUT name="domains" type="hidden" value="geronimo.apache.org"></INPUT>
-													<INPUT name="sitesearch" type="hidden" value="geronimo.apache.org"></INPUT>
-													<INPUT maxlength="255" name="q" style="width: 110px;" type="text"></INPUT>
-													<INPUT type="image" src="$images/icons/srch_16.gif" alt="[search]" name="btnG"></INPUT>
-													
-												</FORM>
-												<div class="grayed">
-												    Powered by Google Search
-												</div>
-											</td>
-										</tr>
-									</tbody>
-								</table>
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
-		</tbody>
-	</table>
-    #spacer(175 2)
-    #sideNavSection("Community")
-    #sideNavSection("Development")
-    #sideNavSection("Subprojects")
-#end
-##
-#macro (pageContent)
-    <div id="PageContent">
-        #if ($pageContentHeaderEnabled)
-            <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-                <div style="margin: 0px 10px 0px 10px" class="smalltext">$page.space.name</div>
-                <div style="margin: 0px 10px 8px 10px" class="pagetitle">$page.title</div>
-            </div>
-        #end
-        
-        <div class="pagecontent">
-            <div class="wiki-content">
-                $body
-            </div>
-        </div>
-    </div>
-#end
-##
-#macro (rss)
-    <!-- RSS feed links -->
-    <div>
-      #spacer(25 15)
-    </div>
-
-    <table border="0" cellspacing="4px">
-      <!-- News feed -->
-      <tr>
-        <td align="right">
-          <a href="http://cwiki.apache.org/confluence/spaces/blogrss.action?key=GMOxSITE"><img src="$images/rss.gif" border="0" alt="RSS"></a>
-        </td>
-        <td align="left">
-          <a href="http://cwiki.apache.org/confluence/spaces/blogrss.action?key=GMOxSITE">News</a>
-        </td>
-      </tr>
-      <!-- Site feed -->
-      <tr>
-        <td align="right">
-          <a href="http://cwiki.apache.org/confluence/spaces/rss.action?key=GMOxSITE&newPages=false"><img src="$images/rss.gif" border="0" alt="RSS"></a>
-        </td>
-        <td align="left">
-          <a href="http://cwiki.apache.org/confluence/spaces/rss.action?key=GMOxSITE&newPages=false">Site Changes</a>
-        </td>
-      </tr>
-      <!-- User feed -->
-      <tr>
-        <td align="right">
-          <a href="http://n3.nabble.com/Users-f328036.html"><img src="$images/xml.gif" border="0" alt=ATOM"></a>
-        </td>
-        <td align="left">
-          <a href="http://n3.nabble.com/Users-f328036.html">User Mailing List</a>
-        </td>
-      </tr>
-      <!-- Dev feed -->
-      <tr>
-        <td align="right">
-          <a href="http://n3.nabble.com/Development-f342155.html"><img src="$images/xml.gif" border="0" alt="ATOM"></a>
-        </td>
-        <td align="left">
-          <a href="http://n3.nabble.com/Development-f342155.html">Developer Mailing List</a>
-        </td>
-      </tr>
-    </table>
-#end
-##
-#macro (footer)
-    <!-- footer -->
-    <table border="0" cellpadding="2" cellspacing="0" width="100%"">
-        <tr>
-          <td align="left" valign="middle" class="footer">
-            &nbsp;&nbsp;
-            <img src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious" />
-            <a href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&amp;noui&amp;jump=close&amp;url='+encodeURIComponent(location.href)+'&amp;title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</a>
-            &nbsp;&nbsp;
-            <img src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!" />
-            <a href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&amp;title='+encodeURIComponent(document.title)+'&amp;topic=software');">Digg this</a>
-            <!-- Slicker, but no text
-            <script type="text/javascript">
-              digg_skin = 'icon';
-              digg_window = 'new';
-              digg_title = 'Apache Geronimo : $page.title';
-              digg_topic = 'software';
-            </script>
-            <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
-            -->
-            &nbsp;&nbsp;
-          </td>
-          <td align="right" valign="middle" class="footer">
-            <a href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</a>&nbsp;&nbsp;-&nbsp;&nbsp;
-            Copyright &#169; 2003-2010, The Apache Software Foundation, Licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</a>&nbsp;&nbsp;
-          </td>
-        </tr>
-    </table> 
-#end
+#set($images = "http://geronimo.apache.org/images")
+#set($siteroot = "http://geronimo.apache.org")
+#set($pageContentHeaderEnabled = false)
+#set($globalHelper = $action.getHelper())
+#set($renderer = $globalHelper.getWikiStyleRenderer())
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements. See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License. You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
 ##
 <html lang="en">
   <head>
@@ -360,7 +48,56 @@
     
     <body onload="init()">
         
-        #topNav()
+        <table valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="$images/header_bg_1x86.gif">
+            <tr>
+                <td valing="top" align="left">
+                    <a href="$siteroot"><img src="$images/topleft_logo_437x64.gif" border="0"></a>
+                </td>
+                
+                <td width="100%">
+                    &nbsp;
+                </td>
+                <!-- Adds the edit page link to the top banner-->
+                <td valign="bottom">
+                    <div style="padding: 2px 10px; margin: 0px;">
+                        <a href="$confluenceUri/pages/editpage.action?pageId=$page.id">
+                        <img src="http://geronimo.apache.org/images/notep_16_blue.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page" alt="Edit Page"></a>
+                    </div>
+                </td>
+    ##
+    ## NOTE: Turn off the top-nav links
+    ##
+    ##            <td valign="top" align="right">
+    ##                <img src="$images/subnav_angle_15x18.gif" width="15" height="18" alt="" border="0">
+    ##            </td>
+    ##            
+    ##            <td valign="top" align="right" nowrap="true">
+    ##                <div class="quicklinks" style="background-color: #5D9ACD">
+    ##                    <table> <!-- spacer -->
+    ##                        <tr>
+    ##                            <td width="1" height="14"></td>
+    ##                        </tr>
+    ##                    </table>
+    ##                    <font color="#003366" face="Verdana, Helvetica, Arial">
+    ##                        #set($child = $pageManager.getPage($page.space.key,"Overview"))
+    ##                        #set($content = $renderer.convertWikiToXHtml($child.toPageContext(), $child.content).trim())
+    ##                        ##
+    ##                        ## HACK: Remove the leading <P> and trailing </P>
+    ##                        ##
+    ##                        #set ($content = $content.substring(3, $content.length()))
+    ##                        #set ($end = $content.length() - 4)
+    ##                        #set ($content = $content.substring(0, $end))
+    ##                        $content
+    ##                    </font>
+    ##                    <table> <!-- spacer -->
+    ##                        <tr>
+    ##                            <td width="4" height="1"></td>
+    ##                        </tr>
+    ##                    </table>
+    ##                </div>
+    ##            </td>
+            </tr>
+        </table>
 
 ##
 ## NOTE: Disable tabs
@@ -368,27 +105,345 @@
 ##        #tabs()
 ##
 
-        #breadCrumbs()
+        <table border="0" cellpadding="2" cellspacing="0" width="100%">
+            <tr class="topBar">
+                <td align="left" valign="middle" class="topBarDiv" nowrap="true" width="100%">
+                    &nbsp;$autoexport.breadcrumbs($page)
+                </td>
+                
+                <td align="right" valign="middle" class="topBarDiv" align="left" nowrap="true">
+                <a href="http://n3.nabble.com/Users-f328036.html">User List</a> | <a href="http://n3.nabble.com/Development-f342155.html">Dev List</a> | <a href="http://cwiki.apache.org/geronimo">Wiki</a> | <a href="http://issues.apache.org/jira/browse/GERONIMO">Issue Tracker</a>&nbsp;&nbsp;
+                </td>
+            </tr>
+        </table>
 
         <table border="0" cellpadding="4" width="100%" bgcolor="#FFFFFF">
             <tr>
                 <td valign="top" nowrap="true" width="175">
-                    #sideNav()
+                    #set ($title = "Overview")
+                    #set ($pagename = "SideNav $title")
+                    <table bgcolor="#5FA3D6" border="0" cellspacing="1" cellpadding="0">
+                        <tr>
+                            <td>
+                                <table border="0" cellspacing="0" cellpadding="4">
+                                    <tr>
+                                        <td class="sideNavSectionTitle" bgcolor="#5FA3D6" width="175">
+                                            <font color="#FFFFFF" style="font-size:12px" face="Verdana, Helvetica, Arial">
+                                                <strong>&nbsp; $title</strong>
+                                            </font>
+                                        </td>
+                                    </tr>
+                                    
+                                    <tr>
+                                        <td bgcolor="#F3F4F5">
+                                            <table>
+                                                <tr>
+                                                    <td width="8"></td>
+                                                    <td align="left" width="100%">
+                                                        #set($child = $pageManager.getPage($page.space.key,$pagename))
+                                                        #set($content = $renderer.convertWikiToXHtml($child.toPageContext(), $child.content).trim())
+                                                        ##
+                                                        ## HACK: Remove the leading <P> and trailing </P>
+                                                        ##
+                                                        #set ($content = $content.substring(3, $content.length()))
+                                                        #set ($end = $content.length() - 4)
+                                                        #set ($content = $content.substring(0, $end))
+                                                        $content
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
+                    <table> <!-- spacer -->
+                        <tr>
+                            <td width="175" height="2"></td>
+                        </tr>
+                    </table>
+
+
+                    <table bgcolor="#5fa3d6" border="0" cellpadding="0" cellspacing="1">
+                        <tbody>
+                		    <tr>
+                			    <td>
+                					<table border="0" cellpadding="4" cellspacing="0">
+                						<tbody><tr>
+                                            <td class="sideNavSectionTitle" bgcolor="#5fa3d6" width="175">
+                                                <font style="font-size: 12px;" color="#ffffff" face="Verdana, Helvetica, Arial">
+                                                    <strong>&nbsp; Search</strong>
+                								</font>
+                							</td>
+                						</tr>
+                						<tr>
+                							<td bgcolor="#f3f4f5">
+                								<table>
+                									<tbody>
+                										<tr>
+                											<td width="8"></td>
+                											<td align="center" width="100%">
+                												<FORM action="http://www.google.com/search" method="get" style="font-size: 10px;">
+                													<INPUT name="ie" type="hidden" value="UTF-8"></INPUT>
+                													<INPUT name="oe" type="hidden" value="UTF-8"></INPUT>
+                													<INPUT name="domains" type="hidden" value="geronimo.apache.org"></INPUT>
+                													<INPUT name="sitesearch" type="hidden" value="geronimo.apache.org"></INPUT>
+                													<INPUT maxlength="255" name="q" style="width: 110px;" type="text"></INPUT>
+                													<INPUT type="image" src="$images/icons/srch_16.gif" alt="[search]" name="btnG"></INPUT>
+                													
+                												</FORM>
+                												<div class="grayed">
+                												    Powered by Google Search
+                												</div>
+                											</td>
+                										</tr>
+                									</tbody>
+                								</table>
+                							</td>
+                						</tr>
+                					</table>
+                				</td>
+                			</tr>
+                		</tbody>
+                	</table>
+                    <table> <!-- spacer -->
+                        <tr>
+                            <td width="175" height="2"></td>
+                        </tr>
+                    </table>
+                    #set ($title = "Community")
+                    #set ($pagename = "SideNav $title")
+                    <table bgcolor="#5FA3D6" border="0" cellspacing="1" cellpadding="0">
+                        <tr>
+                            <td>
+                                <table border="0" cellspacing="0" cellpadding="4">
+                                    <tr>
+                                        <td class="sideNavSectionTitle" bgcolor="#5FA3D6" width="175">
+                                            <font color="#FFFFFF" style="font-size:12px" face="Verdana, Helvetica, Arial">
+                                                <strong>&nbsp; $title</strong>
+                                            </font>
+                                        </td>
+                                    </tr>
+                                    
+                                    <tr>
+                                        <td bgcolor="#F3F4F5">
+                                            <table>
+                                                <tr>
+                                                    <td width="8"></td>
+                                                    <td align="left" width="100%">
+                                                        #set($child = $pageManager.getPage($page.space.key,$pagename))
+                                                        #set($content = $renderer.convertWikiToXHtml($child.toPageContext(), $child.content).trim())
+                                                        ##
+                                                        ## HACK: Remove the leading <P> and trailing </P>
+                                                        ##
+                                                        #set ($content = $content.substring(3, $content.length()))
+                                                        #set ($end = $content.length() - 4)
+                                                        #set ($content = $content.substring(0, $end))
+                                                        $content
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
+                    <table> <!-- spacer -->
+                        <tr>
+                            <td width="175" height="2"></td>
+                        </tr>
+                    </table>
+
+                    #set ($title = "Development")
+                    #set ($pagename = "SideNav $title")
+                    <table bgcolor="#5FA3D6" border="0" cellspacing="1" cellpadding="0">
+                        <tr>
+                            <td>
+                                <table border="0" cellspacing="0" cellpadding="4">
+                                    <tr>
+                                        <td class="sideNavSectionTitle" bgcolor="#5FA3D6" width="175">
+                                            <font color="#FFFFFF" style="font-size:12px" face="Verdana, Helvetica, Arial">
+                                                <strong>&nbsp; $title</strong>
+                                            </font>
+                                        </td>
+                                    </tr>
+                                    
+                                    <tr>
+                                        <td bgcolor="#F3F4F5">
+                                            <table>
+                                                <tr>
+                                                    <td width="8"></td>
+                                                    <td align="left" width="100%">
+                                                        #set($child = $pageManager.getPage($page.space.key,$pagename))
+                                                        #set($content = $renderer.convertWikiToXHtml($child.toPageContext(), $child.content).trim())
+                                                        ##
+                                                        ## HACK: Remove the leading <P> and trailing </P>
+                                                        ##
+                                                        #set ($content = $content.substring(3, $content.length()))
+                                                        #set ($end = $content.length() - 4)
+                                                        #set ($content = $content.substring(0, $end))
+                                                        $content
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
+                    <table> <!-- spacer -->
+                        <tr>
+                            <td width="175" height="2"></td>
+                        </tr>
+                    </table>
+
+                    #set ($title = "Subprojects")
+                    #set ($pagename = "SideNav $title")
+                    <table bgcolor="#5FA3D6" border="0" cellspacing="1" cellpadding="0">
+                        <tr>
+                            <td>
+                                <table border="0" cellspacing="0" cellpadding="4">
+                                    <tr>
+                                        <td class="sideNavSectionTitle" bgcolor="#5FA3D6" width="175">
+                                            <font color="#FFFFFF" style="font-size:12px" face="Verdana, Helvetica, Arial">
+                                                <strong>&nbsp; $title</strong>
+                                            </font>
+                                        </td>
+                                    </tr>
+                                    
+                                    <tr>
+                                        <td bgcolor="#F3F4F5">
+                                            <table>
+                                                <tr>
+                                                    <td width="8"></td>
+                                                    <td align="left" width="100%">
+                                                        #set($child = $pageManager.getPage($page.space.key,$pagename))
+                                                        #set($content = $renderer.convertWikiToXHtml($child.toPageContext(), $child.content).trim())
+                                                        ##
+                                                        ## HACK: Remove the leading <P> and trailing </P>
+                                                        ##
+                                                        #set ($content = $content.substring(3, $content.length()))
+                                                        #set ($end = $content.length() - 4)
+                                                        #set ($content = $content.substring(0, $end))
+                                                        $content
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
+                    <table> <!-- spacer -->
+                        <tr>
+                            <td width="175" height="2"></td>
+                        </tr>
+                    </table>
+
                     
                     <div class="gfxbyepiq">
                         <a href="http://www.epiqtech.com">Graphics by Epiq</a>
                     </div>
 
-                    #rss()
+                    <!-- RSS feed links -->
+                    <div>
+                      <table> <!-- spacer -->
+                          <tr>
+                              <td width="25" height="15"></td>
+                          </tr>
+                      </table>
+                    </div>
+
+                    <table border="0" cellspacing="4px">
+                      <!-- News feed -->
+                      <tr>
+                        <td align="right">
+                          <a href="http://cwiki.apache.org/confluence/spaces/blogrss.action?key=GMOxSITE"><img src="$images/rss.gif" border="0" alt="RSS"></a>
+                        </td>
+                        <td align="left">
+                          <a href="http://cwiki.apache.org/confluence/spaces/blogrss.action?key=GMOxSITE">News</a>
+                        </td>
+                      </tr>
+                      <!-- Site feed -->
+                      <tr>
+                        <td align="right">
+                          <a href="http://cwiki.apache.org/confluence/spaces/rss.action?key=GMOxSITE&newPages=false"><img src="$images/rss.gif" border="0" alt="RSS"></a>
+                        </td>
+                        <td align="left">
+                          <a href="http://cwiki.apache.org/confluence/spaces/rss.action?key=GMOxSITE&newPages=false">Site Changes</a>
+                        </td>
+                      </tr>
+                      <!-- User feed -->
+                      <tr>
+                        <td align="right">
+                          <a href="http://n3.nabble.com/Users-f328036.html"><img src="$images/xml.gif" border="0" alt=ATOM"></a>
+                        </td>
+                        <td align="left">
+                          <a href="http://n3.nabble.com/Users-f328036.html">User Mailing List</a>
+                        </td>
+                      </tr>
+                      <!-- Dev feed -->
+                      <tr>
+                        <td align="right">
+                          <a href="http://n3.nabble.com/Development-f342155.html"><img src="$images/xml.gif" border="0" alt="ATOM"></a>
+                        </td>
+                        <td align="left">
+                          <a href="http://n3.nabble.com/Development-f342155.html">Developer Mailing List</a>
+                        </td>
+                      </tr>
+                    </table>
 
                 </td>
-                    <td align="left" valign="top">
-                    #pageContent()
+                <td align="left" valign="top">
+                   <div id="PageContent">
+                       #if ($pageContentHeaderEnabled)
+                           <div class="pageheader" style="padding: 6px 0px 0px 0px;">
+                               <div style="margin: 0px 10px 0px 10px" class="smalltext">$page.space.name</div>
+                               <div style="margin: 0px 10px 8px 10px" class="pagetitle">$page.title</div>
+                           </div>
+                       #end
+                       
+                       <div class="pagecontent">
+                           <div class="wiki-content">
+                               $body
+                           </div>
+                       </div>
+                   </div>
                 </td>
             </tr>
         </table>
 
-        #footer()
+        <!-- footer -->
+        <table border="0" cellpadding="2" cellspacing="0" width="100%"">
+            <tr>
+              <td align="left" valign="middle" class="footer">
+                &nbsp;&nbsp;
+                <img src="http://static.delicious.com/img/delicious.small.gif" height="10" width="10" alt="Delicious" />
+                <a href="http://delicious.com/save" onclick="window.open('http://delicious.com/save?v=5&amp;noui&amp;jump=close&amp;url='+encodeURIComponent(location.href)+'&amp;title='+encodeURIComponent(document.title),'delicious','toolbar=no,width=550,height=550'); return false;">Bookmark this on Delicious</a>
+                &nbsp;&nbsp;
+                <img src="http://digg.com/img/badges/16x16-digg-guy.gif" width="16" height="16" alt="Digg!" />
+                <a href="" onclick="window.open('http://digg.com/submit?url='+encodeURIComponent(location.href)+'&amp;title='+encodeURIComponent(document.title)+'&amp;topic=software');">Digg this</a>
+                <!-- Slicker, but no text
+                <script type="text/javascript">
+                  digg_skin = 'icon';
+                  digg_window = 'new';
+                  digg_title = 'Apache Geronimo : $page.title';
+                  digg_topic = 'software';
+                </script>
+                <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+                -->
+                &nbsp;&nbsp;
+              </td>
+              <td align="right" valign="middle" class="footer">
+                <a href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</a>&nbsp;&nbsp;-&nbsp;&nbsp;
+                Copyright &#169; 2003-2010, The Apache Software Foundation, Licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0.</a>&nbsp;&nbsp;
+              </td>
+            </tr>
+        </table> 
 
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");