empire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From doeb...@apache.org
Subject svn commit: r1245208 [1/4] - in /empire-db/site: ./ community/ css/ documentation/ downloads/ empiredb/ images/ images/diagrams/ images/logos/ images/mail/ images/menu/ struts2ext/ support/
Date Thu, 16 Feb 2012 22:14:22 GMT
Author: doebele
Date: Thu Feb 16 22:14:20 2012
New Revision: 1245208

URL: http://svn.apache.org/viewvc?rev=1245208&view=rev
Log:
EMPIREDB-134
Initial change to meet TLP requirements.
Please note, that the logo is only a draft and not final!

Added:
    empire-db/site/apache.htm   (with props)
    empire-db/site/doap_Empire-db.rdf   (contents, props changed)
      - copied, changed from r1245127, empire-db/site/doap_Empire-db_(incubating).rdf
    empire-db/site/images/asflink.gif   (with props)
    empire-db/site/images/logos/feather-small.gif   (with props)
Removed:
    empire-db/site/doap_Empire-db_(incubating).rdf
    empire-db/site/images/Thumbs.db
    empire-db/site/images/diagrams/Thumbs.db
    empire-db/site/images/logos/Thumbs.db
    empire-db/site/images/logos/apache-incubator-logo.png
    empire-db/site/images/mail/Thumbs.db
    empire-db/site/images/menu/Thumbs.db
    empire-db/site/imprint.htm
Modified:
    empire-db/site/community/community.htm
    empire-db/site/community/contributors.htm
    empire-db/site/community/jira.htm
    empire-db/site/community/mailing_lists.htm
    empire-db/site/community/road_map.htm
    empire-db/site/community/source_code.htm
    empire-db/site/css/layout.css
    empire-db/site/css/left.css
    empire-db/site/documentation/api.htm
    empire-db/site/documentation/class_overview.htm
    empire-db/site/documentation/documentation.htm
    empire-db/site/documentation/getting_started.htm
    empire-db/site/documentation/tutorial.htm
    empire-db/site/downloads/latest.htm
    empire-db/site/downloads/license.htm
    empire-db/site/downloads/previous.htm
    empire-db/site/empiredb/empiredb.htm
    empire-db/site/empiredb/faq.htm
    empire-db/site/empiredb/hibernate.htm
    empire-db/site/empiredb/metadata.htm
    empire-db/site/empiredb/pattern.htm
    empire-db/site/empiredb/stringfree.htm
    empire-db/site/images/logos/empire-db-logo.gif
    empire-db/site/index.html
    empire-db/site/main.dwt
    empire-db/site/news.htm
    empire-db/site/struts2ext/forms_controls.htm
    empire-db/site/struts2ext/input_controls.htm
    empire-db/site/struts2ext/rendering_parsing.htm
    empire-db/site/struts2ext/struts2ext.htm
    empire-db/site/struts2ext/tag_reference.htm
    empire-db/site/support/support.htm

Added: empire-db/site/apache.htm
URL: http://svn.apache.org/viewvc/empire-db/site/apache.htm?rev=1245208&view=auto
==============================================================================
--- empire-db/site/apache.htm (added)
+++ empire-db/site/apache.htm Thu Feb 16 22:14:20 2012
@@ -0,0 +1,248 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-gb" lang="en-gb" >
+<!-- #BeginTemplate "main.dwt" -->
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta http-equiv="language" content="en" />
+	<meta name="robots" content="index, follow" />
+	<meta name="keywords" content="java, jar, jdbc, sql, data, metadata, persistence, rdbms, orm, mapping" />
+	<meta name="description" content="Open Source relational data persistence component." />
+	
+	<!-- #BeginEditable "doctitle" -->
+	<title>Empire-db relational data persistence - Disclaimer</title>
+	<!-- #EndEditable -->
+	
+	<script type="text/javascript" src="./js/prototype.js"></script>
+	<script type="text/javascript" src="./js/menu.js"></script>
+	<!-- #BeginEditable "javascripts" -->
+	<!-- #EndEditable -->
+	
+	<link rel="shortcut icon" href="empire-db.ico" />
+	<link rel="stylesheet" href="css/layout.css" type="text/css" />
+	<!-- #BeginEditable "stylesheets" -->
+<style type="text/css">
+
+
+
+
+
+
+
+
+
+
+
+
+
+div#top {
+	height: 20px;	
+}
+
+table#comparison {
+	display: block;
+	width: 580px;
+}
+
+table#comparison th {
+	background-color: #F0F0F0;
+}
+
+table#comparison tbody th {
+	width: 150px;
+	text-align: left;
+}
+
+table#comparison td {
+	text-align: center;
+}
+
+table#comparison td.classical {
+	background-color: #ffffaa; /* #ffff99; */
+}
+
+table#comparison td.empiredb {
+	background-color: #ffd5aa; /* #ffcc99; /*
+}
+
+</style>
+	<!-- #EndEditable -->
+</head>
+
+<body>
+<div id="wrapper">
+
+	<!-- Header -->
+	<div id="header">
+		<div id="logo">
+			<img src="images/logos/empire-db-logo.gif" alt="Empire-db: The relational data persistence component." />
+		</div>
+		<div id="asf">
+			<a id="asfhome" target="_blank" href="http://www.apache.org"><img src="images/logos/feather-small.gif" alt="The Apache Software Foundation" /></a>
+			<label for="asfhome" >The Apache Software Foundation</label>
+		</div>
+		<div style="clear:both"></div>
+	</div>
+	
+	<!-- Top -->
+	<div id="top">
+		<div id="topbar">&nbsp;</div>
+	</div>
+	
+	<!-- Middle -->
+	<div id="middle">
+		<div id="left">    
+				<div id="menuBox">     
+					<ul id="mainMenu">
+						<li id="menu_home"><a href="index.html">Home</a></li>
+						<li id="menu_news"><a href="news.htm">News</a></li>
+						<li id="menu_empiredb"><a href="empiredb/empiredb.htm">Empire-db</a>
+								<ul class="subMenu">
+									<li id="menu_empiredb_extending_pattern"><a href="empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
+									<li id="menu_empiredb_handling_metadata"><a href="empiredb/metadata.htm">Handling data and metadata</a></li>
+									<li id="menu_empiredb_wrong"><a href="empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
+									<li id="menu_empiredb_stringfree"><a href="empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
+									<li id="menu_empiredb_faq"><a href="empiredb/faq.htm">FAQ</a></li>
+								</ul>
+						</li>
+						<li id="menu_struts2ext"><a href="struts2ext/struts2ext.htm">Empire-db and Struts2</a>
+							<ul class="subMenu">
+								<li id="menu_struts2ext_forms_controls"><a href="struts2ext/forms_controls.htm">Forms and controls</a></li>
+								<li id="menu_struts2ext_rendering_parsing"><a href="struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
+								<!--<li id="menu_struts2ext_tag_reference"><a href="struts2ext/tag_reference.htm">Tag reference</a></li>-->
+								<li id="menu_struts2ext_input_controls"><a href="struts2ext/input_controls.htm">Input controls</a></li>
+							</ul>
+						</li>
+						<li id="menu_downloads"><a href="downloads/latest.htm">Downloads</a>
+								<ul class="subMenu">
+									<li id="menu_downloads_previous"><a href="downloads/previous.htm">Previous releases</a></li>
+									<li id="menu_downloads_license"><a href="downloads/license.htm">License</a></li>
+								</ul>
+						</li>
+						<li id="menu_documentation"><a href="documentation/documentation.htm">Documentation</a>					
+							<ul class="subMenu">
+								<li id="menu_documentation_class_overview"><a href="documentation/class_overview.htm">Empire-db class<br />overview</a></li>
+								<li id="menu_documentation_tutorials"><a href="documentation/tutorial.htm">Tutorial</a></li>
+								<li id="menu_documentation_getting_started"><a href="documentation/getting_started.htm">Getting started</a></li>
+								<li id="menu_documentation_api"><a href="documentation/api.htm">API</a></li>
+							</ul>
+						</li>
+						<li id="menu_community"><a href="community/community.htm">Community</a>					
+							<ul class="subMenu">
+								<li id="menu_community_mailing_lists"><a href="community/mailing_lists.htm">Mailing lists</a></li>
+								<li id="menu_community_source_code"><a href="community/source_code.htm">Source code</a></li>
+								<li id="menu_community_jira"><a href="community/jira.htm">Ticketing &amp; Wiki</a></li>
+								<!--<li id="menu_community_road_map"><a href="community/road_map.htm">Road map</a></li>-->
+								<li id="menu_community_contributors"><a href="community/contributors.htm">Contributors</a></li>
+							</ul>
+						</li>
+						<li id="menu_apache"><a href="apache.htm">About Apache</a>
+							<ul class="subMenu">
+								<li id="menu_apache_home"><a href="http://www.apache.org">Apache home<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_donate"><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_thanks"><a href="http://www.apache.org/foundation/thanks.html">Foundation thanks<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_security"><a href="http://www.apache.org/security/">Security<span class="asflink">&nbsp;</span></a></li>
+							</ul>
+						</li>
+						<li id="menu_disclaimer"><a href="http://www.apache.org/licenses/">License<span class="asflink">&nbsp;</span></a></li>
+					</ul>
+				</div>
+				
+		</div>
+	
+		<!-- #BeginEditable "menu" -->	
+	<script type="text/javascript">
+		var menu = new Menu( 'mainMenu', 'menu_apache' );
+	</script>
+		<!-- #EndEditable -->
+		<script type="text/javascript">
+			/* <![CDATA[ */
+			if( menu ) {
+				// Menu fully opened (comment out if not wanted)
+				// menu.openAll();
+			/* ]]> */
+			}
+		</script>
+	
+		<div id="main">		
+			
+			<div id="pathway">
+				<span style="float:left">
+			<!-- #BeginEditable "pathway" -->
+	        	Disclaimer
+	        <!-- #EndEditable -->
+	        	</span>
+		     	<a id="downloadLink" href="downloads/latest.htm" style="float:right">Download</a>
+	        </div>
+			
+			<div id="content">
+			<!-- #BeginEditable "content" -->
+		<h1>About the Apache Software Foundation</h1>
+		<p>To find out more about the Apache Software Foundation, what it is and how it works please select one of the following links:</p>
+		<table id="find_out_more">
+			<tr><th class="odd"><a href="http://www.apache.org">Apache home<span class="asflink">&nbsp;</span></a></th>
+				<td class="odd">&nbsp;</td></tr>
+			<tr><th><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship<span class="asflink">&nbsp;</span></a></th>
+				<td>&nbsp;</td></tr>
+			<tr><th class="odd"><a href="http://www.apache.org/foundation/thanks.html">Foundation thanks<span class="asflink">&nbsp;</span></a></th>
+				<td class="odd">&nbsp;</td></tr>
+			<tr><th><a href="http://www.apache.org/security/">Security issues<span class="asflink">&nbsp;</span></a></th>
+				<td>&nbsp;</td></tr>
+			</table>
+			<!-- #EndEditable --></div>
+					
+			<div id="nav">
+				<hr />
+				<div id="nav_prev">
+					<a id="prev" href=""><img src="images/prev.gif" alt="" /> Previous Page</a> 
+					&nbsp;
+				</div>
+				<div id="nav_next">
+					&nbsp;
+					<a id="next" href="">Next Page <img src="images/next.gif" alt="" /></a>
+				</div>
+				<div style="clear: both;"></div>
+			</div>
+			
+			<script type="text/javascript">
+			/* <![CDATA[ */
+				if( ( typeof(prev_page) == "undefined" || prev_page == "" ) &&
+					( typeof(next_page) == "undefined" || next_page == "" ) ) 
+				{
+					$( 'nav' ).hide();
+				}
+				else 
+				{			
+					if( typeof(prev_page) != "undefined" && prev_page != "" ) {
+						$( 'prev' ).href = prev_page;
+						$( 'prev' ).show();
+					}
+					else {
+						$( 'prev' ).hide();
+					}
+					
+					if( typeof(next_page) != "undefined" && next_page !="" ) {
+						$( 'next' ).href = next_page;
+						$( 'next' ).show();
+					}
+					else {
+						$( 'next' ).hide();
+					}
+				}
+			/* ]]> */
+			</script>
+
+		</div>
+
+	</div>
+	
+	<!-- Footer -->		
+	<div id="footer">
+		<div class="cr"><small>Copyright &copy; 2008-2012, The Apache Software Foundation</small></div>
+		<div class="tm"><small>Apache Empire-db, Empire-db, Apache, the Apache feather logo, and the Apache Empire-db project logo are trademarks of The Apache Software Foundation</small></div>
+	</div>
+
+</div>
+
+</body>
+<!-- #EndTemplate -->
+</html>
\ No newline at end of file

