You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2009/01/06 17:16:56 UTC

svn commit: r731984 [1/2] - /geronimo/site/trunk/template/

Author: dwoods
Date: Tue Jan  6 08:16:55 2009
New Revision: 731984

URL: http://svn.apache.org/viewvc?rev=731984&view=rev
Log:
updated confluence autoexport templates for 1) to include a link to our privacy policy in the footers and 2) updated copyright date to 2009.

Added:
    geronimo/site/trunk/template/GMOxDEV_autoexport_template.xml   (with props)
    geronimo/site/trunk/template/GMOxDOC10_autoexport_template.xml   (with props)
    geronimo/site/trunk/template/GMOxDOC11_autoexport_template.xml   (with props)
    geronimo/site/trunk/template/GMOxDOC12_autoexport_template.xml   (with props)
    geronimo/site/trunk/template/GMOxDOC20_autoexport_template.xml   (with props)
    geronimo/site/trunk/template/GMOxDOC20es_autoexport_template.xml   (with props)
    geronimo/site/trunk/template/GMOxDOC20ja_autoexport_template.xml   (with props)
    geronimo/site/trunk/template/GMOxKB_autoexport_template.xml   (with props)
    geronimo/site/trunk/template/GMOxPMGT_autoexport_template.xml   (with props)
    geronimo/site/trunk/template/GMOxSAMPLES_autoexport_template.xml   (with props)
    geronimo/site/trunk/template/GMOxSBOX_autoexport_template.xml   (with props)
    geronimo/site/trunk/template/geronimo_autoexport_template.xml   (with props)
    geronimo/site/trunk/template/gshell_autoexport_template.xml   (with props)
    geronimo/site/trunk/template/xbean_autoexport_template.xml   (with props)
    geronimo/site/trunk/template/yoko_autoexport_template.xml   (with props)
Modified:
    geronimo/site/trunk/template/GMOxDOC21_autoexport_template.xml
    geronimo/site/trunk/template/GMOxDOC22_autoexport_template.xml
    geronimo/site/trunk/template/GMOxSITE_autoexport_template.xml

Added: geronimo/site/trunk/template/GMOxDEV_autoexport_template.xml
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/template/GMOxDEV_autoexport_template.xml?rev=731984&view=auto
==============================================================================
--- geronimo/site/trunk/template/GMOxDEV_autoexport_template.xml (added)
+++ geronimo/site/trunk/template/GMOxDEV_autoexport_template.xml Tue Jan  6 08:16:55 2009
@@ -0,0 +1,186 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+  <head>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+    <link type="text/css" rel="stylesheet" href="http://geronimo.apache.org/style/default.css">
+    <LINK rel="SHORTCUT ICON" href="http://geronimo.apache.org/images/favicon.ico">
+    <LINK rel="schema.DC" href="http://purl.org/DC/elements/1.0/">
+    <META name="Description" content="$page.title" />
+    <META name="Keywords" content="Apache Geronimo development documentation $page.title" />
+    <META name="Owner" content="dev@geronimo.apache.org" />
+    <META name="Robots" content="index, follow" />
+    <META name="Security" content="Public" />
+    <META name="Source" content="wiki template" />
+    <META name="DC.Date" scheme="iso8601" content="2009-01-06" />
+    <META name="DC.Language" scheme="rfc1766" content="en" />
+    <META name="DC.Rights" content="Copyright © 2003-2009, The Apache Software Foundation" />
+    <META http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))'/>
+
+    <script type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </script>
+
+    <title>Apache Geronimo Development : $page.title</title>
+
+  </head>
+
+  <body onload="init()">
+
+    <table valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://geronimo.apache.org/images/top_bgstretch_1x64.gif">
+      <tr>
+        <td valing="top" align="left">
+          <img src="http://geronimo.apache.org/images/topleft_logo_437x64.gif" border="0">
+        </td>
+      </tr>
+    </table>
+
+    <table border="0" cellpadding="2" cellspacing="0" width="100%">
+      <tr class="topBar">
+        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
+          <a href="/geronimo"> Home</a> >&nbsp;$autoexport.breadcrumbs($page)
+        </td>
+        <td align="right" valign="middle" nowrap>
+          <form name="search" action="http://www.google.com/search" method="get">
+            <input type="hidden" name="ie" value="UTF-8" />
+            <input type="hidden" name="oe" value="UTF-8" />
+            <input type="hidden" name="domains" value="" />
+            <input type="hidden" name="sitesearch" value="" />
+            <input type="text" name="q" maxlength="255" value="" />        
+            <input type="submit" name="btnG" value="Google Search" />
+          </form>
+        </td>
+      </tr> 
+    </table>
+
+    <div id="PageContent">
+      <div class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <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 class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <a href="$confluenceUri/pages/editpage.action?pageId=$page.id">
+            <img src="http://geronimo.apache.org/images/icons/notep_16.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
+            <a href="$confluenceUri/pages/editpage.action?pageId=$page.id">Edit Page</a>
+          &nbsp;
+          <a href="$confluenceUri/pages/listpages.action?key=$page.spaceKey">
+            <img src="http://geronimo.apache.org/images/icons/browse_space.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
+            <a href="$confluenceUri/pages/listpages.action?key=$page.spaceKey">Browse Space</a>
+          &nbsp;
+          <a href="$confluenceUri/pages/createpage.action?spaceKey=$page.spaceKey&fromPageId=$page.id">
+            <img src="http://geronimo.apache.org/images/icons/add_page_16.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
+          <a href="$confluenceUri/pages/createpage.action?spaceKey=$page.spaceKey&fromPageId=$page.id">Add Page</a>
+          &nbsp;
+          <a href="$confluenceUri/pages/createblogpost.action?spaceKey=$page.spaceKey&fromPageId=$page.id">
+            <img src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
+          <a href="$confluenceUri/pages/createblogpost.action?spaceKey=$page.spaceKey&fromPageId=$page.id">Add News</a>
+<!-- -->	 
+        </div>
+      </div>
+
+      <div class="pagecontent">
+        <div class="wiki-content">
+          $body
+        </div>
+
+        #if ($page.hasChildren())
+          <div class="tabletitle">
+            Children
+            <span class="smalltext" id="show" style="display: inline;">
+              <a href="javascript:showChildren()">Show Children</a></span>
+            <span class="smalltext" id="hide" style="display: none;">
+              <a href="javascript:hideChildren()">Hide Children</a></span>
+          </div>
+          <div class="greybox" id="children" style="display: none;">
+            #set ($children = $page.children)
+            #foreach ($child in $children)
+              $autoexport.link($child)
+              <span class="smalltext">($child.space.name)</span>
+              <br>
+            #end
+          </div>
+        #end
+
+      </div>
+    </div>
+
+    <!-- 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=programming');">Digg this</a>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo Development : $page.title';
+              digg_topic = 'programming';
+            </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-2009, 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.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+var pageTracker = _gat._getTracker("UA-4380560-1");
+pageTracker._initData();
+pageTracker._trackPageview();
+</script>
+  </body>
+</html>
\ No newline at end of file

