You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/08/20 09:30:14 UTC

svn commit: r432950 [2/3] - in /geronimo/trunk: ./ applications/console/console-core/src/site/ applications/console/console-core/src/site/apt/ applications/console/console-ear/src/site/ applications/console/console-ear/src/site/apt/ applications/consol...

Modified: geronimo/trunk/configs/ldap-realm/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/ldap-realm/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/configs/ldap-realm/src/site/site.xml (original)
+++ geronimo/trunk/configs/ldap-realm/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/configs/online-deployer/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/online-deployer/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/configs/online-deployer/src/site/site.xml (original)
+++ geronimo/trunk/configs/online-deployer/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/configs/openejb-deployer/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/openejb-deployer/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/configs/openejb-deployer/src/site/site.xml (original)
+++ geronimo/trunk/configs/openejb-deployer/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/configs/openejb/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/openejb/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/configs/openejb/src/site/site.xml (original)
+++ geronimo/trunk/configs/openejb/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/configs/remote-deploy-jetty/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/remote-deploy-jetty/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/configs/remote-deploy-jetty/src/site/site.xml (original)
+++ geronimo/trunk/configs/remote-deploy-jetty/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/configs/remote-deploy-tomcat/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/remote-deploy-tomcat/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/configs/remote-deploy-tomcat/src/site/site.xml (original)
+++ geronimo/trunk/configs/remote-deploy-tomcat/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/configs/rmi-naming/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/rmi-naming/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/configs/rmi-naming/src/site/site.xml (original)
+++ geronimo/trunk/configs/rmi-naming/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/configs/servlets-examples-jetty/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/servlets-examples-jetty/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/configs/servlets-examples-jetty/src/site/site.xml (original)
+++ geronimo/trunk/configs/servlets-examples-jetty/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/configs/servlets-examples-tomcat/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/servlets-examples-tomcat/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/configs/servlets-examples-tomcat/src/site/site.xml (original)
+++ geronimo/trunk/configs/servlets-examples-tomcat/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/configs/sharedlib/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/sharedlib/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/configs/sharedlib/src/site/site.xml (original)
+++ geronimo/trunk/configs/sharedlib/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/configs/shutdown/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/shutdown/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/configs/shutdown/src/site/site.xml (original)
+++ geronimo/trunk/configs/shutdown/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/configs/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/configs/src/site/site.xml (original)
+++ geronimo/trunk/configs/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/configs/system-database/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/system-database/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/configs/system-database/src/site/site.xml (original)
+++ geronimo/trunk/configs/system-database/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/configs/tomcat-deployer/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/tomcat-deployer/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat-deployer/src/site/site.xml (original)
+++ geronimo/trunk/configs/tomcat-deployer/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/configs/tomcat/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/tomcat/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat/src/site/site.xml (original)
+++ geronimo/trunk/configs/tomcat/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/configs/uddi-jetty/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/uddi-jetty/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-jetty/src/site/site.xml (original)
+++ geronimo/trunk/configs/uddi-jetty/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/configs/uddi-tomcat/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/uddi-tomcat/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-tomcat/src/site/site.xml (original)
+++ geronimo/trunk/configs/uddi-tomcat/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/configs/unavailable-client-deployer/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/unavailable-client-deployer/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/configs/unavailable-client-deployer/src/site/site.xml (original)
+++ geronimo/trunk/configs/unavailable-client-deployer/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/configs/unavailable-ejb-deployer/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/unavailable-ejb-deployer/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/configs/unavailable-ejb-deployer/src/site/site.xml (original)
+++ geronimo/trunk/configs/unavailable-ejb-deployer/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/configs/unavailable-webservices-deployer/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/unavailable-webservices-deployer/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/configs/unavailable-webservices-deployer/src/site/site.xml (original)
+++ geronimo/trunk/configs/unavailable-webservices-deployer/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/configs/upgrade-cli/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/upgrade-cli/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/configs/upgrade-cli/src/site/site.xml (original)
+++ geronimo/trunk/configs/upgrade-cli/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/configs/upgrade/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/upgrade/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/configs/upgrade/src/site/site.xml (original)
+++ geronimo/trunk/configs/upgrade/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/configs/welcome-jetty/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/welcome-jetty/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-jetty/src/site/site.xml (original)
+++ geronimo/trunk/configs/welcome-jetty/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/configs/welcome-tomcat/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/welcome-tomcat/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-tomcat/src/site/site.xml (original)
+++ geronimo/trunk/configs/welcome-tomcat/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/m2-assemblies/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/m2-assemblies/src/site/site.xml (original)
+++ geronimo/trunk/m2-assemblies/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/m2-plugins/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/car-maven-plugin/pom.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/m2-plugins/car-maven-plugin/pom.xml (original)
+++ geronimo/trunk/m2-plugins/car-maven-plugin/pom.xml Sun Aug 20 00:30:07 2006
@@ -115,6 +115,16 @@
             <artifactId>commons-logging</artifactId>
         </dependency>
         