Propchange: empire-db/site/apache.htm
------------------------------------------------------------------------------
    eol-style = native

Propchange: empire-db/site/apache.htm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: empire-db/site/community/community.htm
URL: http://svn.apache.org/viewvc/empire-db/site/community/community.htm?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/community/community.htm (original)
+++ empire-db/site/community/community.htm Thu Feb 16 22:14:20 2012
@@ -32,8 +32,8 @@
 			<img src="../images/logos/empire-db-logo.gif" alt="Empire-db: The relational data persistence component." />
 		</div>
 		<div id="asf">
-			<a target="_blank" href="http://incubator.apache.org/">
-			<img src="../images/logos/apache-incubator-logo.png" alt="Apache Incubator" /></a>
+			<a id="asfhome" target="_blank" href="http://www.apache.org"><img src="../images/logos/feather-small.gif" alt="The Apache Software Foundation" /></a>
+			<label for="asfhome" >The Apache Software Foundation</label>
 		</div>
 		<div style="clear:both"></div>
 	</div>
@@ -50,68 +50,55 @@
 					<ul id="mainMenu">
 						<li id="menu_home"><a href="../index.html">Home</a></li>
 						<li id="menu_news"><a href="../news.htm">News</a></li>
-						<li id="menu_empiredb">
-						<a href="../empiredb/empiredb.htm">Empire-db</a>
+						<li id="menu_empiredb"><a href="../empiredb/empiredb.htm">Empire-db</a>
 								<ul class="subMenu">
-									<li id="menu_empiredb_extending_pattern">
-									<a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
-									<li id="menu_empiredb_handling_metadata">
-									<a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
-									<li id="menu_empiredb_wrong">
-									<a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
-									<li id="menu_empiredb_stringfree">
-									<a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
-									<li id="menu_empiredb_faq">
-									<a href="../empiredb/faq.htm">FAQ</a></li>
+									<li id="menu_empiredb_extending_pattern"><a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
+									<li id="menu_empiredb_handling_metadata"><a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
+									<li id="menu_empiredb_wrong"><a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
+									<li id="menu_empiredb_stringfree"><a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
+									<li id="menu_empiredb_faq"><a href="../empiredb/faq.htm">FAQ</a></li>
 								</ul>
 						</li>
-						<li id="menu_struts2ext">
-						<a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
+						<li id="menu_struts2ext"><a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
 							<ul class="subMenu">
-								<li id="menu_struts2ext_forms_controls">
-								<a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
-								<li id="menu_struts2ext_rendering_parsing">
-								<a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
+								<li id="menu_struts2ext_forms_controls"><a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
+								<li id="menu_struts2ext_rendering_parsing"><a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
 								<!--<li id="menu_struts2ext_tag_reference"><a href="struts2ext/tag_reference.htm">Tag reference</a></li>-->
-								<li id="menu_struts2ext_input_controls">
-								<a href="../struts2ext/input_controls.htm">Input controls</a></li>
+								<li id="menu_struts2ext_input_controls"><a href="../struts2ext/input_controls.htm">Input controls</a></li>
 							</ul>
 						</li>
-						<li id="menu_downloads">
-						<a href="../downloads/latest.htm">Downloads</a>
+						<li id="menu_downloads"><a href="../downloads/latest.htm">Downloads</a>
 								<ul class="subMenu">
-									<li id="menu_downloads_previous">
-									<a href="../downloads/previous.htm">Previous releases</a></li>
-									<li id="menu_downloads_license">
-									<a href="../downloads/license.htm">License</a></li>
+									<li id="menu_downloads_previous"><a href="../downloads/previous.htm">Previous releases</a></li>
+									<li id="menu_downloads_license"><a href="../downloads/license.htm">License</a></li>
 								</ul>
 						</li>
-						<li id="menu_documentation">
-						<a href="../documentation/documentation.htm">Documentation</a>					
+						<li id="menu_documentation"><a href="../documentation/documentation.htm">Documentation</a>					
 							<ul class="subMenu">
-								<li id="menu_documentation_class_overview">
-								<a href="../documentation/class_overview.htm">Empire-db class<br />overview</a></li>
-								<li id="menu_documentation_tutorials">
-								<a href="../documentation/tutorial.htm">Tutorial</a></li>
-								<li id="menu_documentation_getting_started">
-								<a href="../documentation/getting_started.htm">Getting started</a></li>
-								<li id="menu_documentation_api">
-								<a href="../documentation/api.htm">API</a></li>
+								<li id="menu_documentation_class_overview"><a href="../documentation/class_overview.htm">Empire-db class<br />overview</a></li>
+								<li id="menu_documentation_tutorials"><a href="../documentation/tutorial.htm">Tutorial</a></li>
+								<li id="menu_documentation_getting_started"><a href="../documentation/getting_started.htm">Getting started</a></li>
+								<li id="menu_documentation_api"><a href="../documentation/api.htm">API</a></li>
 							</ul>
 						</li>
 						<li id="menu_community"><a href="community.htm">Community</a>					
 							<ul class="subMenu">
-								<li id="menu_community_mailing_lists">
-								<a href="mailing_lists.htm">Mailing lists</a></li>
-								<li id="menu_community_source_code">
-								<a href="source_code.htm">Source code</a></li>
+								<li id="menu_community_mailing_lists"><a href="mailing_lists.htm">Mailing lists</a></li>
+								<li id="menu_community_source_code"><a href="source_code.htm">Source code</a></li>
 								<li id="menu_community_jira"><a href="jira.htm">Ticketing &amp; Wiki</a></li>
 								<!--<li id="menu_community_road_map"><a href="community/road_map.htm">Road map</a></li>-->
-								<li id="menu_community_contributors">
-								<a href="contributors.htm">Contributors</a></li>
+								<li id="menu_community_contributors"><a href="contributors.htm">Contributors</a></li>
 							</ul>
 						</li>
-						<li id="menu_disclaimer"><a href="../disclaimer.htm">Disclaimer</a></li>
+						<li id="menu_apache"><a href="../apache.htm">About Apache</a>
+							<ul class="subMenu">
+								<li id="menu_apache_home"><a href="http://www.apache.org">Apache home<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_donate"><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_thanks"><a href="http://www.apache.org/foundation/thanks.html">Foundation thanks<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_security"><a href="http://www.apache.org/security/">Security<span class="asflink">&nbsp;</span></a></li>
+							</ul>
+						</li>
+						<li id="menu_disclaimer"><a href="http://www.apache.org/licenses/">License<span class="asflink">&nbsp;</span></a></li>
 					</ul>
 				</div>
 				
@@ -169,8 +156,7 @@
 				</div>
 				<div id="nav_next">
 					&nbsp;
-					<a id="next" href="">Next Page 
-					<img src="../images/next.gif" alt="" /></a>
+					<a id="next" href="">Next Page <img src="../images/next.gif" alt="" /></a>
 				</div>
 				<div style="clear: both;"></div>
 			</div>
@@ -209,15 +195,12 @@
 	
 	<!-- Footer -->		
 	<div id="footer">
-		<small>Copyright &copy; 2008-2011, The Apache Software Foundation</small>&nbsp;<!--<p style="padding-right: 25px; text-align: right;">
-	    <a href="http://validator.w3.org/check?uri=referer">
-		<img
-	        src="images/valid-xhtml10.png"
-	        alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
-	 	</p>--></div>
+		<div class="cr"><small>Copyright &copy; 2008-2012, The Apache Software Foundation</small></div>
+		<div class="tm"><small>Apache Empire-db, Empire-db, Apache, the Apache feather logo, and the Apache Empire-db project logo are trademarks of The Apache Software Foundation</small></div>
+	</div>
 
 </div>
 
 </body>
 <!-- #EndTemplate -->