Propchange: geronimo/site/trunk/template/GMOxDEV_autoexport_template.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/site/trunk/template/GMOxDOC10_autoexport_template.xml
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/template/GMOxDOC10_autoexport_template.xml?rev=731984&view=auto
==============================================================================
--- geronimo/site/trunk/template/GMOxDOC10_autoexport_template.xml (added)
+++ geronimo/site/trunk/template/GMOxDOC10_autoexport_template.xml Tue Jan  6 08:16:55 2009
@@ -0,0 +1,185 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+  <head>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+    <link type="text/css" rel="stylesheet" href="http://geronimo.apache.org/style/default.css">
+    <LINK rel="SHORTCUT ICON" href="http://geronimo.apache.org/images/favicon.ico">
+    <LINK rel="schema.DC" href="http://purl.org/DC/elements/1.0/">
+    <META name="Description" content="$page.title" />
+    <META name="Keywords" content="Apache Geronimo 1.0 Documentation $page.title" />
+    <META name="Owner" content="dev@geronimo.apache.org" />
+    <META name="Robots" content="index, follow" />
+    <META name="Security" content="Public" />
+    <META name="Source" content="wiki template" />
+    <META name="DC.Date" scheme="iso8601" content="2009-01-06" />
+    <META name="DC.Language" scheme="rfc1766" content="en" />
+    <META name="DC.Rights" content="Copyright © 2003-2009, The Apache Software Foundation" />
+    <META http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))'/>
+
+    <script type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </script>
+
+    <title>Apache Geronimo v1.0 Documentation : $page.title</title>
+
+  </head>
+  <body onload="init()">
+
+    <table valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://geronimo.apache.org/images/top_bgstretch_1x64.gif">
+      <tr>
+        <td valing="top" align="left">
+          <img src="http://geronimo.apache.org/images/topleft_logo_437x64.gif" border="0">
+        </td>
+      </tr>
+    </table>
+
+    <table border="0" cellpadding="2" cellspacing="0" width="100%">
+      <tr class="topBar">
+        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
+          <a href="/geronimo"> Home</a> >&nbsp;$autoexport.breadcrumbs($page)
+        </td>
+        <td align="right" valign="middle" nowrap>
+          <form name="search" action="http://www.google.com/search" method="get">
+            <input type="hidden" name="ie" value="UTF-8" />
+            <input type="hidden" name="oe" value="UTF-8" />
+            <input type="hidden" name="domains" value="" />
+            <input type="hidden" name="sitesearch" value="" />
+            <input type="text" name="q" maxlength="255" value="" />        
+            <input type="submit" name="btnG" value="Google Search" />
+          </form>
+        </td>
+      </tr> 
+    </table>
+
+    <div id="PageContent">
+      <div class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <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 class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <a href="$confluenceUri/pages/editpage.action?pageId=$page.id">
+            <img src="http://geronimo.apache.org/images/icons/notep_16.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
+            <a href="$confluenceUri/pages/editpage.action?pageId=$page.id">Edit Page</a>
+          &nbsp;
+          <a href="$confluenceUri/pages/listpages.action?key=$page.spaceKey">
+            <img src="http://geronimo.apache.org/images/icons/browse_space.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
+            <a href="$confluenceUri/pages/listpages.action?key=$page.spaceKey">Browse Space</a>
+          &nbsp;
+          <a href="$confluenceUri/pages/createpage.action?spaceKey=$page.spaceKey&fromPageId=$page.id">
+            <img src="http://geronimo.apache.org/images/icons/add_page_16.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
+          <a href="$confluenceUri/pages/createpage.action?spaceKey=$page.spaceKey&fromPageId=$page.id">Add Page</a>
+          &nbsp;
+          <a href="$confluenceUri/pages/createblogpost.action?spaceKey=$page.spaceKey&fromPageId=$page.id">
+            <img src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
+          <a href="$confluenceUri/pages/createblogpost.action?spaceKey=$page.spaceKey&fromPageId=$page.id">Add News</a>
+<!-- -->	 
+        </div>
+      </div>
+
+      <div class="pagecontent">
+        <div class="wiki-content">
+          $body
+        </div>
+
+        #if ($page.hasChildren())
+          <div class="tabletitle">
+            Children
+            <span class="smalltext" id="show" style="display: inline;">
+              <a href="javascript:showChildren()">Show Children</a></span>
+            <span class="smalltext" id="hide" style="display: none;">
+              <a href="javascript:hideChildren()">Hide Children</a></span>
+          </div>
+          <div class="greybox" id="children" style="display: none;">
+            #set ($children = $page.children)
+            #foreach ($child in $children)
+              $autoexport.link($child)
+              <span class="smalltext">($child.space.name)</span>
+              <br>
+            #end
+          </div>
+        #end
+
+      </div>
+    </div>
+
+    <!-- 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=programming');">Digg this</a>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v1.0 Documentation : $page.title';
+              digg_topic = 'programming';
+            </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-2009, 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.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+var pageTracker = _gat._getTracker("UA-4380560-1");
+pageTracker._initData();
+pageTracker._trackPageview();
+</script>
+  </body>
+</html>
\ No newline at end of file