+        <!--
+        HACK: Explicity add maven-artifact here (which is picked up plugin-support)
+              because w/o it clover will freak out, as it picks up an older version
+        -->
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-artifact</artifactId>
+            <version>2.0.4</version>
+        </dependency>
+        
     </dependencies>
     
     <build>

Modified: geronimo/trunk/m2-plugins/car-maven-plugin/src/site/apt/usage.apt
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/car-maven-plugin/src/site/apt/usage.apt?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/m2-plugins/car-maven-plugin/src/site/apt/usage.apt (original)
+++ geronimo/trunk/m2-plugins/car-maven-plugin/src/site/apt/usage.apt Sun Aug 20 00:30:07 2006
@@ -13,20 +13,6 @@
 <project>
     ...
     <pluginRepositories>
-        ...
-        <pluginRepository>
-            <id>apache</id>
-            <name>Apache Repository</name>
-            <url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </pluginRepository>
-        
         <pluginRepository>
             <id>apache-snapshots</id>
             <name>Apache Snapshots Repository</name>
@@ -49,6 +35,8 @@
 
 * Define Dependency as Extention
 
+ Install as extention to allow 'car' packaging to be used.
+
 +----------+
 <project>
     ...
@@ -61,7 +49,6 @@
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
-                <!-- Install as extention to allow 'car' packaging to be used. -->
                 <extensions>true</extensions>
             </plugin>
         </plugins>
@@ -71,7 +58,9 @@
 </project>
 +----------+
 
-* CAR with ClassPath and MainClass
+* CAR with Class-Path and Main-Class manifest entries
+
+ NOTE: The list of classpath elements is non-transitive.
 
 +----------+
 <project>
@@ -85,28 +74,97 @@
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
-                <extensions>true</extensions>
                 <configuration>