-</html>
+</html>
\ No newline at end of file

Modified: empire-db/site/community/contributors.htm
URL: http://svn.apache.org/viewvc/empire-db/site/community/contributors.htm?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/community/contributors.htm (original)
+++ empire-db/site/community/contributors.htm Thu Feb 16 22:14:20 2012
@@ -32,8 +32,8 @@
 			<img src="../images/logos/empire-db-logo.gif" alt="Empire-db: The relational data persistence component." />
 		</div>
 		<div id="asf">
-			<a target="_blank" href="http://incubator.apache.org/">
-			<img src="../images/logos/apache-incubator-logo.png" alt="Apache Incubator" /></a>
+			<a id="asfhome" target="_blank" href="http://www.apache.org"><img src="../images/logos/feather-small.gif" alt="The Apache Software Foundation" /></a>
+			<label for="asfhome" >The Apache Software Foundation</label>
 		</div>
 		<div style="clear:both"></div>
 	</div>
@@ -50,68 +50,55 @@
 					<ul id="mainMenu">
 						<li id="menu_home"><a href="../index.html">Home</a></li>
 						<li id="menu_news"><a href="../news.htm">News</a></li>
-						<li id="menu_empiredb">
-						<a href="../empiredb/empiredb.htm">Empire-db</a>
+						<li id="menu_empiredb"><a href="../empiredb/empiredb.htm">Empire-db</a>
 								<ul class="subMenu">
-									<li id="menu_empiredb_extending_pattern">
-									<a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
-									<li id="menu_empiredb_handling_metadata">
-									<a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
-									<li id="menu_empiredb_wrong">
-									<a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
-									<li id="menu_empiredb_stringfree">
-									<a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
-									<li id="menu_empiredb_faq">
-									<a href="../empiredb/faq.htm">FAQ</a></li>
+									<li id="menu_empiredb_extending_pattern"><a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
+									<li id="menu_empiredb_handling_metadata"><a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
+									<li id="menu_empiredb_wrong"><a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
+									<li id="menu_empiredb_stringfree"><a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
+									<li id="menu_empiredb_faq"><a href="../empiredb/faq.htm">FAQ</a></li>
 								</ul>
 						</li>
-						<li id="menu_struts2ext">
-						<a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
+						<li id="menu_struts2ext"><a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
 							<ul class="subMenu">
-								<li id="menu_struts2ext_forms_controls">
-								<a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
-								<li id="menu_struts2ext_rendering_parsing">
-								<a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
+								<li id="menu_struts2ext_forms_controls"><a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
+								<li id="menu_struts2ext_rendering_parsing"><a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
 								<!--<li id="menu_struts2ext_tag_reference"><a href="struts2ext/tag_reference.htm">Tag reference</a></li>-->
-								<li id="menu_struts2ext_input_controls">
-								<a href="../struts2ext/input_controls.htm">Input controls</a></li>
+								<li id="menu_struts2ext_input_controls"><a href="../struts2ext/input_controls.htm">Input controls</a></li>
 							</ul>
 						</li>
-						<li id="menu_downloads">
-						<a href="../downloads/latest.htm">Downloads</a>
+						<li id="menu_downloads"><a href="../downloads/latest.htm">Downloads</a>
 								<ul class="subMenu">
-									<li id="menu_downloads_previous">
-									<a href="../downloads/previous.htm">Previous releases</a></li>
-									<li id="menu_downloads_license">
-									<a href="../downloads/license.htm">License</a></li>
+									<li id="menu_downloads_previous"><a href="../downloads/previous.htm">Previous releases</a></li>
+									<li id="menu_downloads_license"><a href="../downloads/license.htm">License</a></li>
 								</ul>
 						</li>
-						<li id="menu_documentation">
-						<a href="../documentation/documentation.htm">Documentation</a>					
+						<li id="menu_documentation"><a href="../documentation/documentation.htm">Documentation</a>					
 							<ul class="subMenu">
-								<li id="menu_documentation_class_overview">
-								<a href="../documentation/class_overview.htm">Empire-db class<br />overview</a></li>
-								<li id="menu_documentation_tutorials">
-								<a href="../documentation/tutorial.htm">Tutorial</a></li>
-								<li id="menu_documentation_getting_started">
-								<a href="../documentation/getting_started.htm">Getting started</a></li>
-								<li id="menu_documentation_api">
-								<a href="../documentation/api.htm">API</a></li>
+								<li id="menu_documentation_class_overview"><a href="../documentation/class_overview.htm">Empire-db class<br />overview</a></li>
+								<li id="menu_documentation_tutorials"><a href="../documentation/tutorial.htm">Tutorial</a></li>
+								<li id="menu_documentation_getting_started"><a href="../documentation/getting_started.htm">Getting started</a></li>
+								<li id="menu_documentation_api"><a href="../documentation/api.htm">API</a></li>
 							</ul>
 						</li>
 						<li id="menu_community"><a href="community.htm">Community</a>					
 							<ul class="subMenu">
-								<li id="menu_community_mailing_lists">
-								<a href="mailing_lists.htm">Mailing lists</a></li>
-								<li id="menu_community_source_code">
-								<a href="source_code.htm">Source code</a></li>
+								<li id="menu_community_mailing_lists"><a href="mailing_lists.htm">Mailing lists</a></li>
+								<li id="menu_community_source_code"><a href="source_code.htm">Source code</a></li>
 								<li id="menu_community_jira"><a href="jira.htm">Ticketing &amp; Wiki</a></li>
 								<!--<li id="menu_community_road_map"><a href="community/road_map.htm">Road map</a></li>-->
-								<li id="menu_community_contributors">
-								<a href="contributors.htm">Contributors</a></li>
+								<li id="menu_community_contributors"><a href="contributors.htm">Contributors</a></li>
 							</ul>
 						</li>
-						<li id="menu_disclaimer"><a href="../disclaimer.htm">Disclaimer</a></li>
+						<li id="menu_apache"><a href="../apache.htm">About Apache</a>
+							<ul class="subMenu">
+								<li id="menu_apache_home"><a href="http://www.apache.org">Apache home<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_donate"><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_thanks"><a href="http://www.apache.org/foundation/thanks.html">Foundation thanks<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_security"><a href="http://www.apache.org/security/">Security<span class="asflink">&nbsp;</span></a></li>
+							</ul>
+						</li>
+						<li id="menu_disclaimer"><a href="http://www.apache.org/licenses/">License<span class="asflink">&nbsp;</span></a></li>
 					</ul>
 				</div>
 				
@@ -144,27 +131,19 @@
 			
 			<div id="content">
 			<!-- #BeginEditable "content" -->
-		<h1>Commiters</h1>
+		<h1>Chair</h1>
 		<ul>
-			<li>Rainer Döbele</li>
-			<li>Matthew Bond</li>
-			<li>Jörg Reiher</li>
-			<li>Manuel Gamerdinger</li>
-			<li>Thomas Fischer</li>
-			<li>Martijn Dashorst</li>
 			<li>Francis De Brabandere</li>
-			<li>Benjamin Venditti</li>
-            <li>Eike Kettner</li>
 		</ul>
-		<h1>Mentors</h1>
+		<h1>Commiters</h1>
 		<ul>
-			<li>Thomas Fischer</li>
-			<li>Martijn Dashorst</li>
+			<li>Benjamin Venditti</li>
 			<li>Benson Margulies</li>
-		</ul>
-		<h1>Former Mentor and champion</h1>
-		<ul>
-			<li>Henning Schmiedehausen</li>
+            <li>Eike Kettner</li>
+			<li>Jörg Reiher</li>
+			<li>Martijn Dashorst</li>
+			<li>Rainer Döbele</li>
+			<li>Thomas Fox</li>
 		</ul>
 
 			<!-- #EndEditable --></div>
@@ -177,8 +156,7 @@
 				</div>
 				<div id="nav_next">
 					&nbsp;
-					<a id="next" href="">Next Page 
-					<img src="../images/next.gif" alt="" /></a>
+					<a id="next" href="">Next Page <img src="../images/next.gif" alt="" /></a>
 				</div>
 				<div style="clear: both;"></div>
 			</div>
@@ -217,15 +195,12 @@
 	
 	<!-- Footer -->		
 	<div id="footer">
-		<small>Copyright &copy; 2008-2011, The Apache Software Foundation</small>&nbsp;<!--<p style="padding-right: 25px; text-align: right;">
-	    <a href="http://validator.w3.org/check?uri=referer">
-		<img
-	        src="images/valid-xhtml10.png"
-	        alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
-	 	</p>--></div>
+		<div class="cr"><small>Copyright &copy; 2008-2012, The Apache Software Foundation</small></div>
+		<div class="tm"><small>Apache Empire-db, Empire-db, Apache, the Apache feather logo, and the Apache Empire-db project logo are trademarks of The Apache Software Foundation</small></div>
+	</div>
 
 </div>
 
 </body>
 <!-- #EndTemplate -->
-</html>
+</html>
\ No newline at end of file

Modified: empire-db/site/community/jira.htm
URL: http://svn.apache.org/viewvc/empire-db/site/community/jira.htm?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/community/jira.htm (original)
+++ empire-db/site/community/jira.htm Thu Feb 16 22:14:20 2012
@@ -32,8 +32,8 @@
 			<img src="../images/logos/empire-db-logo.gif" alt="Empire-db: The relational data persistence component." />
 		</div>
 		<div id="asf">
-			<a target="_blank" href="http://incubator.apache.org/">
-			<img src="../images/logos/apache-incubator-logo.png" alt="Apache Incubator" /></a>
+			<a id="asfhome" target="_blank" href="http://www.apache.org"><img src="../images/logos/feather-small.gif" alt="The Apache Software Foundation" /></a>
+			<label for="asfhome" >The Apache Software Foundation</label>
 		</div>
 		<div style="clear:both"></div>
 	</div>
@@ -50,68 +50,55 @@
 					<ul id="mainMenu">
 						<li id="menu_home"><a href="../index.html">Home</a></li>
 						<li id="menu_news"><a href="../news.htm">News</a></li>