Propchange: geronimo/site/trunk/template/GMOxDOC10_autoexport_template.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/site/trunk/template/GMOxDOC11_autoexport_template.xml
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/template/GMOxDOC11_autoexport_template.xml?rev=731984&view=auto
==============================================================================
--- geronimo/site/trunk/template/GMOxDOC11_autoexport_template.xml (added)
+++ geronimo/site/trunk/template/GMOxDOC11_autoexport_template.xml Tue Jan  6 08:16:55 2009
@@ -0,0 +1,186 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+  <head>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+    <link type="text/css" rel="stylesheet" href="http://geronimo.apache.org/style/default.css">
+    <LINK rel="SHORTCUT ICON" href="http://geronimo.apache.org/images/favicon.ico">
+    <LINK rel="schema.DC" href="http://purl.org/DC/elements/1.0/">
+    <META name="Description" content="$page.title" />
+    <META name="Keywords" content="Apache Geronimo 1.1 Documentation $page.title" />
+    <META name="Owner" content="dev@geronimo.apache.org" />
+    <META name="Robots" content="index, follow" />
+    <META name="Security" content="Public" />
+    <META name="Source" content="wiki template" />
+    <META name="DC.Date" scheme="iso8601" content="2009-01-06" />
+    <META name="DC.Language" scheme="rfc1766" content="en" />
+    <META name="DC.Rights" content="Copyright © 2003-2009, The Apache Software Foundation" />
+    <META http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))'/>
+
+    <script type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </script>
+
+    <title>Apache Geronimo v1.1 Documentation : $page.title</title>
+
+  </head>
+
+  <body onload="init()">
+
+    <table valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://geronimo.apache.org/images/top_bgstretch_1x64.gif">
+      <tr>
+        <td valing="top" align="left">
+          <img src="http://geronimo.apache.org/images/topleft_logo_437x64.gif" border="0">
+        </td>
+      </tr>
+    </table>
+
+    <table border="0" cellpadding="2" cellspacing="0" width="100%">
+      <tr class="topBar">
+        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
+          <a href="/geronimo"> Home</a> >&nbsp;$autoexport.breadcrumbs($page)
+        </td>
+        <td align="right" valign="middle" nowrap>
+          <form name="search" action="http://www.google.com/search" method="get">
+            <input type="hidden" name="ie" value="UTF-8" />
+            <input type="hidden" name="oe" value="UTF-8" />
+            <input type="hidden" name="domains" value="" />
+            <input type="hidden" name="sitesearch" value="" />
+            <input type="text" name="q" maxlength="255" value="" />        
+            <input type="submit" name="btnG" value="Google Search" />
+          </form>
+        </td>
+      </tr> 
+    </table>
+
+    <div id="PageContent">
+      <div class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <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 class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <a href="$confluenceUri/pages/editpage.action?pageId=$page.id">
+            <img src="http://geronimo.apache.org/images/icons/notep_16.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
+            <a href="$confluenceUri/pages/editpage.action?pageId=$page.id">Edit Page</a>
+          &nbsp;
+          <a href="$confluenceUri/pages/listpages.action?key=$page.spaceKey">
+            <img src="http://geronimo.apache.org/images/icons/browse_space.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
+            <a href="$confluenceUri/pages/listpages.action?key=$page.spaceKey">Browse Space</a>
+          &nbsp;
+          <a href="$confluenceUri/pages/createpage.action?spaceKey=$page.spaceKey&fromPageId=$page.id">
+            <img src="http://geronimo.apache.org/images/icons/add_page_16.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
+          <a href="$confluenceUri/pages/createpage.action?spaceKey=$page.spaceKey&fromPageId=$page.id">Add Page</a>
+          &nbsp;
+          <a href="$confluenceUri/pages/createblogpost.action?spaceKey=$page.spaceKey&fromPageId=$page.id">
+            <img src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
+          <a href="$confluenceUri/pages/createblogpost.action?spaceKey=$page.spaceKey&fromPageId=$page.id">Add News</a>
+<!-- -->	 
+        </div>
+      </div>
+
+      <div class="pagecontent">
+        <div class="wiki-content">
+          $body
+        </div>
+
+        #if ($page.hasChildren())
+          <div class="tabletitle">
+            Children
+            <span class="smalltext" id="show" style="display: inline;">
+              <a href="javascript:showChildren()">Show Children</a></span>
+            <span class="smalltext" id="hide" style="display: none;">
+              <a href="javascript:hideChildren()">Hide Children</a></span>
+          </div>
+          <div class="greybox" id="children" style="display: none;">
+            #set ($children = $page.children)
+            #foreach ($child in $children)
+              $autoexport.link($child)
+              <span class="smalltext">($child.space.name)</span>
+              <br>
+            #end
+          </div>
+        #end
+
+      </div>
+    </div>
+
+    <!-- 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=programming');">Digg this</a>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v1.1 Documentation : $page.title';
+              digg_topic = 'programming';
+            </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-2009, 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.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+var pageTracker = _gat._getTracker("UA-4380560-1");
+pageTracker._initData();
+pageTracker._trackPageview();
+</script>
+  </body>
+</html>
\ No newline at end of file