-                    <classPath>
-                        <element>../lib/geronimo-qname_1.1_spec-${geronimoSpecQnameVersion}.jar</element>
-                        <element>../lib/geronimo-common-${pom.version}.jar</element>
-                        <element>../lib/geronimo-kernel-${pom.version}.jar</element>
-                        <element>../lib/geronimo-system-${pom.version}.jar</element>
-                        <element>../lib/geronimo-util-${pom.version}.jar</element>
-                        <element>../lib/cglib-nodep-${cglibVersion}.jar</element>
-                        <element>../lib/concurrent-${concurrentVersion}.jar</element>
-                        <element>../lib/commons-cli-${commonsCliVersion}.jar</element>
-                        <element>../lib/commons-logging-${commonsLoggingVersion}.jar</element>
-                        <element>../lib/log4j-${log4jVersion}.jar</element>
-                        <element>../lib/mx4j-${mx4jVersion}.jar</element>
-                        <element>../lib/mx4j-remote-${mx4jVersion}.jar</element>
-                        <element>../lib/endorsed/xercesImpl-${xercesVersion}.jar</element>
-                        <element>../lib/endorsed/xmlParserAPIs-${xmlParserApisVersion}.jar</element>
-                        <element>../lib/xpp3-${xpp3Version}.jar</element>
-                        <element>../lib/xstream-${xstreamVersion}.jar</element>
-                    </classPath>
-                    <mainClass>org.apache.geronimo.system.main.Daemon</mainClass>
-                    <logLevel>DEBUG</logLevel>
+                    <archive>
+                        <manifestEntries>
+                            <Endorsed-Dirs>lib/endorsed</Endorsed-Dirs>
+                            <Extension-Dirs>lib/ext</Extension-Dirs>
+                        </manifestEntries>
+                        <manifest>
+                            <mainClass>org.apache.geronimo.system.main.Daemon</mainClass>
+                        </manifest>
+                    </archive>
+                    <classpath>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-common</artifactId>
+                            <version>${pom.version}</version>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-kernel</artifactId>
+                            <version>${pom.version}</version>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-system</artifactId>
+                            <version>${pom.version}</version>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-util</artifactId>
+                            <version>${pom.version}</version>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>org.apache.geronimo.specs</groupId>
+                            <artifactId>geronimo-qname_1.1_spec</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>mx4j</groupId>
+                            <artifactId>mx4j</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>mx4j</groupId>
+                            <artifactId>mx4j-remote</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>commons-cli</groupId>
+                            <artifactId>commons-cli</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>commons-logging</groupId>
+                            <artifactId>commons-logging</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>cglib</groupId>
+                            <artifactId>cglib-nodep</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>log4j</groupId>
+                            <artifactId>log4j</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>jline</groupId>
+                            <artifactId>jline</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>xpp3</groupId>
+                            <artifactId>xpp3</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>xstream</groupId>
+                            <artifactId>xstream</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>backport-util-concurrent</groupId>
+                            <artifactId>backport-util-concurrent</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>concurrent</groupId>
+                            <artifactId>concurrent</artifactId>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>xerces</groupId>
+                            <artifactId>xercesImpl</artifactId>
+                            <classpathPrefix>../lib/endorsed</classpathPrefix>
+                        </classpathElement>
+                        <classpathElement>
+                            <groupId>xerces</groupId>
+                            <artifactId>xmlParserAPIs</artifactId>
+                            <classpathPrefix>../lib/endorsed</classpathPrefix>
+                        </classpathElement>
+                    </classpath>
+                    <classpathPrefix>../lib</classpathPrefix>
                 </configuration>
             </plugin>
             ...

Modified: geronimo/trunk/m2-plugins/car-maven-plugin/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/car-maven-plugin/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/m2-plugins/car-maven-plugin/src/site/site.xml (original)
+++ geronimo/trunk/m2-plugins/car-maven-plugin/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,37 +18,12 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
+        ${modules}
         
         <menu name="${project.name}">
             <item name="Overview" href="index.html"/>
@@ -56,11 +31,10 @@
             <item name="Configuration" href="plugin-info.html"/>
         </menu>
         
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
-        
         ${reports}
         
     </body>
+
 </project>
+
+

Modified: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/site/site.xml (original)
+++ geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,51 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
-        
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
         
-        <menu ref="parent"/>
+        ${parentProject}
         