-						<li id="menu_empiredb">
-						<a href="../empiredb/empiredb.htm">Empire-db</a>
+						<li id="menu_empiredb"><a href="../empiredb/empiredb.htm">Empire-db</a>
 								<ul class="subMenu">
-									<li id="menu_empiredb_extending_pattern">
-									<a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
-									<li id="menu_empiredb_handling_metadata">
-									<a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
-									<li id="menu_empiredb_wrong">
-									<a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
-									<li id="menu_empiredb_stringfree">
-									<a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
-									<li id="menu_empiredb_faq">
-									<a href="../empiredb/faq.htm">FAQ</a></li>
+									<li id="menu_empiredb_extending_pattern"><a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
+									<li id="menu_empiredb_handling_metadata"><a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
+									<li id="menu_empiredb_wrong"><a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
+									<li id="menu_empiredb_stringfree"><a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
+									<li id="menu_empiredb_faq"><a href="../empiredb/faq.htm">FAQ</a></li>
 								</ul>
 						</li>
-						<li id="menu_struts2ext">
-						<a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
+						<li id="menu_struts2ext"><a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
 							<ul class="subMenu">
-								<li id="menu_struts2ext_forms_controls">
-								<a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
-								<li id="menu_struts2ext_rendering_parsing">
-								<a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
+								<li id="menu_struts2ext_forms_controls"><a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
+								<li id="menu_struts2ext_rendering_parsing"><a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
 								<!--<li id="menu_struts2ext_tag_reference"><a href="struts2ext/tag_reference.htm">Tag reference</a></li>-->
-								<li id="menu_struts2ext_input_controls">
-								<a href="../struts2ext/input_controls.htm">Input controls</a></li>
+								<li id="menu_struts2ext_input_controls"><a href="../struts2ext/input_controls.htm">Input controls</a></li>
 							</ul>
 						</li>
-						<li id="menu_downloads">
-						<a href="../downloads/latest.htm">Downloads</a>
+						<li id="menu_downloads"><a href="../downloads/latest.htm">Downloads</a>
 								<ul class="subMenu">
-									<li id="menu_downloads_previous">
-									<a href="../downloads/previous.htm">Previous releases</a></li>
-									<li id="menu_downloads_license">
-									<a href="../downloads/license.htm">License</a></li>
+									<li id="menu_downloads_previous"><a href="../downloads/previous.htm">Previous releases</a></li>
+									<li id="menu_downloads_license"><a href="../downloads/license.htm">License</a></li>
 								</ul>
 						</li>
-						<li id="menu_documentation">
-						<a href="../documentation/documentation.htm">Documentation</a>					
+						<li id="menu_documentation"><a href="../documentation/documentation.htm">Documentation</a>					
 							<ul class="subMenu">
-								<li id="menu_documentation_class_overview">
-								<a href="../documentation/class_overview.htm">Empire-db class<br />overview</a></li>
-								<li id="menu_documentation_tutorials">
-								<a href="../documentation/tutorial.htm">Tutorial</a></li>
-								<li id="menu_documentation_getting_started">
-								<a href="../documentation/getting_started.htm">Getting started</a></li>
-								<li id="menu_documentation_api">
-								<a href="../documentation/api.htm">API</a></li>
+								<li id="menu_documentation_class_overview"><a href="../documentation/class_overview.htm">Empire-db class<br />overview</a></li>
+								<li id="menu_documentation_tutorials"><a href="../documentation/tutorial.htm">Tutorial</a></li>
+								<li id="menu_documentation_getting_started"><a href="../documentation/getting_started.htm">Getting started</a></li>
+								<li id="menu_documentation_api"><a href="../documentation/api.htm">API</a></li>
 							</ul>
 						</li>
 						<li id="menu_community"><a href="community.htm">Community</a>					
 							<ul class="subMenu">
-								<li id="menu_community_mailing_lists">
-								<a href="mailing_lists.htm">Mailing lists</a></li>
-								<li id="menu_community_source_code">
-								<a href="source_code.htm">Source code</a></li>
+								<li id="menu_community_mailing_lists"><a href="mailing_lists.htm">Mailing lists</a></li>
+								<li id="menu_community_source_code"><a href="source_code.htm">Source code</a></li>
 								<li id="menu_community_jira"><a href="jira.htm">Ticketing &amp; Wiki</a></li>
 								<!--<li id="menu_community_road_map"><a href="community/road_map.htm">Road map</a></li>-->
-								<li id="menu_community_contributors">
-								<a href="contributors.htm">Contributors</a></li>
+								<li id="menu_community_contributors"><a href="contributors.htm">Contributors</a></li>
 							</ul>
 						</li>
-						<li id="menu_disclaimer"><a href="../disclaimer.htm">Disclaimer</a></li>
+						<li id="menu_apache"><a href="../apache.htm">About Apache</a>
+							<ul class="subMenu">
+								<li id="menu_apache_home"><a href="http://www.apache.org">Apache home<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_donate"><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_thanks"><a href="http://www.apache.org/foundation/thanks.html">Foundation thanks<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_security"><a href="http://www.apache.org/security/">Security<span class="asflink">&nbsp;</span></a></li>
+							</ul>
+						</li>
+						<li id="menu_disclaimer"><a href="http://www.apache.org/licenses/">License<span class="asflink">&nbsp;</span></a></li>
 					</ul>
 				</div>
 				
@@ -169,8 +156,7 @@
 				</div>
 				<div id="nav_next">
 					&nbsp;
-					<a id="next" href="">Next Page 
-					<img src="../images/next.gif" alt="" /></a>
+					<a id="next" href="">Next Page <img src="../images/next.gif" alt="" /></a>
 				</div>
 				<div style="clear: both;"></div>
 			</div>
@@ -209,15 +195,12 @@
 	
 	<!-- Footer -->		
 	<div id="footer">
-		<small>Copyright &copy; 2008-2011, The Apache Software Foundation</small>&nbsp;<!--<p style="padding-right: 25px; text-align: right;">
-	    <a href="http://validator.w3.org/check?uri=referer">
-		<img
-	        src="images/valid-xhtml10.png"
-	        alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
-	 	</p>--></div>
+		<div class="cr"><small>Copyright &copy; 2008-2012, The Apache Software Foundation</small></div>
+		<div class="tm"><small>Apache Empire-db, Empire-db, Apache, the Apache feather logo, and the Apache Empire-db project logo are trademarks of The Apache Software Foundation</small></div>
+	</div>
 
 </div>
 
 </body>
 <!-- #EndTemplate -->
-</html>
+</html>
\ No newline at end of file

Modified: empire-db/site/community/mailing_lists.htm
URL: http://svn.apache.org/viewvc/empire-db/site/community/mailing_lists.htm?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/community/mailing_lists.htm (original)
+++ empire-db/site/community/mailing_lists.htm Thu Feb 16 22:14:20 2012
@@ -32,8 +32,8 @@
 			<img src="../images/logos/empire-db-logo.gif" alt="Empire-db: The relational data persistence component." />
 		</div>
 		<div id="asf">
-			<a target="_blank" href="http://incubator.apache.org/">
-			<img src="../images/logos/apache-incubator-logo.png" alt="Apache Incubator" /></a>
+			<a id="asfhome" target="_blank" href="http://www.apache.org"><img src="../images/logos/feather-small.gif" alt="The Apache Software Foundation" /></a>
+			<label for="asfhome" >The Apache Software Foundation</label>
 		</div>
 		<div style="clear:both"></div>
 	</div>
@@ -50,68 +50,55 @@
 					<ul id="mainMenu">
 						<li id="menu_home"><a href="../index.html">Home</a></li>
 						<li id="menu_news"><a href="../news.htm">News</a></li>
-						<li id="menu_empiredb">
-						<a href="../empiredb/empiredb.htm">Empire-db</a>
+						<li id="menu_empiredb"><a href="../empiredb/empiredb.htm">Empire-db</a>
 								<ul class="subMenu">
-									<li id="menu_empiredb_extending_pattern">
-									<a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
-									<li id="menu_empiredb_handling_metadata">
-									<a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
-									<li id="menu_empiredb_wrong">
-									<a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
-									<li id="menu_empiredb_stringfree">
-									<a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
-									<li id="menu_empiredb_faq">
-									<a href="../empiredb/faq.htm">FAQ</a></li>
+									<li id="menu_empiredb_extending_pattern"><a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
+									<li id="menu_empiredb_handling_metadata"><a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
+									<li id="menu_empiredb_wrong"><a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
+									<li id="menu_empiredb_stringfree"><a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
+									<li id="menu_empiredb_faq"><a href="../empiredb/faq.htm">FAQ</a></li>
 								</ul>
 						</li>
-						<li id="menu_struts2ext">
-						<a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
+						<li id="menu_struts2ext"><a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
 							<ul class="subMenu">
-								<li id="menu_struts2ext_forms_controls">
-								<a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
-								<li id="menu_struts2ext_rendering_parsing">
-								<a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
+								<li id="menu_struts2ext_forms_controls"><a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
+								<li id="menu_struts2ext_rendering_parsing"><a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
 								<!--<li id="menu_struts2ext_tag_reference"><a href="struts2ext/tag_reference.htm">Tag reference</a></li>-->
-								<li id="menu_struts2ext_input_controls">
-								<a href="../struts2ext/input_controls.htm">Input controls</a></li>
+								<li id="menu_struts2ext_input_controls"><a href="../struts2ext/input_controls.htm">Input controls</a></li>
 							</ul>
 						</li>
-						<li id="menu_downloads">
-						<a href="../downloads/latest.htm">Downloads</a>
+						<li id="menu_downloads"><a href="../downloads/latest.htm">Downloads</a>
 								<ul class="subMenu">
-									<li id="menu_downloads_previous">
-									<a href="../downloads/previous.htm">Previous releases</a></li>
-									<li id="menu_downloads_license">
-									<a href="../downloads/license.htm">License</a></li>
+									<li id="menu_downloads_previous"><a href="../downloads/previous.htm">Previous releases</a></li>
+									<li id="menu_downloads_license"><a href="../downloads/license.htm">License</a></li>
 								</ul>
 						</li>