Propchange: geronimo/site/trunk/template/GMOxDOC11_autoexport_template.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/site/trunk/template/GMOxDOC12_autoexport_template.xml
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/template/GMOxDOC12_autoexport_template.xml?rev=731984&view=auto
==============================================================================
--- geronimo/site/trunk/template/GMOxDOC12_autoexport_template.xml (added)
+++ geronimo/site/trunk/template/GMOxDOC12_autoexport_template.xml Tue Jan  6 08:16:55 2009
@@ -0,0 +1,186 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+  <head>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+    <link type="text/css" rel="stylesheet" href="http://geronimo.apache.org/style/default.css">
+    <LINK rel="SHORTCUT ICON" href="http://geronimo.apache.org/images/favicon.ico">
+    <LINK rel="schema.DC" href="http://purl.org/DC/elements/1.0/">
+    <META name="Description" content="$page.title" />
+    <META name="Keywords" content="Apache Geronimo 1.2 Documentation $page.title" />
+    <META name="Owner" content="dev@geronimo.apache.org" />
+##    <META name="Robots" content="index, follow" />
+    <META name="Robots" content="noindex, nofollow" />
+    <META name="Security" content="Public" />
+    <META name="Source" content="wiki template" />
+    <META name="DC.Date" scheme="iso8601" content="2009-01-06" />
+    <META name="DC.Language" scheme="rfc1766" content="en" />
+    <META name="DC.Rights" content="Copyright © 2003-2009, The Apache Software Foundation" />
+    <META http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))'/>
+
+    <script type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </script>
+
+    <title>Apache Geronimo v1.2 Documentation : $page.title</title>
+
+  </head>
+  <body onload="init()">
+
+    <table valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://geronimo.apache.org/images/top_bgstretch_1x64.gif">
+      <tr>
+        <td valing="top" align="left">
+          <img src="http://geronimo.apache.org/images/topleft_logo_437x64.gif" border="0">
+        </td>
+      </tr>
+    </table>
+
+    <table border="0" cellpadding="2" cellspacing="0" width="100%">
+      <tr class="topBar">
+        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
+          <a href="/geronimo"> Home</a> >&nbsp;$autoexport.breadcrumbs($page)
+        </td>
+        <td align="right" valign="middle" nowrap>
+          <form name="search" action="http://www.google.com/search" method="get">
+            <input type="hidden" name="ie" value="UTF-8" />
+            <input type="hidden" name="oe" value="UTF-8" />
+            <input type="hidden" name="domains" value="" />
+            <input type="hidden" name="sitesearch" value="" />
+            <input type="text" name="q" maxlength="255" value="" />        
+            <input type="submit" name="btnG" value="Google Search" />
+          </form>
+        </td>
+      </tr> 
+    </table>
+
+    <div id="PageContent">
+      <div class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <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 class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <a href="$confluenceUri/pages/editpage.action?pageId=$page.id">
+            <img src="http://geronimo.apache.org/images/icons/notep_16.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
+            <a href="$confluenceUri/pages/editpage.action?pageId=$page.id">Edit Page</a>
+          &nbsp;
+          <a href="$confluenceUri/pages/listpages.action?key=$page.spaceKey">
+            <img src="http://geronimo.apache.org/images/icons/browse_space.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
+            <a href="$confluenceUri/pages/listpages.action?key=$page.spaceKey">Browse Space</a>
+          &nbsp;
+          <a href="$confluenceUri/pages/createpage.action?spaceKey=$page.spaceKey&fromPageId=$page.id">
+            <img src="http://geronimo.apache.org/images/icons/add_page_16.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
+          <a href="$confluenceUri/pages/createpage.action?spaceKey=$page.spaceKey&fromPageId=$page.id">Add Page</a>
+          &nbsp;
+          <a href="$confluenceUri/pages/createblogpost.action?spaceKey=$page.spaceKey&fromPageId=$page.id">
+            <img src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
+          <a href="$confluenceUri/pages/createblogpost.action?spaceKey=$page.spaceKey&fromPageId=$page.id">Add News</a>
+<!-- -->	 
+        </div>
+      </div>
+
+      <div class="pagecontent">
+        <div class="wiki-content">
+          $body
+        </div>
+
+        #if ($page.hasChildren())
+          <div class="tabletitle">
+            Children
+            <span class="smalltext" id="show" style="display: inline;">
+              <a href="javascript:showChildren()">Show Children</a></span>
+            <span class="smalltext" id="hide" style="display: none;">
+              <a href="javascript:hideChildren()">Hide Children</a></span>
+          </div>
+          <div class="greybox" id="children" style="display: none;">
+            #set ($children = $page.children)
+            #foreach ($child in $children)
+              $autoexport.link($child)
+              <span class="smalltext">($child.space.name)</span>
+              <br>
+            #end
+          </div>
+        #end
+
+      </div>
+    </div>
+
+    <!-- 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=programming');">Digg this</a>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v1.2 Documentation : $page.title';
+              digg_topic = 'programming';
+            </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-2009, 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.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+var pageTracker = _gat._getTracker("UA-4380560-1");
+pageTracker._initData();
+pageTracker._trackPageview();
+</script>
+  </body>
+</html>
\ No newline at end of file