-        <menu name="${project.name}">
-            <item name="Overview" href="index.html"/>
-            <item name="Usage" href="usage.html"/>
-            <item name="Configuration" href="plugin-info.html"/>
-        </menu>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/m2-plugins/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/m2-plugins/src/site/site.xml (original)
+++ geronimo/trunk/m2-plugins/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/modules/activation/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/activation/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/modules/activation/src/site/site.xml (original)
+++ geronimo/trunk/modules/activation/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/modules/activemq-embedded-rar/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/activemq-embedded-rar/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/modules/activemq-embedded-rar/src/site/site.xml (original)
+++ geronimo/trunk/modules/activemq-embedded-rar/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/modules/activemq-gbean-management/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/activemq-gbean-management/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/modules/activemq-gbean-management/src/site/site.xml (original)
+++ geronimo/trunk/modules/activemq-gbean-management/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/modules/activemq-gbean/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/activemq-gbean/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/modules/activemq-gbean/src/site/site.xml (original)
+++ geronimo/trunk/modules/activemq-gbean/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/modules/axis-builder/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/axis-builder/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/src/site/site.xml (original)
+++ geronimo/trunk/modules/axis-builder/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/modules/axis/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/axis/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/modules/axis/src/site/site.xml (original)
+++ geronimo/trunk/modules/axis/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/modules/client-builder/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/client-builder/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/src/site/site.xml (original)
+++ geronimo/trunk/modules/client-builder/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/modules/client/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/client/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/modules/client/src/site/site.xml (original)
+++ geronimo/trunk/modules/client/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/modules/common/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/common/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/modules/common/src/site/site.xml (original)
+++ geronimo/trunk/modules/common/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/modules/connector-builder/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector-builder/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/site/site.xml (original)
+++ geronimo/trunk/modules/connector-builder/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/modules/connector/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/src/site/site.xml (original)
+++ geronimo/trunk/modules/connector/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/modules/converter/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/converter/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/modules/converter/src/site/site.xml (original)
+++ geronimo/trunk/modules/converter/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/modules/core/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/core/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/modules/core/src/site/site.xml (original)
+++ geronimo/trunk/modules/core/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/modules/deploy-config/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/deploy-config/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-config/src/site/site.xml (original)
+++ geronimo/trunk/modules/deploy-config/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/modules/deploy-jsr88/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/deploy-jsr88/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-jsr88/src/site/site.xml (original)
+++ geronimo/trunk/modules/deploy-jsr88/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/modules/deploy-tool/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/deploy-tool/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-tool/src/site/site.xml (original)
+++ geronimo/trunk/modules/deploy-tool/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/modules/deployment/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/deployment/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/modules/deployment/src/site/site.xml (original)
+++ geronimo/trunk/modules/deployment/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/modules/derby/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/derby/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/modules/derby/src/site/site.xml (original)
+++ geronimo/trunk/modules/derby/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/modules/directory/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/directory/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/modules/directory/src/site/site.xml (original)
+++ geronimo/trunk/modules/directory/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>
 
 

Modified: geronimo/trunk/modules/geronimo-testsupport/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/geronimo-testsupport/src/site/site.xml?rev=432950&r1=432949&r2=432950&view=diff
==============================================================================
--- geronimo/trunk/modules/geronimo-testsupport/src/site/site.xml (original)
+++ geronimo/trunk/modules/geronimo-testsupport/src/site/site.xml Sun Aug 20 00:30:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
 
@@ -18,45 +18,17 @@
 <!-- $Id$ -->
 
 <project name="${project.name}">
-    <skin>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>geronimo-skin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy"/>
-    
-    <bannerLeft>
-        <src>images/topleft_logo_437x64.gif</src>
-    </bannerLeft>
-    
-    <!--
-    <bannerRight>
-        <name>${project.name}</name>
-    </bannerRight>
-    -->
     
     <body>
-        <!--
-        <links>
-            <item name="Geronimo" href="http://geronimo.apache.org/"/>
-            <item name="Apache" href="http://apache.org/"/>
-        </links>
-        -->
         
-        <menu name="Geronimo">
-            <item name="Home" href="http://geronimo.apache.org/"/>
-        </menu>
+        ${parentProject}
         
-        <menu ref="parent"/>
-        
-        <menu ref="modules"/>
-        
-        <menu ref="reports"/>
+        ${modules}
         
         ${reports}
         
     </body>
+
 </project>