-						<li id="menu_documentation">
-						<a href="../documentation/documentation.htm">Documentation</a>					
+						<li id="menu_documentation"><a href="../documentation/documentation.htm">Documentation</a>					
 							<ul class="subMenu">
-								<li id="menu_documentation_class_overview">
-								<a href="../documentation/class_overview.htm">Empire-db class<br />overview</a></li>
-								<li id="menu_documentation_tutorials">
-								<a href="../documentation/tutorial.htm">Tutorial</a></li>
-								<li id="menu_documentation_getting_started">
-								<a href="../documentation/getting_started.htm">Getting started</a></li>
-								<li id="menu_documentation_api">
-								<a href="../documentation/api.htm">API</a></li>
+								<li id="menu_documentation_class_overview"><a href="../documentation/class_overview.htm">Empire-db class<br />overview</a></li>
+								<li id="menu_documentation_tutorials"><a href="../documentation/tutorial.htm">Tutorial</a></li>
+								<li id="menu_documentation_getting_started"><a href="../documentation/getting_started.htm">Getting started</a></li>
+								<li id="menu_documentation_api"><a href="../documentation/api.htm">API</a></li>
 							</ul>
 						</li>
 						<li id="menu_community"><a href="community.htm">Community</a>					
 							<ul class="subMenu">
-								<li id="menu_community_mailing_lists">
-								<a href="mailing_lists.htm">Mailing lists</a></li>
-								<li id="menu_community_source_code">
-								<a href="source_code.htm">Source code</a></li>
+								<li id="menu_community_mailing_lists"><a href="mailing_lists.htm">Mailing lists</a></li>
+								<li id="menu_community_source_code"><a href="source_code.htm">Source code</a></li>
 								<li id="menu_community_jira"><a href="jira.htm">Ticketing &amp; Wiki</a></li>
 								<!--<li id="menu_community_road_map"><a href="community/road_map.htm">Road map</a></li>-->
-								<li id="menu_community_contributors">
-								<a href="contributors.htm">Contributors</a></li>
+								<li id="menu_community_contributors"><a href="contributors.htm">Contributors</a></li>
 							</ul>
 						</li>
-						<li id="menu_disclaimer"><a href="../disclaimer.htm">Disclaimer</a></li>
+						<li id="menu_apache"><a href="../apache.htm">About Apache</a>
+							<ul class="subMenu">
+								<li id="menu_apache_home"><a href="http://www.apache.org">Apache home<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_donate"><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_thanks"><a href="http://www.apache.org/foundation/thanks.html">Foundation thanks<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_security"><a href="http://www.apache.org/security/">Security<span class="asflink">&nbsp;</span></a></li>
+							</ul>
+						</li>
+						<li id="menu_disclaimer"><a href="http://www.apache.org/licenses/">License<span class="asflink">&nbsp;</span></a></li>
 					</ul>
 				</div>
 				
@@ -149,13 +136,13 @@
 		It is the primary source of free Empire-DB support. It is also a place for general discussion of topics related to Empire-DB.</p>
 		<ul>
 		<li>To <strong>subscribe</strong>, send an email to
-		<a href="mailto:empire-db-user-subscribe@incubator.apache.org">empire-db-user-subscribe@incubator.apache.org</a>.</li>
+		<a href="mailto:user-subscribe@empire-db.apache.org">user-subscribe@empire-db.apache.org</a>.</li>
 		<li>To <strong>unsubscribe</strong> send empty email to
-		<a href="mailto:empire-db-user-unsubscribe@incubator.apache.org">empire-db-user-unsubscribe@incubator.apache.org</a>.</li>
+		<a href="mailto:user-unsubscribe@empire-db.apache.org">user-unsubscribe@empire-db.apache.org</a>.</li>
 		<li>Finally, to post a message to the list use the address
-		<a href="mailto:empire-db-user@incubator.apache.org">empire-db-user@incubator.apache.org</a>.</li>
+		<a href="mailto:user@empire-db.apache.org">user@empire-db.apache.org</a>.</li>
 		</ul>
-		The archives for the empire-db-user list can also be <a href="http://mail-archives.apache.org/mod_mbox/incubator-empire-db-user/">browsed online.</a>
+		The archives for the empire-db-user list can also be <a href="http://mail-archives.apache.org/mod_mbox/empire-user/">browsed online.</a>
 
 		<h1>Development Discussion (empire-db-dev)</h1>
 		<p>This is the list where the design and implementation of Empire-DB is discussed. 
@@ -164,27 +151,24 @@
 		following development.</p>
 		<ul>
 		<li>To <strong>subscribe</strong>, send an email to
-		<a href="mailto:empire-db-dev-subscribe@incubator.apache.org">empire-db-dev-subscribe@incubator.apache.org</a>.</li>
+		<a href="mailto:dev-subscribe@empire-db.apache.org">dev-subscribe@empire-db.apache.org</a>.</li>
 		<li>To <strong>unsubscribe</strong> send empty email to
-		<a href="mailto:empire-db-dev-unsubscribe@incubator.apache.org">empire-db-dev-unsubscribe@incubator.apache.org</a>.</li>
+		<a href="mailto:dev-unsubscribe@empire-db.apache.org">dev-unsubscribe@empire-db.apache.org</a>.</li>
 		<li>Finally, to post a message to the list use the address
-		<a href="mailto:empire-db-dev@incubator.apache.org">empire-db-dev@incubator.apache.org</a>.</li>
+		<a href="mailto:dev@empire-db.apache.org">dev@empire-db.apache.org</a>.</li>
 		</ul>
-		The archives for the empire-db-dev list can also be <a href="http://mail-archives.apache.org/mod_mbox/incubator-empire-db-dev/">browsed online.</a>
+		The archives for the empire-db-dev list can also be <a href="http://mail-archives.apache.org/mod_mbox/empire-dev/">browsed online.</a>
 		
 		<h1>Source Change Reports (empire-db-commits)</h1>
 		<p>This is a read-only list that receives all of the SVN commit messages for Empire-DB. 
 		All Empire-DB committers should be subscribed to this list to be able to see and review changes made by others.</p>
 		<ul>
 		<li>To <strong>subscribe</strong>, send an email to
-		<a href="mailto:empire-db-commits-subscribe@incubator.apache.org">empire-db-commits-subscribe@incubator.apache.org</a>.</li>
+		<a href="mailto:commits-subscribe@empire-db.apache.org">commits-subscribe@empire-db.apache.org</a>.</li>
 		<li>To <strong>unsubscribe</strong> send empty email to
-
-		<a href="mailto:empire-db-commits-unsubscribe@incubator.apache.org">empire-db-commits-unsubscribe@incubator.apache.org</a>.</li>
-		<li>Finally, to post a message to the list use the address
-		<a href="mailto:empire-db-commits@incubator.apache.org">empire-db-commits@incubator.apache.org</a>.</li>
+		<a href="mailto:commits-unsubscribe@empire-db.apache.org">commits-unsubscribe@empire-db.apache.org</a>.</li>
 		</ul>
-		The archives for the empire-db-commits list can also be <a href="http://mail-archives.apache.org/mod_mbox/incubator-empire-db-commits/">browsed online.</a>
+		The archives for the empire-db-commits list can also be <a href="http://mail-archives.apache.org/mod_mbox/empire-commits/">browsed online.</a>
 			<!-- #EndEditable --></div>
 					
 			<div id="nav">
@@ -195,8 +179,7 @@
 				</div>
 				<div id="nav_next">
 					&nbsp;
-					<a id="next" href="">Next Page 
-					<img src="../images/next.gif" alt="" /></a>
+					<a id="next" href="">Next Page <img src="../images/next.gif" alt="" /></a>
 				</div>
 				<div style="clear: both;"></div>
 			</div>
@@ -235,15 +218,12 @@
 	
 	<!-- Footer -->		
 	<div id="footer">
-		<small>Copyright &copy; 2008-2011, The Apache Software Foundation</small>&nbsp;<!--<p style="padding-right: 25px; text-align: right;">
-	    <a href="http://validator.w3.org/check?uri=referer">
-		<img
-	        src="images/valid-xhtml10.png"
-	        alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
-	 	</p>--></div>
+		<div class="cr"><small>Copyright &copy; 2008-2012, The Apache Software Foundation</small></div>
+		<div class="tm"><small>Apache Empire-db, Empire-db, Apache, the Apache feather logo, and the Apache Empire-db project logo are trademarks of The Apache Software Foundation</small></div>
+	</div>
 
 </div>
 
 </body>
 <!-- #EndTemplate -->
-</html>
+</html>
\ No newline at end of file

Modified: empire-db/site/community/road_map.htm
URL: http://svn.apache.org/viewvc/empire-db/site/community/road_map.htm?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/community/road_map.htm (original)
+++ empire-db/site/community/road_map.htm Thu Feb 16 22:14:20 2012
@@ -32,8 +32,8 @@
 			<img src="../images/logos/empire-db-logo.gif" alt="Empire-db: The relational data persistence component." />
 		</div>
 		<div id="asf">
-			<a target="_blank" href="http://incubator.apache.org/">
-			<img src="../images/logos/apache-incubator-logo.png" alt="Apache Incubator" /></a>
+			<a id="asfhome" target="_blank" href="http://www.apache.org"><img src="../images/logos/feather-small.gif" alt="The Apache Software Foundation" /></a>
+			<label for="asfhome" >The Apache Software Foundation</label>
 		</div>
 		<div style="clear:both"></div>
 	</div>
@@ -50,68 +50,55 @@
 					<ul id="mainMenu">
 						<li id="menu_home"><a href="../index.html">Home</a></li>
 						<li id="menu_news"><a href="../news.htm">News</a></li>
-						<li id="menu_empiredb">
-						<a href="../empiredb/empiredb.htm">Empire-db</a>
+						<li id="menu_empiredb"><a href="../empiredb/empiredb.htm">Empire-db</a>
 								<ul class="subMenu">