Propchange: geronimo/site/trunk/template/GMOxDOC12_autoexport_template.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/site/trunk/template/GMOxDOC20_autoexport_template.xml
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/template/GMOxDOC20_autoexport_template.xml?rev=731984&view=auto
==============================================================================
--- geronimo/site/trunk/template/GMOxDOC20_autoexport_template.xml (added)
+++ geronimo/site/trunk/template/GMOxDOC20_autoexport_template.xml Tue Jan  6 08:16:55 2009
@@ -0,0 +1,186 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+  <head>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+    <link type="text/css" rel="stylesheet" href="http://geronimo.apache.org/style/default.css">
+    <LINK rel="SHORTCUT ICON" href="http://geronimo.apache.org/images/favicon.ico">
+    <LINK rel="schema.DC" href="http://purl.org/DC/elements/1.0/">
+    <META name="Description" content="$page.title" />
+    <META name="Keywords" content="Apache Geronimo 2.0 Documentation $page.title" />
+    <META name="Owner" content="dev@geronimo.apache.org" />
+    <META name="Robots" content="index, follow" />
+    <META name="Security" content="Public" />
+    <META name="Source" content="wiki template" />
+    <META name="DC.Date" scheme="iso8601" content="2009-01-06" />
+    <META name="DC.Language" scheme="rfc1766" content="en" />
+    <META name="DC.Rights" content="Copyright © 2003-2009, The Apache Software Foundation" />
+    <META http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))'/>
+
+    <script type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </script>
+
+    <title>Apache Geronimo v2.0 Documentation : $page.title</title>
+
+  </head>
+
+  <body onload="init()">
+
+    <table valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://geronimo.apache.org/images/top_bgstretch_1x64.gif">
+      <tr>
+        <td valing="top" align="left">
+          <img src="http://geronimo.apache.org/images/topleft_logo_437x64.gif" border="0">
+        </td>
+      </tr>
+    </table>
+
+    <table border="0" cellpadding="2" cellspacing="0" width="100%">
+      <tr class="topBar">
+        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
+          <a href="/geronimo"> Home</a> >&nbsp;$autoexport.breadcrumbs($page)
+        </td>
+        <td align="right" valign="middle" nowrap>
+          <form name="search" action="http://www.google.com/search" method="get">
+            <input type="hidden" name="ie" value="UTF-8" />
+            <input type="hidden" name="oe" value="UTF-8" />
+            <input type="hidden" name="domains" value="" />
+            <input type="hidden" name="sitesearch" value="" />
+            <input type="text" name="q" maxlength="255" value="" />        
+            <input type="submit" name="btnG" value="Google Search" />
+          </form>
+        </td>
+      </tr> 
+    </table>
+
+    <div id="PageContent">
+      <div class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <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 class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <a href="$confluenceUri/pages/editpage.action?pageId=$page.id">
+            <img src="http://geronimo.apache.org/images/icons/notep_16.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
+            <a href="$confluenceUri/pages/editpage.action?pageId=$page.id">Edit Page</a>
+          &nbsp;
+          <a href="$confluenceUri/pages/listpages.action?key=$page.spaceKey">
+            <img src="http://geronimo.apache.org/images/icons/browse_space.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
+            <a href="$confluenceUri/pages/listpages.action?key=$page.spaceKey">Browse Space</a>
+          &nbsp;
+          <a href="$confluenceUri/pages/createpage.action?spaceKey=$page.spaceKey&fromPageId=$page.id">
+            <img src="http://geronimo.apache.org/images/icons/add_page_16.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
+          <a href="$confluenceUri/pages/createpage.action?spaceKey=$page.spaceKey&fromPageId=$page.id">Add Page</a>
+          &nbsp;
+          <a href="$confluenceUri/pages/createblogpost.action?spaceKey=$page.spaceKey&fromPageId=$page.id">
+            <img src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
+          <a href="$confluenceUri/pages/createblogpost.action?spaceKey=$page.spaceKey&fromPageId=$page.id">Add News</a>
+<!-- -->	 
+        </div>
+      </div>
+
+      <div class="pagecontent">
+        <div class="wiki-content">
+          $body
+        </div>
+
+        #if ($page.hasChildren())
+          <div class="tabletitle">
+            Children
+            <span class="smalltext" id="show" style="display: inline;">
+              <a href="javascript:showChildren()">Show Children</a></span>
+            <span class="smalltext" id="hide" style="display: none;">
+              <a href="javascript:hideChildren()">Hide Children</a></span>
+          </div>
+          <div class="greybox" id="children" style="display: none;">
+            #set ($children = $page.children)
+            #foreach ($child in $children)
+              $autoexport.link($child)
+              <span class="smalltext">($child.space.name)</span>
+              <br>
+            #end
+          </div>
+        #end
+
+      </div>
+    </div>
+
+    <!-- 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=programming');">Digg this</a>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.0 Documentation : $page.title';
+              digg_topic = 'programming';
+            </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-2009, 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.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+var pageTracker = _gat._getTracker("UA-4380560-1");
+pageTracker._initData();
+pageTracker._trackPageview();
+</script>
+  </body>
+</html>
\ No newline at end of file