-									<li id="menu_empiredb_extending_pattern">
-									<a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
-									<li id="menu_empiredb_handling_metadata">
-									<a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
-									<li id="menu_empiredb_wrong">
-									<a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
-									<li id="menu_empiredb_stringfree">
-									<a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
-									<li id="menu_empiredb_faq">
-									<a href="../empiredb/faq.htm">FAQ</a></li>
+									<li id="menu_empiredb_extending_pattern"><a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
+									<li id="menu_empiredb_handling_metadata"><a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
+									<li id="menu_empiredb_wrong"><a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
+									<li id="menu_empiredb_stringfree"><a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
+									<li id="menu_empiredb_faq"><a href="../empiredb/faq.htm">FAQ</a></li>
 								</ul>
 						</li>
-						<li id="menu_struts2ext">
-						<a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
+						<li id="menu_struts2ext"><a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
 							<ul class="subMenu">
-								<li id="menu_struts2ext_forms_controls">
-								<a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
-								<li id="menu_struts2ext_rendering_parsing">
-								<a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
+								<li id="menu_struts2ext_forms_controls"><a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
+								<li id="menu_struts2ext_rendering_parsing"><a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
 								<!--<li id="menu_struts2ext_tag_reference"><a href="struts2ext/tag_reference.htm">Tag reference</a></li>-->
-								<li id="menu_struts2ext_input_controls">
-								<a href="../struts2ext/input_controls.htm">Input controls</a></li>
+								<li id="menu_struts2ext_input_controls"><a href="../struts2ext/input_controls.htm">Input controls</a></li>
 							</ul>
 						</li>
-						<li id="menu_downloads">
-						<a href="../downloads/latest.htm">Downloads</a>
+						<li id="menu_downloads"><a href="../downloads/latest.htm">Downloads</a>
 								<ul class="subMenu">
-									<li id="menu_downloads_previous">
-									<a href="../downloads/previous.htm">Previous releases</a></li>
-									<li id="menu_downloads_license">
-									<a href="../downloads/license.htm">License</a></li>
+									<li id="menu_downloads_previous"><a href="../downloads/previous.htm">Previous releases</a></li>
+									<li id="menu_downloads_license"><a href="../downloads/license.htm">License</a></li>
 								</ul>
 						</li>
-						<li id="menu_documentation">
-						<a href="../documentation/documentation.htm">Documentation</a>					
+						<li id="menu_documentation"><a href="../documentation/documentation.htm">Documentation</a>					
 							<ul class="subMenu">
-								<li id="menu_documentation_class_overview">
-								<a href="../documentation/class_overview.htm">Empire-db class<br />overview</a></li>
-								<li id="menu_documentation_tutorials">
-								<a href="../documentation/tutorial.htm">Tutorial</a></li>
-								<li id="menu_documentation_getting_started">
-								<a href="../documentation/getting_started.htm">Getting started</a></li>
-								<li id="menu_documentation_api">
-								<a href="../documentation/api.htm">API</a></li>
+								<li id="menu_documentation_class_overview"><a href="../documentation/class_overview.htm">Empire-db class<br />overview</a></li>
+								<li id="menu_documentation_tutorials"><a href="../documentation/tutorial.htm">Tutorial</a></li>
+								<li id="menu_documentation_getting_started"><a href="../documentation/getting_started.htm">Getting started</a></li>
+								<li id="menu_documentation_api"><a href="../documentation/api.htm">API</a></li>
 							</ul>
 						</li>
 						<li id="menu_community"><a href="community.htm">Community</a>					
 							<ul class="subMenu">
-								<li id="menu_community_mailing_lists">
-								<a href="mailing_lists.htm">Mailing lists</a></li>
-								<li id="menu_community_source_code">
-								<a href="source_code.htm">Source code</a></li>
+								<li id="menu_community_mailing_lists"><a href="mailing_lists.htm">Mailing lists</a></li>
+								<li id="menu_community_source_code"><a href="source_code.htm">Source code</a></li>
 								<li id="menu_community_jira"><a href="jira.htm">Ticketing &amp; Wiki</a></li>
 								<!--<li id="menu_community_road_map"><a href="community/road_map.htm">Road map</a></li>-->
-								<li id="menu_community_contributors">
-								<a href="contributors.htm">Contributors</a></li>
+								<li id="menu_community_contributors"><a href="contributors.htm">Contributors</a></li>
 							</ul>
 						</li>
-						<li id="menu_disclaimer"><a href="../disclaimer.htm">Disclaimer</a></li>
+						<li id="menu_apache"><a href="../apache.htm">About Apache</a>
+							<ul class="subMenu">
+								<li id="menu_apache_home"><a href="http://www.apache.org">Apache home<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_donate"><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_thanks"><a href="http://www.apache.org/foundation/thanks.html">Foundation thanks<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_security"><a href="http://www.apache.org/security/">Security<span class="asflink">&nbsp;</span></a></li>
+							</ul>
+						</li>
+						<li id="menu_disclaimer"><a href="http://www.apache.org/licenses/">License<span class="asflink">&nbsp;</span></a></li>
 					</ul>
 				</div>
 				
@@ -175,8 +162,7 @@
 				</div>
 				<div id="nav_next">
 					&nbsp;
-					<a id="next" href="">Next Page 
-					<img src="../images/next.gif" alt="" /></a>
+					<a id="next" href="">Next Page <img src="../images/next.gif" alt="" /></a>
 				</div>
 				<div style="clear: both;"></div>
 			</div>
@@ -215,15 +201,12 @@
 	
 	<!-- Footer -->		
 	<div id="footer">
-		<small>Copyright &copy; 2008-2011, The Apache Software Foundation</small>&nbsp;<!--<p style="padding-right: 25px; text-align: right;">
-	    <a href="http://validator.w3.org/check?uri=referer">
-		<img
-	        src="images/valid-xhtml10.png"
-	        alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
-	 	</p>--></div>
+		<div class="cr"><small>Copyright &copy; 2008-2012, The Apache Software Foundation</small></div>
+		<div class="tm"><small>Apache Empire-db, Empire-db, Apache, the Apache feather logo, and the Apache Empire-db project logo are trademarks of The Apache Software Foundation</small></div>
+	</div>
 
 </div>
 
 </body>
 <!-- #EndTemplate -->
-</html>
+</html>
\ No newline at end of file

Modified: empire-db/site/community/source_code.htm
URL: http://svn.apache.org/viewvc/empire-db/site/community/source_code.htm?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/community/source_code.htm (original)
+++ empire-db/site/community/source_code.htm Thu Feb 16 22:14:20 2012
@@ -32,8 +32,8 @@
 			<img src="../images/logos/empire-db-logo.gif" alt="Empire-db: The relational data persistence component." />
 		</div>
 		<div id="asf">
-			<a target="_blank" href="http://incubator.apache.org/">
-			<img src="../images/logos/apache-incubator-logo.png" alt="Apache Incubator" /></a>
+			<a id="asfhome" target="_blank" href="http://www.apache.org"><img src="../images/logos/feather-small.gif" alt="The Apache Software Foundation" /></a>
+			<label for="asfhome" >The Apache Software Foundation</label>
 		</div>
 		<div style="clear:both"></div>
 	</div>
@@ -50,68 +50,55 @@
 					<ul id="mainMenu">
 						<li id="menu_home"><a href="../index.html">Home</a></li>
 						<li id="menu_news"><a href="../news.htm">News</a></li>
-						<li id="menu_empiredb">
-						<a href="../empiredb/empiredb.htm">Empire-db</a>
+						<li id="menu_empiredb"><a href="../empiredb/empiredb.htm">Empire-db</a>
 								<ul class="subMenu">
-									<li id="menu_empiredb_extending_pattern">
-									<a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
-									<li id="menu_empiredb_handling_metadata">
-									<a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
-									<li id="menu_empiredb_wrong">
-									<a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
-									<li id="menu_empiredb_stringfree">
-									<a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
-									<li id="menu_empiredb_faq">
-									<a href="../empiredb/faq.htm">FAQ</a></li>
+									<li id="menu_empiredb_extending_pattern"><a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
+									<li id="menu_empiredb_handling_metadata"><a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
+									<li id="menu_empiredb_wrong"><a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
+									<li id="menu_empiredb_stringfree"><a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
+									<li id="menu_empiredb_faq"><a href="../empiredb/faq.htm">FAQ</a></li>
 								</ul>
 						</li>
-						<li id="menu_struts2ext">
-						<a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
+						<li id="menu_struts2ext"><a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
 							<ul class="subMenu">
-								<li id="menu_struts2ext_forms_controls">
-								<a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
-								<li id="menu_struts2ext_rendering_parsing">
-								<a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
+								<li id="menu_struts2ext_forms_controls"><a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
+								<li id="menu_struts2ext_rendering_parsing"><a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
 								<!--<li id="menu_struts2ext_tag_reference"><a href="struts2ext/tag_reference.htm">Tag reference</a></li>-->
-								<li id="menu_struts2ext_input_controls">
-								<a href="../struts2ext/input_controls.htm">Input controls</a></li>
+								<li id="menu_struts2ext_input_controls"><a href="../struts2ext/input_controls.htm">Input controls</a></li>
 							</ul>
 						</li>
-						<li id="menu_downloads">
-						<a href="../downloads/latest.htm">Downloads</a>
+						<li id="menu_downloads"><a href="../downloads/latest.htm">Downloads</a>
 								<ul class="subMenu">
-									<li id="menu_downloads_previous">
-									<a href="../downloads/previous.htm">Previous releases</a></li>
-									<li id="menu_downloads_license">
-									<a href="../downloads/license.htm">License</a></li>
+									<li id="menu_downloads_previous"><a href="../downloads/previous.htm">Previous releases</a></li>
+									<li id="menu_downloads_license"><a href="../downloads/license.htm">License</a></li>
 								</ul>
 						</li>
-						<li id="menu_documentation">
-						<a href="../documentation/documentation.htm">Documentation</a>					
+						<li id="menu_documentation"><a href="../documentation/documentation.htm">Documentation</a>					
 							<ul class="subMenu">