Propchange: geronimo/site/trunk/template/GMOxDOC20_autoexport_template.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/site/trunk/template/GMOxDOC20es_autoexport_template.xml
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/template/GMOxDOC20es_autoexport_template.xml?rev=731984&view=auto
==============================================================================
--- geronimo/site/trunk/template/GMOxDOC20es_autoexport_template.xml (added)
+++ geronimo/site/trunk/template/GMOxDOC20es_autoexport_template.xml Tue Jan  6 08:16:55 2009
@@ -0,0 +1,184 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="es">
+  <head>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+    <link type="text/css" rel="stylesheet" href="http://geronimo.apache.org/style/default.css">
+    <LINK rel="SHORTCUT ICON" href="http://geronimo.apache.org/images/favicon.ico">
+    <LINK rel="schema.DC" href="http://purl.org/DC/elements/1.0/">
+    <META name="Description" content="$page.title" />
+    <META name="Keywords" content="Apache Geronimo 2.0 Documentation Spanish $page.title" />
+    <META name="Owner" content="dev@geronimo.apache.org" />
+    <META name="Robots" content="index, follow" />
+    <META name="Security" content="Public" />
+    <META name="Source" content="wiki template" />
+    <META name="DC.Date" scheme="iso8601" content="2009-01-06" />
+    <META name="DC.Language" scheme="rfc1766" content="es" />
+    <META name="DC.Rights" content="Copyright © 2003-2009, The Apache Software Foundation" />
+    <META http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))'/>
+
+    <script type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </script>
+
+    <title>Apache Geronimo v2.0 Documentation (Spanish) : $page.title</title>
+  </head>
+  <body onload="init()">
+
+    <table valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://geronimo.apache.org/images/top_bgstretch_1x64.gif">
+      <tr>
+        <td valing="top" align="left">
+          <img src="http://geronimo.apache.org/images/topleft_logo_437x64.gif" border="0">
+        </td>
+      </tr>
+    </table>
+
+    <table border="0" cellpadding="2" cellspacing="0" width="100%">
+      <tr class="topBar">
+        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
+          <a href="/geronimo"> Home</a> >&nbsp;$autoexport.breadcrumbs($page)
+        </td>
+        <td align="right" valign="middle" nowrap>
+          <form name="search" action="http://www.google.com/search" method="get">
+            <input type="hidden" name="ie" value="UTF-8" />
+            <input type="hidden" name="oe" value="UTF-8" />
+            <input type="hidden" name="domains" value="" />
+            <input type="hidden" name="sitesearch" value="" />
+            <input type="text" name="q" maxlength="255" value="" />        
+            <input type="submit" name="btnG" value="Google Search" />
+          </form>
+        </td>
+      </tr> 
+    </table>
+
+    <div id="PageContent">
+      <div class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <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 class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <a href="$confluenceUri/pages/editpage.action?pageId=$page.id">
+            <img src="http://geronimo.apache.org/images/icons/notep_16.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
+            <a href="$confluenceUri/pages/editpage.action?pageId=$page.id">Edit Page</a>
+          &nbsp;
+          <a href="$confluenceUri/pages/listpages.action?key=$page.spaceKey">
+            <img src="http://geronimo.apache.org/images/icons/browse_space.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
+            <a href="$confluenceUri/pages/listpages.action?key=$page.spaceKey">Browse Space</a>
+          &nbsp;
+          <a href="$confluenceUri/pages/createpage.action?spaceKey=$page.spaceKey&fromPageId=$page.id">
+            <img src="http://geronimo.apache.org/images/icons/add_page_16.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
+          <a href="$confluenceUri/pages/createpage.action?spaceKey=$page.spaceKey&fromPageId=$page.id">Add Page</a>
+          &nbsp;
+          <a href="$confluenceUri/pages/createblogpost.action?spaceKey=$page.spaceKey&fromPageId=$page.id">
+            <img src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
+          <a href="$confluenceUri/pages/createblogpost.action?spaceKey=$page.spaceKey&fromPageId=$page.id">Add News</a>
+<!-- -->	 
+        </div>
+      </div>
+
+      <div class="pagecontent">
+        <div class="wiki-content">
+          $body
+        </div>
+
+        #if ($page.hasChildren())
+          <div class="tabletitle">
+            Children
+            <span class="smalltext" id="show" style="display: inline;">
+              <a href="javascript:showChildren()">Show Children</a></span>
+            <span class="smalltext" id="hide" style="display: none;">
+              <a href="javascript:hideChildren()">Hide Children</a></span>
+          </div>
+          <div class="greybox" id="children" style="display: none;">
+            #set ($children = $page.children)
+            #foreach ($child in $children)
+              $autoexport.link($child)
+              <span class="smalltext">($child.space.name)</span>
+              <br>
+            #end
+          </div>
+        #end
+
+      </div>
+    </div>
+
+    <!-- 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=programming');">Digg this</a>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.0 Documentation (Spanish) : $page.title';
+              digg_topic = 'programming';
+            </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-2009, 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.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+var pageTracker = _gat._getTracker("UA-4380560-1");
+pageTracker._initData();
+pageTracker._trackPageview();
+</script>
+  </body>
+</html>
\ No newline at end of file