-								<li id="menu_documentation_class_overview">
-								<a href="../documentation/class_overview.htm">Empire-db class<br />overview</a></li>
-								<li id="menu_documentation_tutorials">
-								<a href="../documentation/tutorial.htm">Tutorial</a></li>
-								<li id="menu_documentation_getting_started">
-								<a href="../documentation/getting_started.htm">Getting started</a></li>
-								<li id="menu_documentation_api">
-								<a href="../documentation/api.htm">API</a></li>
+								<li id="menu_documentation_class_overview"><a href="../documentation/class_overview.htm">Empire-db class<br />overview</a></li>
+								<li id="menu_documentation_tutorials"><a href="../documentation/tutorial.htm">Tutorial</a></li>
+								<li id="menu_documentation_getting_started"><a href="../documentation/getting_started.htm">Getting started</a></li>
+								<li id="menu_documentation_api"><a href="../documentation/api.htm">API</a></li>
 							</ul>
 						</li>
 						<li id="menu_community"><a href="community.htm">Community</a>					
 							<ul class="subMenu">
-								<li id="menu_community_mailing_lists">
-								<a href="mailing_lists.htm">Mailing lists</a></li>
-								<li id="menu_community_source_code">
-								<a href="source_code.htm">Source code</a></li>
+								<li id="menu_community_mailing_lists"><a href="mailing_lists.htm">Mailing lists</a></li>
+								<li id="menu_community_source_code"><a href="source_code.htm">Source code</a></li>
 								<li id="menu_community_jira"><a href="jira.htm">Ticketing &amp; Wiki</a></li>
 								<!--<li id="menu_community_road_map"><a href="community/road_map.htm">Road map</a></li>-->
-								<li id="menu_community_contributors">
-								<a href="contributors.htm">Contributors</a></li>
+								<li id="menu_community_contributors"><a href="contributors.htm">Contributors</a></li>
 							</ul>
 						</li>
-						<li id="menu_disclaimer"><a href="../disclaimer.htm">Disclaimer</a></li>
+						<li id="menu_apache"><a href="../apache.htm">About Apache</a>
+							<ul class="subMenu">
+								<li id="menu_apache_home"><a href="http://www.apache.org">Apache home<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_donate"><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_thanks"><a href="http://www.apache.org/foundation/thanks.html">Foundation thanks<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_security"><a href="http://www.apache.org/security/">Security<span class="asflink">&nbsp;</span></a></li>
+							</ul>
+						</li>
+						<li id="menu_disclaimer"><a href="http://www.apache.org/licenses/">License<span class="asflink">&nbsp;</span></a></li>
 					</ul>
 				</div>
 				
@@ -147,14 +134,14 @@
 		<h1>Web Browsing of SVN</h1>
 		<p>To browse via the web use the ViewVC interface:<br />
 		<br/>
-		<pre><a href="http://svn.apache.org/viewvc/incubator/empire-db/trunk/">http://svn.apache.org/viewvc/incubator/empire-db/trunk/</a></pre>
+		<pre><a href="http://svn.apache.org/viewvc/empire-db/trunk/">http://svn.apache.org/viewvc/empire-db/trunk/</a></pre>
 		</p>
 		<h1>Checking out from SVN</h1>
 		<p>The source code can be obtained anonymously from the following 
 		location:<br/>
-		<pre>http://svn.apache.org/repos/asf/incubator/empire-db/trunk</pre></p>
+		<pre>http://svn.apache.org/repos/asf/empire-db/trunk</pre></p>
 		<p>Committers can check out the code over HTTPS:<br/>
-		<pre>https://svn.apache.org/repos/asf/incubator/empire-db/trunk</pre></p>
+		<pre>https://svn.apache.org/repos/asf/empire-db/trunk</pre></p>
 			<!-- #EndEditable --></div>
 					
 			<div id="nav">
@@ -165,8 +152,7 @@
 				</div>
 				<div id="nav_next">
 					&nbsp;
-					<a id="next" href="">Next Page 
-					<img src="../images/next.gif" alt="" /></a>
+					<a id="next" href="">Next Page <img src="../images/next.gif" alt="" /></a>
 				</div>
 				<div style="clear: both;"></div>
 			</div>
@@ -205,15 +191,12 @@
 	
 	<!-- Footer -->		
 	<div id="footer">
-		<small>Copyright &copy; 2008-2011, The Apache Software Foundation</small>&nbsp;<!--<p style="padding-right: 25px; text-align: right;">
-	    <a href="http://validator.w3.org/check?uri=referer">
-		<img
-	        src="images/valid-xhtml10.png"
-	        alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
-	 	</p>--></div>
+		<div class="cr"><small>Copyright &copy; 2008-2012, The Apache Software Foundation</small></div>
+		<div class="tm"><small>Apache Empire-db, Empire-db, Apache, the Apache feather logo, and the Apache Empire-db project logo are trademarks of The Apache Software Foundation</small></div>
+	</div>
 
 </div>
 
 </body>
 <!-- #EndTemplate -->
-</html>
+</html>
\ No newline at end of file

Modified: empire-db/site/css/layout.css
URL: http://svn.apache.org/viewvc/empire-db/site/css/layout.css?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/css/layout.css (original)
+++ empire-db/site/css/layout.css Thu Feb 16 22:14:20 2012
@@ -1,4 +1,4 @@
-@import "left.css";
+@import "left.css";
 @import "right.css";
 
 /*****************************/
@@ -204,8 +204,19 @@ div#logo {
 
 div#asf {
 	background-color: inherit;
-	float:right;
-	margin: 40px 0 0 0;	
+	float: right;
+	margin: 18px 0 0 0;	
+	text-align: center;
+}
+div#asf a {
+	display: block;
+	margin-bottom: 4px;
+}
+div#asf label {
+	display: block;
+	font-family: Helvetica, Arial, 'Liberation Sans', FreeSans, sans-serif;
+	font-size: 14px;
+	font-weight: bold;
 }
 
 div#top {
@@ -364,7 +375,7 @@ div#topbar {
 /**************/
 /*** Footer ***/
 /**************/
-div#footer {	
+#footer {	
 	padding: 10px;
 		
 	text-align: center;
@@ -372,4 +383,11 @@ div#footer {	
 	border-top: 1px black solid;	
 	border-bottom: 1px black solid;
 	background-color: #ccd4e4;
-}
\ No newline at end of file
+}
+#footer div.cr {
+	color: black;
+}
+#footer div.tm {
+	padding-top: 2px;
+	color: #404040;
+}

Modified: empire-db/site/css/left.css
URL: http://svn.apache.org/viewvc/empire-db/site/css/left.css?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/css/left.css (original)
+++ empire-db/site/css/left.css Thu Feb 16 22:14:20 2012
@@ -1,4 +1,4 @@
-div#left {
+#left {
 	float: left;
 	padding: 0px;
 	margin: 0px;
@@ -13,7 +13,7 @@
 /****************/
 /*** Menu Box ***/
 /****************/
-div#menuBox {
+#menuBox {
 	margin: 0px;
 	padding: 0px;
 }
@@ -21,7 +21,7 @@ div#menuBox {
 /*****************/
 /*** Main Menu ***/
 /*****************/
-ul#mainMenu {	
+#mainMenu {	
 	width: 180px;
 
 	padding: 0px;	
@@ -33,7 +33,7 @@ ul#mainMenu {	
 	background-color: #ffffff;
 }
 
-ul#mainMenu li {		
+#mainMenu li {		
 	padding: 0px;
 	margin: 0 0 0 1px;
 	
@@ -42,7 +42,7 @@ ul#mainMenu li {		
 	text-align: left;
 }
 
-ul#mainMenu li a {
+#mainMenu li a {
 	width: 164px;
 	
 	display: block; 	
@@ -60,29 +60,29 @@ ul#mainMenu li a {
 	background: #EFF2FA /*#DCE1ED*/ url(../images/menu/menu_main.gif) scroll 0px 0px repeat-y;
 }
 
-ul#mainMenu li a:link {
+#mainMenu li a:link {
 	color: #000000;
 }
 
-ul#mainMenu li a:hover,
-ul#mainMenu li.current a:hover,
-ul#mainMenu li.current_sub a:hover {
+#mainMenu li a:hover,
+#mainMenu li.current a:hover,
+#mainMenu li.current_sub a:hover {
 	background-color: #DCE1ED; /* #D2D9E8 */
 	font-weight: bold;	
 
 }
 
-ul#mainMenu li a:visited {
+#mainMenu li a:visited {
 	color: #000000;
 }
 
-ul#mainMenu li.current a {
+#mainMenu li.current a {
 	font-weight: bold; 
 	/* background-color: #CCD4E4; */
 	background: #DCE1ED url(../images/menu/menu_main_current.gif) scroll 0px 0px repeat-y;
 }
 
-ul#mainMenu li.current_sub a {
+#mainMenu li.current_sub a {
 	font-weight: bold; 
 	background-color: #DCE1ED; /* #D2D9E8 */
 }
@@ -129,4 +129,12 @@ ul#mainMenu li.current_sub a {
 #mainMenu .current_sub ul.subMenu li.current a {
 	font-weight: bold; 
 	background: #F0F0F0 url(../images/menu/menu_sub_current.gif) scroll 0px 0px repeat-y;
+}
+
+span.asflink {
+	display: inline-block;
+	background-image: url('../images/asflink.gif');
+	background-position: right 2px;
+	background-repeat: no-repeat;
+	width: 14px;
 }
\ No newline at end of file

Copied: empire-db/site/doap_Empire-db.rdf (from r1245127, empire-db/site/doap_Empire-db_(incubating).rdf)
URL: http://svn.apache.org/viewvc/empire-db/site/doap_Empire-db.rdf?p2=empire-db/site/doap_Empire-db.rdf&p1=empire-db/site/doap_Empire-db_%28incubating%29.rdf&r1=1245127&r2=1245208&rev=1245208&view=diff
==============================================================================
--- empire-db/site/doap_Empire-db_(incubating).rdf (original)
+++ empire-db/site/doap_Empire-db.rdf Thu Feb 16 22:14:20 2012
@@ -21,24 +21,24 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-  <Project rdf:about="http://incubator.apache.org/empire-db">
+  <Project rdf:about="http://empire-db.apache.org">
     <created>2011-01-16</created>
     <license rdf:resource="http://usefulinc.com/doap/licenses/asl20" />
-    <name>Apache Empire-db (incubating)</name>
-    <homepage rdf:resource="http://incubator.apache.org/empire-db" />
-    <asfext:pmc rdf:resource="http://incubator.apache.org" />
+    <name>Apache Empire-db</name>
+    <homepage rdf:resource="http://empire-db.apache.org" />
+    <asfext:pmc rdf:resource="http://empire-db.apache.org" />
     <shortdesc>Apache Empire-db is a lightweight relational database abstraction layer and data persistence component</shortdesc>	
     <description>Apache Empire-db is a relational database abstraction layer that allows developers to take a much more SQL-centric approach in application development than traditional Object/Relational mapping frameworks (ORM). With its unique object orientated command API it allows the creation of SQL-statements of any complexity that take full advantage of all DBMS features which leads to highly efficient database operations and code. Additionally by eliminating the use of error-prone string operations it also offers an unprecedented level of ease-of-use and compile-time-safety.</description>
     <bug-database rdf:resource="https://issues.apache.org/jira/browse/EMPIREDB" />
-    <mailing-list rdf:resource="http://incubator.apache.org/empire-db/community/mailing_lists.htm" />
-    <download-page rdf:resource="http://incubator.apache.org/empire-db/downloads/latest.htm" />
+    <mailing-list rdf:resource="http://empire-db.apache.org/community/mailing_lists.htm" />
+    <download-page rdf:resource="http://empire-db.apache.org/downloads/latest.htm" />
     <programming-language>Java</programming-language>
     <category rdf:resource="http://projects.apache.org/category/database" />
     <release>
       <Version>
-        <name>apache-empire-db-2.0.7-incubating</name>
-        <created>2010-12-12</created>
-        <revision>2.0.7</revision>
+        <name>apache-empire-db-2.2.0-incubating</name>
+        <created>2011-11-02</created>
+        <revision>2.2.0</revision>
       </Version>
     </release>
     <maintainer>

Propchange: empire-db/site/doap_Empire-db.rdf
------------------------------------------------------------------------------
    eol-style = native

Modified: empire-db/site/documentation/api.htm
URL: http://svn.apache.org/viewvc/empire-db/site/documentation/api.htm?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/documentation/api.htm (original)
+++ empire-db/site/documentation/api.htm Thu Feb 16 22:14:20 2012
@@ -32,8 +32,8 @@
 			<img src="../images/logos/empire-db-logo.gif" alt="Empire-db: The relational data persistence component." />
 		</div>
 		<div id="asf">
-			<a target="_blank" href="http://incubator.apache.org/">
-			<img src="../images/logos/apache-incubator-logo.png" alt="Apache Incubator" /></a>
+			<a id="asfhome" target="_blank" href="http://www.apache.org"><img src="../images/logos/feather-small.gif" alt="The Apache Software Foundation" /></a>
+			<label for="asfhome" >The Apache Software Foundation</label>
 		</div>
 		<div style="clear:both"></div>
 	</div>
@@ -50,69 +50,55 @@
 					<ul id="mainMenu">
 						<li id="menu_home"><a href="../index.html">Home</a></li>
 						<li id="menu_news"><a href="../news.htm">News</a></li>
-						<li id="menu_empiredb">
-						<a href="../empiredb/empiredb.htm">Empire-db</a>
+						<li id="menu_empiredb"><a href="../empiredb/empiredb.htm">Empire-db</a>
 								<ul class="subMenu">
-									<li id="menu_empiredb_extending_pattern">
-									<a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
-									<li id="menu_empiredb_handling_metadata">
-									<a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
-									<li id="menu_empiredb_wrong">
-									<a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
-									<li id="menu_empiredb_stringfree">
-									<a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
-									<li id="menu_empiredb_faq">
-									<a href="../empiredb/faq.htm">FAQ</a></li>
+									<li id="menu_empiredb_extending_pattern"><a href="../empiredb/pattern.htm">The Empire DAO-<br />pattern</a></li>
+									<li id="menu_empiredb_handling_metadata"><a href="../empiredb/metadata.htm">Handling data and metadata</a></li>
+									<li id="menu_empiredb_wrong"><a href="../empiredb/hibernate.htm">What's wrong with Hibernate and JPA</a></li>
+									<li id="menu_empiredb_stringfree"><a href="../empiredb/stringfree.htm">The principle of<br/>string-free coding</a></li>
+									<li id="menu_empiredb_faq"><a href="../empiredb/faq.htm">FAQ</a></li>
 								</ul>
 						</li>
-						<li id="menu_struts2ext">
-						<a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
+						<li id="menu_struts2ext"><a href="../struts2ext/struts2ext.htm">Empire-db and Struts2</a>
 							<ul class="subMenu">
-								<li id="menu_struts2ext_forms_controls">
-								<a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
-								<li id="menu_struts2ext_rendering_parsing">
-								<a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
+								<li id="menu_struts2ext_forms_controls"><a href="../struts2ext/forms_controls.htm">Forms and controls</a></li>
+								<li id="menu_struts2ext_rendering_parsing"><a href="../struts2ext/rendering_parsing.htm">Rendering and parsing</a></li>
 								<!--<li id="menu_struts2ext_tag_reference"><a href="struts2ext/tag_reference.htm">Tag reference</a></li>-->
-								<li id="menu_struts2ext_input_controls">
-								<a href="../struts2ext/input_controls.htm">Input controls</a></li>
+								<li id="menu_struts2ext_input_controls"><a href="../struts2ext/input_controls.htm">Input controls</a></li>
 							</ul>
 						</li>
-						<li id="menu_downloads">
-						<a href="../downloads/latest.htm">Downloads</a>
+						<li id="menu_downloads"><a href="../downloads/latest.htm">Downloads</a>
 								<ul class="subMenu">
-									<li id="menu_downloads_previous">
-									<a href="../downloads/previous.htm">Previous releases</a></li>
-									<li id="menu_downloads_license">
-									<a href="../downloads/license.htm">License</a></li>
+									<li id="menu_downloads_previous"><a href="../downloads/previous.htm">Previous releases</a></li>
+									<li id="menu_downloads_license"><a href="../downloads/license.htm">License</a></li>
 								</ul>
 						</li>
 						<li id="menu_documentation"><a href="documentation.htm">Documentation</a>					
 							<ul class="subMenu">
-								<li id="menu_documentation_class_overview">
-								<a href="class_overview.htm">Empire-db class<br />overview</a></li>
-								<li id="menu_documentation_tutorials">
-								<a href="tutorial.htm">Tutorial</a></li>
-								<li id="menu_documentation_getting_started">
-								<a href="getting_started.htm">Getting started</a></li>
-								<li id="menu_documentation_api">
-								<a href="api.htm">API</a></li>
+								<li id="menu_documentation_class_overview"><a href="class_overview.htm">Empire-db class<br />overview</a></li>
+								<li id="menu_documentation_tutorials"><a href="tutorial.htm">Tutorial</a></li>
+								<li id="menu_documentation_getting_started"><a href="getting_started.htm">Getting started</a></li>
+								<li id="menu_documentation_api"><a href="api.htm">API</a></li>
 							</ul>
 						</li>
-						<li id="menu_community">
-						<a href="../community/community.htm">Community</a>					
+						<li id="menu_community"><a href="../community/community.htm">Community</a>					
 							<ul class="subMenu">
-								<li id="menu_community_mailing_lists">
-								<a href="../community/mailing_lists.htm">Mailing lists</a></li>
-								<li id="menu_community_source_code">
-								<a href="../community/source_code.htm">Source code</a></li>
-								<li id="menu_community_jira">
-								<a href="../community/jira.htm">Ticketing &amp; Wiki</a></li>
+								<li id="menu_community_mailing_lists"><a href="../community/mailing_lists.htm">Mailing lists</a></li>
+								<li id="menu_community_source_code"><a href="../community/source_code.htm">Source code</a></li>
+								<li id="menu_community_jira"><a href="../community/jira.htm">Ticketing &amp; Wiki</a></li>
 								<!--<li id="menu_community_road_map"><a href="community/road_map.htm">Road map</a></li>-->
-								<li id="menu_community_contributors">
-								<a href="../community/contributors.htm">Contributors</a></li>
+								<li id="menu_community_contributors"><a href="../community/contributors.htm">Contributors</a></li>
 							</ul>
 						</li>
-						<li id="menu_disclaimer"><a href="../disclaimer.htm">Disclaimer</a></li>
+						<li id="menu_apache"><a href="../apache.htm">About Apache</a>
+							<ul class="subMenu">
+								<li id="menu_apache_home"><a href="http://www.apache.org">Apache home<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_donate"><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_thanks"><a href="http://www.apache.org/foundation/thanks.html">Foundation thanks<span class="asflink">&nbsp;</span></a></li>
+								<li id="menu_apache_security"><a href="http://www.apache.org/security/">Security<span class="asflink">&nbsp;</span></a></li>
+							</ul>
+						</li>
+						<li id="menu_disclaimer"><a href="http://www.apache.org/licenses/">License<span class="asflink">&nbsp;</span></a></li>
 					</ul>
 				</div>
 				
@@ -164,8 +150,7 @@
 				</div>
 				<div id="nav_next">
 					&nbsp;
-					<a id="next" href="">Next Page 
-					<img src="../images/next.gif" alt="" /></a>
+					<a id="next" href="">Next Page <img src="../images/next.gif" alt="" /></a>
 				</div>
 				<div style="clear: both;"></div>
 			</div>
@@ -204,15 +189,12 @@
 	
 	<!-- Footer -->		
 	<div id="footer">
-		<small>Copyright &copy; 2008-2011, The Apache Software Foundation</small>&nbsp;<!--<p style="padding-right: 25px; text-align: right;">
-	    <a href="http://validator.w3.org/check?uri=referer">
-		<img
-	        src="images/valid-xhtml10.png"
-	        alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
-	 	</p>--></div>
+		<div class="cr"><small>Copyright &copy; 2008-2012, The Apache Software Foundation</small></div>
+		<div class="tm"><small>Apache Empire-db, Empire-db, Apache, the Apache feather logo, and the Apache Empire-db project logo are trademarks of The Apache Software Foundation</small></div>
+	</div>
 
 </div>
 
 </body>
 <!-- #EndTemplate -->
-</html>
+</html>
\ No newline at end of file



Mime
View raw message