Propchange: geronimo/site/trunk/template/GMOxDOC20es_autoexport_template.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/site/trunk/template/GMOxDOC20ja_autoexport_template.xml
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/template/GMOxDOC20ja_autoexport_template.xml?rev=731984&view=auto
==============================================================================
--- geronimo/site/trunk/template/GMOxDOC20ja_autoexport_template.xml (added)
+++ geronimo/site/trunk/template/GMOxDOC20ja_autoexport_template.xml Tue Jan  6 08:16:55 2009
@@ -0,0 +1,190 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+  <head>
+    <link type="text/css" rel="stylesheet" href="http://geronimo.apache.org/style/default.css">
+    <LINK rel="SHORTCUT ICON" href="http://geronimo.apache.org/images/favicon.ico">
+    <LINK rel="schema.DC" href="http://purl.org/DC/elements/1.0/">
+    <META name="Description" content="$page.title" />
+    <META name="Keywords" content="Apache Geronimo 2.0 JA Documentation $page.title" />
+    <META name="Owner" content="dev@geronimo.apache.org" />
+    <META name="Robots" content="index, follow" />
+    <META name="Security" content="Public" />
+    <META name="Source" content="wiki template" />
+    <META name="DC.Date" scheme="iso8601" content="2009-01-06" />
+    <META name="DC.Language" scheme="rfc1766" content="ja" />
+    <META name="DC.Rights" content="Copyright © 2003-2009, The Apache Software Foundation" />
+    <META http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))'/>
+    <style type="text/css">
+      .footer {
+        background-image:      url('http://geronimo.apache.org/images/border/border_bottom.gif');
+        background-repeat:     repeat-x;
+        background-position:   left top;
+        padding-top:           4px;
+        color:                 #666;
+      }
+    </style>
+    <script type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </script>
+    <title>$page.title</title>
+  </head>
+  <body onload="init()">
+
+    <table valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://geronimo.apache.org/images/top_bgstretch_1x64.gif">
+      <tr>
+        <td valing="top" align="left">
+          <img src="http://geronimo.apache.org/images/topleft_logo_437x64.gif" border="0">
+        </td>
+      </tr>
+    </table>
+
+    <table border="0" cellpadding="2" cellspacing="0" width="100%">
+      <tr class="topBar">
+        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
+          <a href="/geronimo"> Home</a> >&nbsp;$autoexport.breadcrumbs($page)
+        </td>
+        <td align="right" valign="middle" nowrap>
+          <form name="search" action="http://www.google.com/search" method="get">
+            <input type="hidden" name="ie" value="UTF-8" />
+            <input type="hidden" name="oe" value="UTF-8" />
+            <input type="hidden" name="domains" value="" />
+            <input type="hidden" name="sitesearch" value="" />
+            <input type="text" name="q" maxlength="255" value="" />        
+            <input type="submit" name="btnG" value="Google Search" />
+          </form>
+        </td>
+      </tr> 
+    </table>
+
+    <div id="PageContent">
+      <div class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="http://geronimo.apache.org/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <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 class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+<!-- -->         
+            <a href="$confluenceUri/pages/editpage.action?pageId=$page.id">
+            <img src="http://geronimo.apache.org/images/icons/notep_16.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
+            <a href="$confluenceUri/pages/editpage.action?pageId=$page.id">Edit Page</a>
+          &nbsp;
+          <a href="$confluenceUri/pages/listpages.action?key=$page.spaceKey">
+            <img src="http://geronimo.apache.org/images/icons/browse_space.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
+            <a href="$confluenceUri/pages/listpages.action?key=$page.spaceKey">Browse Space</a>
+          &nbsp;
+          <a href="$confluenceUri/pages/createpage.action?spaceKey=$page.spaceKey&fromPageId=$page.id">
+            <img src="http://geronimo.apache.org/images/icons/add_page_16.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
+          <a href="$confluenceUri/pages/createpage.action?spaceKey=$page.spaceKey&fromPageId=$page.id">Add Page</a>
+          &nbsp;
+          <a href="$confluenceUri/pages/createblogpost.action?spaceKey=$page.spaceKey&fromPageId=$page.id">
+            <img src="http://geronimo.apache.org/images/icons/add_blogentry_16.gif"
+                 height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
+          <a href="$confluenceUri/pages/createblogpost.action?spaceKey=$page.spaceKey&fromPageId=$page.id">Add News</a>
+<!-- -->	 
+        </div>
+      </div>
+
+      <div class="pagecontent">
+        <div class="wiki-content">
+          $body
+        </div>
+
+        #if ($page.hasChildren())
+          <div class="tabletitle">
+            Children
+            <span class="smalltext" id="show" style="display: inline;">
+              <a href="javascript:showChildren()">Show Children</a></span>
+            <span class="smalltext" id="hide" style="display: none;">
+              <a href="javascript:hideChildren()">Hide Children</a></span>
+          </div>
+          <div class="greybox" id="children" style="display: none;">
+            #set ($children = $page.children)
+            #foreach ($child in $children)
+              $autoexport.link($child)
+              <span class="smalltext">($child.space.name)</span>
+              <br>
+            #end
+          </div>
+        #end
+
+      </div>
+    </div>
+
+    <!-- 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=programming');">Digg this</a>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.0 Documentation : $page.title';
+              digg_topic = 'programming';
+            </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-2009, 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.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+var pageTracker = _gat._getTracker("UA-4380560-1");
+pageTracker._initData();
+pageTracker._trackPageview();
+</script>
+  </body>
+</html>
\ No newline at end of file

Propchange: geronimo/site/trunk/template/GMOxDOC20ja_autoexport_template.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/site/trunk/template/GMOxDOC21_autoexport_template.xml
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/template/GMOxDOC21_autoexport_template.xml?rev=731984&r1=731983&r2=731984&view=diff
==============================================================================
--- geronimo/site/trunk/template/GMOxDOC21_autoexport_template.xml (original)
+++ geronimo/site/trunk/template/GMOxDOC21_autoexport_template.xml Tue Jan  6 08:16:55 2009
@@ -1,59 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-  <head>
-    <link type="text/css" rel="stylesheet" href="http://geronimo.apache.org/style/default.css">
-    <LINK rel="SHORTCUT ICON" href="http://geronimo.apache.org/images/favicon.ico">
-    <style type="text/css">
-      .footer {
-        background-image:      url('http://geronimo.apache.org/images/border/border_bottom.gif');
-        background-repeat:     repeat-x;
-        background-position:   left top;
-        padding-top:           4px;
-        color:                 #666;
-      }
-    </style>
-    <script type="text/javascript" language="javascript">
-      var hide = null;
-      var show = null;
-      var children = null;
-
-      function init() {
-        /* Search form initialization */
-        var form = document.forms['search'];
-        if (form != null) {
-          form.elements['domains'].value = location.hostname;
-          form.elements['sitesearch'].value = location.hostname;
-        }
-
-        /* Children initialization */
-        hide = document.getElementById('hide');
-        show = document.getElementById('show');
-        children = document.all != null ?
-                   document.all['children'] :
-                   document.getElementById('children');
-        if (children != null) {
-          children.style.display = 'none';
-          show.style.display = 'inline';
-          hide.style.display = 'none';
-        }
-      }
-
-      function showChildren() {
-        children.style.display = 'block';
-        show.style.display = 'none';
-        hide.style.display = 'inline';
-      }
-
-      function hideChildren() {
-        children.style.display = 'none';
-        show.style.display = 'inline';
-        hide.style.display = 'none';
-      }
-    </script>
-    <title>$page.title</title>
-  </head>
-  <body onload="init()">
-
+##
+#macro (banner)
+    <!-- banner -->
     <table valign="top" border="0" cellspacing="0" cellpadding="0" width="100%" background="http://geronimo.apache.org/images/top_bgstretch_1x64.gif">
       <tr>
         <td valing="top" align="left">
@@ -61,7 +9,10 @@
         </td>
       </tr>
     </table>
-
+#end
+##
+#macro (topNav)
+    <!-- topNav -->
     <table border="0" cellpadding="2" cellspacing="0" width="100%">
       <tr class="topBar">
         <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
@@ -79,7 +30,10 @@
         </td>
       </tr> 
     </table>
-
+#end
+##
+#macro (pageContent)
+    <!-- pageContent -->
     <div id="PageContent">
       <div class="pageheader" style="padding: 6px 0px 0px 0px;">
         <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
@@ -134,20 +88,123 @@
             #end
           </div>
         #end
-
       </div>
     </div>
-    <div class="footer">
-      Copyright © 2003-2008, The Apache Software Foundation
-    </div>
-<script type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-var pageTracker = _gat._getTracker("UA-4380560-1");
-pageTracker._initData();
-pageTracker._trackPageview();
-</script>
+#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=programming');">Digg this</a>
+            <!-- Slicker, but no text
+            <script type="text/javascript">
+              digg_skin = 'icon';
+              digg_window = 'new';
+              digg_title = 'Apache Geronimo v2.1 Documentation : $page.title';
+              digg_topic = 'programming';
+            </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-2009, 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
+##
+#macro (analytics)
+    <script type="text/javascript">
+      var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+      document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+    </script>
+    <script type="text/javascript">
+      var pageTracker = _gat._getTracker("UA-4380560-1");
+      pageTracker._initData();
+      pageTracker._trackPageview();
+    </script>
+#end
+##
+<html lang="en">
+  <head>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+    <link type="text/css" rel="stylesheet" href="http://geronimo.apache.org/style/default.css">
+    <LINK rel="SHORTCUT ICON" href="http://geronimo.apache.org/images/favicon.ico">
+    <LINK rel="schema.DC" href="http://purl.org/DC/elements/1.0/">
+    <META name="Description" content="$page.title" />
+    <META name="Keywords" content="Apache Geronimo 2.1 Documentation $page.title" />
+    <META name="Owner" content="dev@geronimo.apache.org" />
+    <META name="Robots" content="index, follow" />
+    <META name="Security" content="Public" />
+    <META name="Source" content="wiki template" />
+    <META name="DC.Date" scheme="iso8601" content="2009-01-06" />
+    <META name="DC.Language" scheme="rfc1766" content="en" />
+    <META name="DC.Rights" content="Copyright © 2003-2009, The Apache Software Foundation" />
+    <META http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))'/>
+
+    <script type="text/javascript" language="javascript">
+      var hide = null;
+      var show = null;
+      var children = null;
+
+      function init() {
+        /* Search form initialization */
+        var form = document.forms['search'];
+        if (form != null) {
+          form.elements['domains'].value = location.hostname;
+          form.elements['sitesearch'].value = location.hostname;
+        }
+
+        /* Children initialization */
+        hide = document.getElementById('hide');
+        show = document.getElementById('show');
+        children = document.all != null ?
+                   document.all['children'] :
+                   document.getElementById('children');
+        if (children != null) {
+          children.style.display = 'none';
+          show.style.display = 'inline';
+          hide.style.display = 'none';
+        }
+      }
+
+      function showChildren() {
+        children.style.display = 'block';
+        show.style.display = 'none';
+        hide.style.display = 'inline';
+      }
+
+      function hideChildren() {
+        children.style.display = 'none';
+        show.style.display = 'inline';
+        hide.style.display = 'none';
+      }
+    </script>
+
+    <title>Apache Geronimo v2.1 Documentation: $page.title</title>
+
+  </head>
+
+  <body onload="init()">
+
+    #banner()
+
+    #topNav()
+
+    #pageContent()
+
+    #footer()
+
+    #analytics()
+
   </body>
-</html>
+</html>
\ No newline at end of file

Modified: geronimo/site/trunk/template/GMOxDOC22_autoexport_template.xml
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/template/GMOxDOC22_autoexport_template.xml?rev=731984&r1=731983&r2=731984&view=diff
==============================================================================
--- geronimo/site/trunk/template/GMOxDOC22_autoexport_template.xml (original)
+++ geronimo/site/trunk/template/GMOxDOC22_autoexport_template.xml Tue Jan  6 08:16:55 2009
@@ -107,7 +107,7 @@
             <script type="text/javascript">
               digg_skin = 'icon';
               digg_window = 'new';
-              digg_title = 'Apache Geronimo v2.2 Documentation: $page.title';
+              digg_title = 'Apache Geronimo v2.2 Documentation : $page.title';
               digg_topic = 'programming';
             </script>
             <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
@@ -115,7 +115,8 @@
             &nbsp;&nbsp;
           </td>
           <td align="right" valign="middle" class="footer">
-            Copyright &#169; 2003-2008, The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0.</a>&nbsp;&nbsp;
+            <a href="http://cwiki.apache.org/GMOxPMGT/geronimo-privacy-policy.html">Privacy Policy</a>&nbsp;&nbsp;-&nbsp;&nbsp;
+            Copyright &#169; 2003-2009, 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> 
@@ -140,14 +141,14 @@
     <LINK rel="SHORTCUT ICON" href="http://geronimo.apache.org/images/favicon.ico">
     <LINK rel="schema.DC" href="http://purl.org/DC/elements/1.0/">
     <META name="Description" content="$page.title" />
-    <META name="Keywords" content="geronimo 2.2 $page.title" />
+    <META name="Keywords" content="Apache Geronimo 2.2 Documentation $page.title" />
     <META name="Owner" content="dev@geronimo.apache.org" />
     <META name="Robots" content="index, follow" />
     <META name="Security" content="Public" />
     <META name="Source" content="wiki template" />
-    <META name="DC.Date" scheme="iso8601" content="2008-09-15" />
+    <META name="DC.Date" scheme="iso8601" content="2009-01-06" />
     <META name="DC.Language" scheme="rfc1766" content="en" />
-    <META name="DC.Rights" content="Copyright © 2003-2008, The Apache Software Foundation" />
+    <META name="DC.Rights" content="Copyright © 2003-2009, The Apache Software Foundation" />
     <META http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))'/>
 
     <script type="text/javascript" language="javascript">
@@ -204,4 +205,4 @@
     #analytics()
 
   </body>
-</html>
+</html>
\ No newline at end of file