empire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From doeb...@apache.org
Subject svn commit: r1245208 [3/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
Modified: empire-db/site/empiredb/hibernate.htm
URL: http://svn.apache.org/viewvc/empire-db/site/empiredb/hibernate.htm?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/empiredb/hibernate.htm (original)
+++ empire-db/site/empiredb/hibernate.htm Thu Feb 16 22:14:20 2012
@@ -1,5 +1,5 @@
 <!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" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" >
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-gb" lang="en-gb" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:v="urn:schemas-microsoft-com:vml" >
 <!-- #BeginTemplate "../main.dwt" -->
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -22,6 +22,23 @@
 	<link rel="stylesheet" href="../css/layout.css" type="text/css" />
 	<!-- #BeginEditable "stylesheets" -->
 <style type="text/css">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 .style1 {
 	color: #000000;
 }
@@ -38,8 +55,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>
@@ -58,67 +75,53 @@
 						<li id="menu_news"><a href="../news.htm">News</a></li>
 						<li id="menu_empiredb"><a href="empiredb.htm">Empire-db</a>
 								<ul class="subMenu">
-									<li id="menu_empiredb_extending_pattern">
-									<a href="pattern.htm">The Empire DAO-<br />pattern</a></li>
-									<li id="menu_empiredb_handling_metadata">
-									<a href="metadata.htm">Handling data and metadata</a></li>
-									<li id="menu_empiredb_wrong">
-									<a href="hibernate.htm">What's wrong with Hibernate and JPA</a></li>
-									<li id="menu_empiredb_stringfree">
-									<a href="stringfree.htm">The principle of<br/>string-free coding</a></li>
-									<li id="menu_empiredb_faq">
-									<a href="faq.htm">FAQ</a></li>
+									<li id="menu_empiredb_extending_pattern"><a href="pattern.htm">The Empire DAO-<br />pattern</a></li>
+									<li id="menu_empiredb_handling_metadata"><a href="metadata.htm">Handling data and metadata</a></li>
+									<li id="menu_empiredb_wrong"><a href="hibernate.htm">What's wrong with Hibernate and JPA</a></li>
+									<li id="menu_empiredb_stringfree"><a href="stringfree.htm">The principle of<br/>string-free coding</a></li>
+									<li id="menu_empiredb_faq"><a href="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/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>
 				
@@ -370,8 +373,7 @@ cmd.orderBy(EMP.FIRSTNAME);</span></pre>
 				</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>
@@ -410,12 +412,9 @@ cmd.orderBy(EMP.FIRSTNAME);</span></pre>
 	
 	<!-- Footer -->		
 	<div id="footer">
-		<small>Copyright &copy; 2008-2009, 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>
 

Modified: empire-db/site/empiredb/metadata.htm
URL: http://svn.apache.org/viewvc/empire-db/site/empiredb/metadata.htm?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/empiredb/metadata.htm (original)
+++ empire-db/site/empiredb/metadata.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>
@@ -52,67 +52,53 @@
 						<li id="menu_news"><a href="../news.htm">News</a></li>
 						<li id="menu_empiredb"><a href="empiredb.htm">Empire-db</a>
 								<ul class="subMenu">
-									<li id="menu_empiredb_extending_pattern">
-									<a href="pattern.htm">The Empire DAO-<br />pattern</a></li>
-									<li id="menu_empiredb_handling_metadata">
-									<a href="metadata.htm">Handling data and metadata</a></li>
-									<li id="menu_empiredb_wrong">
-									<a href="hibernate.htm">What's wrong with Hibernate and JPA</a></li>
-									<li id="menu_empiredb_stringfree">
-									<a href="stringfree.htm">The principle of<br/>string-free coding</a></li>
-									<li id="menu_empiredb_faq">
-									<a href="faq.htm">FAQ</a></li>
+									<li id="menu_empiredb_extending_pattern"><a href="pattern.htm">The Empire DAO-<br />pattern</a></li>
+									<li id="menu_empiredb_handling_metadata"><a href="metadata.htm">Handling data and metadata</a></li>
+									<li id="menu_empiredb_wrong"><a href="hibernate.htm">What's wrong with Hibernate and JPA</a></li>
+									<li id="menu_empiredb_stringfree"><a href="stringfree.htm">The principle of<br/>string-free coding</a></li>
+									<li id="menu_empiredb_faq"><a href="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/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>
 				
@@ -198,8 +184,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>
@@ -238,12 +223,9 @@
 	
 	<!-- Footer -->		
 	<div id="footer">
-		<small>Copyright &copy; 2008-2009, 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>
 

Modified: empire-db/site/empiredb/pattern.htm
URL: http://svn.apache.org/viewvc/empire-db/site/empiredb/pattern.htm?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/empiredb/pattern.htm (original)
+++ empire-db/site/empiredb/pattern.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>
@@ -52,67 +52,53 @@
 						<li id="menu_news"><a href="../news.htm">News</a></li>
 						<li id="menu_empiredb"><a href="empiredb.htm">Empire-db</a>
 								<ul class="subMenu">
-									<li id="menu_empiredb_extending_pattern">
-									<a href="pattern.htm">The Empire DAO-<br />pattern</a></li>
-									<li id="menu_empiredb_handling_metadata">
-									<a href="metadata.htm">Handling data and metadata</a></li>
-									<li id="menu_empiredb_wrong">
-									<a href="hibernate.htm">What's wrong with Hibernate and JPA</a></li>
-									<li id="menu_empiredb_stringfree">
-									<a href="stringfree.htm">The principle of<br/>string-free coding</a></li>
-									<li id="menu_empiredb_faq">
-									<a href="faq.htm">FAQ</a></li>
+									<li id="menu_empiredb_extending_pattern"><a href="pattern.htm">The Empire DAO-<br />pattern</a></li>
+									<li id="menu_empiredb_handling_metadata"><a href="metadata.htm">Handling data and metadata</a></li>
+									<li id="menu_empiredb_wrong"><a href="hibernate.htm">What's wrong with Hibernate and JPA</a></li>
+									<li id="menu_empiredb_stringfree"><a href="stringfree.htm">The principle of<br/>string-free coding</a></li>
+									<li id="menu_empiredb_faq"><a href="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/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>
 				
@@ -202,8 +188,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>
@@ -242,12 +227,9 @@
 	
 	<!-- Footer -->		
 	<div id="footer">
-		<small>Copyright &copy; 2008-2009, 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>
 

Modified: empire-db/site/empiredb/stringfree.htm
URL: http://svn.apache.org/viewvc/empire-db/site/empiredb/stringfree.htm?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/empiredb/stringfree.htm (original)
+++ empire-db/site/empiredb/stringfree.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>
@@ -52,67 +52,53 @@
 						<li id="menu_news"><a href="../news.htm">News</a></li>
 						<li id="menu_empiredb"><a href="empiredb.htm">Empire-db</a>
 								<ul class="subMenu">
-									<li id="menu_empiredb_extending_pattern">
-									<a href="pattern.htm">The Empire DAO-<br />pattern</a></li>
-									<li id="menu_empiredb_handling_metadata">
-									<a href="metadata.htm">Handling data and metadata</a></li>
-									<li id="menu_empiredb_wrong">
-									<a href="hibernate.htm">What's wrong with Hibernate and JPA</a></li>
-									<li id="menu_empiredb_stringfree">
-									<a href="stringfree.htm">The principle of<br/>string-free coding</a></li>
-									<li id="menu_empiredb_faq">
-									<a href="faq.htm">FAQ</a></li>
+									<li id="menu_empiredb_extending_pattern"><a href="pattern.htm">The Empire DAO-<br />pattern</a></li>
+									<li id="menu_empiredb_handling_metadata"><a href="metadata.htm">Handling data and metadata</a></li>
+									<li id="menu_empiredb_wrong"><a href="hibernate.htm">What's wrong with Hibernate and JPA</a></li>
+									<li id="menu_empiredb_stringfree"><a href="stringfree.htm">The principle of<br/>string-free coding</a></li>
+									<li id="menu_empiredb_faq"><a href="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/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>
 				
@@ -213,8 +199,7 @@ cmd.where(</span><font color="#0000FF">E
 				</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>
@@ -253,12 +238,9 @@ cmd.where(</span><font color="#0000FF">E
 	
 	<!-- Footer -->		
 	<div id="footer">
-		<small>Copyright &copy; 2008-2009, 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>
 

Added: empire-db/site/images/asflink.gif
URL: http://svn.apache.org/viewvc/empire-db/site/images/asflink.gif?rev=1245208&view=auto
==============================================================================
Binary file - no diff available.

Propchange: empire-db/site/images/asflink.gif
------------------------------------------------------------------------------
    eol-style = native

Propchange: empire-db/site/images/asflink.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: empire-db/site/images/logos/empire-db-logo.gif
URL: http://svn.apache.org/viewvc/empire-db/site/images/logos/empire-db-logo.gif?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
Binary files - no diff available.

Added: empire-db/site/images/logos/feather-small.gif
URL: http://svn.apache.org/viewvc/empire-db/site/images/logos/feather-small.gif?rev=1245208&view=auto
==============================================================================
Binary file - no diff available.

Propchange: empire-db/site/images/logos/feather-small.gif
------------------------------------------------------------------------------
    eol-style = native

Propchange: empire-db/site/images/logos/feather-small.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: empire-db/site/index.html
URL: http://svn.apache.org/viewvc/empire-db/site/index.html?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/index.html (original)
+++ empire-db/site/index.html Thu Feb 16 22:14:20 2012
@@ -22,6 +22,23 @@
 	<!-- #BeginEditable "stylesheets" -->
 <style type="text/css">
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 div#top {
 	height: 20px;	
 }
@@ -65,8 +82,8 @@ table#comparison td.empiredb {
 			<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>
@@ -123,7 +140,15 @@ table#comparison td.empiredb {
 								<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>
 				
@@ -269,15 +294,12 @@ table#comparison td.empiredb {
 	
 	<!-- 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/main.dwt
URL: http://svn.apache.org/viewvc/empire-db/site/main.dwt?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/main.dwt (original)
+++ empire-db/site/main.dwt Thu Feb 16 22:14:20 2012
@@ -31,8 +31,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>
@@ -89,7 +89,15 @@
 								<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>
 				
@@ -175,12 +183,9 @@
 	
 	<!-- Footer -->		
 	<div id="footer">
-		<small>Copyright &copy; 2008-2009, 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>
 

Modified: empire-db/site/news.htm
URL: http://svn.apache.org/viewvc/empire-db/site/news.htm?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/news.htm (original)
+++ empire-db/site/news.htm Thu Feb 16 22:14:20 2012
@@ -21,7 +21,6 @@
 	<link rel="stylesheet" href="css/layout.css" type="text/css" />
 	<!-- #BeginEditable "stylesheets" -->
 <style type="text/css">
-
 div#top {
 	height: 20px;	
 }
@@ -65,8 +64,8 @@ table#comparison td.empiredb {
 			<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>
@@ -123,7 +122,15 @@ table#comparison td.empiredb {
 								<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>
 				
@@ -167,6 +174,17 @@ table#comparison td.empiredb {
 					by the Apache Incubator PMC</p>
 				</div>-->
 
+
+                <div class="news">
+                    <div>
+                        <h2><span class="createdate">Tuesday, 24th January 2012</span> - Apache Empire-db to become a Top-Level-Project (TLP)</h2>
+                    </div>
+                    <p>The Apache Empire-db project has entered the Apache Incubator in July 2008 and has since steadily developed it's code base and it's community.
+                    In October 2011 the Empire-db PMC felt confident that Empire-db was now mature enough to leave the Apache incubator and become a Top-Level-Project within the Apache Software Foundation.
+                    After a corresponding proposal had been submitted and after a positive vote from members of the Incubator PMC the Apache board has now promoted Empire-db to become a TLP.
+                    We want to thank all contributors and users for their support and confidence.</p>
+                </div>
+
                 <div class="news">
                     <div>
                         <h2><span class="createdate">Wednesday, 2nd November 2011</span> - Apache Empire-db 2.2.0 released</h2>
@@ -389,15 +407,12 @@ table#comparison td.empiredb {
 	
 	<!-- 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/struts2ext/forms_controls.htm
URL: http://svn.apache.org/viewvc/empire-db/site/struts2ext/forms_controls.htm?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/struts2ext/forms_controls.htm (original)
+++ empire-db/site/struts2ext/forms_controls.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.htm">Empire-db and Struts2</a>
 							<ul class="subMenu">
-								<li id="menu_struts2ext_forms_controls">
-								<a href="forms_controls.htm">Forms and controls</a></li>
-								<li id="menu_struts2ext_rendering_parsing">
-								<a href="rendering_parsing.htm">Rendering and parsing</a></li>
+								<li id="menu_struts2ext_forms_controls"><a href="forms_controls.htm">Forms and controls</a></li>
+								<li id="menu_struts2ext_rendering_parsing"><a href="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="input_controls.htm">Input controls</a></li>
+								<li id="menu_struts2ext_input_controls"><a href="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/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>
 				
@@ -325,8 +311,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>
@@ -365,15 +350,12 @@
 	
 	<!-- Footer -->		
 	<div id="footer">
-		<small>Copyright &copy; 2008-2009, 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/struts2ext/input_controls.htm
URL: http://svn.apache.org/viewvc/empire-db/site/struts2ext/input_controls.htm?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/struts2ext/input_controls.htm (original)
+++ empire-db/site/struts2ext/input_controls.htm Thu Feb 16 22:14:20 2012
@@ -21,6 +21,23 @@
 	<link rel="stylesheet" href="../css/layout.css" type="text/css" />
 	<!-- #BeginEditable "stylesheets" -->
 <style type="text/css">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 table#struts2_comparison th {
 	width: 300px;
 	border: 1px #C0C0C0 solid;
@@ -45,8 +62,8 @@ table#struts2_comparison td {
 			<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>
@@ -63,69 +80,55 @@ table#struts2_comparison td {
 					<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.htm">Empire-db and Struts2</a>
 							<ul class="subMenu">
-								<li id="menu_struts2ext_forms_controls">
-								<a href="forms_controls.htm">Forms and controls</a></li>
-								<li id="menu_struts2ext_rendering_parsing">
-								<a href="rendering_parsing.htm">Rendering and parsing</a></li>
+								<li id="menu_struts2ext_forms_controls"><a href="forms_controls.htm">Forms and controls</a></li>
+								<li id="menu_struts2ext_rendering_parsing"><a href="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="input_controls.htm">Input controls</a></li>
+								<li id="menu_struts2ext_input_controls"><a href="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/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>
 				
@@ -235,8 +238,7 @@ table#struts2_comparison td {
 				</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>
@@ -275,12 +277,9 @@ table#struts2_comparison td {
 	
 	<!-- Footer -->		
 	<div id="footer">
-		<small>Copyright &copy; 2008-2009, 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>
 

Modified: empire-db/site/struts2ext/rendering_parsing.htm
URL: http://svn.apache.org/viewvc/empire-db/site/struts2ext/rendering_parsing.htm?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/struts2ext/rendering_parsing.htm (original)
+++ empire-db/site/struts2ext/rendering_parsing.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.htm">Empire-db and Struts2</a>
 							<ul class="subMenu">
-								<li id="menu_struts2ext_forms_controls">
-								<a href="forms_controls.htm">Forms and controls</a></li>
-								<li id="menu_struts2ext_rendering_parsing">
-								<a href="rendering_parsing.htm">Rendering and parsing</a></li>
+								<li id="menu_struts2ext_forms_controls"><a href="forms_controls.htm">Forms and controls</a></li>
+								<li id="menu_struts2ext_rendering_parsing"><a href="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="input_controls.htm">Input controls</a></li>
+								<li id="menu_struts2ext_input_controls"><a href="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/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>
 				
@@ -257,8 +243,7 @@ db.<font color="#0000FF">MYTABLE</font>.
 				</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>
@@ -297,12 +282,9 @@ db.<font color="#0000FF">MYTABLE</font>.
 	
 	<!-- Footer -->		
 	<div id="footer">
-		<small>Copyright &copy; 2008-2009, 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>
 

Modified: empire-db/site/struts2ext/struts2ext.htm
URL: http://svn.apache.org/viewvc/empire-db/site/struts2ext/struts2ext.htm?rev=1245208&r1=1245207&r2=1245208&view=diff
==============================================================================
--- empire-db/site/struts2ext/struts2ext.htm (original)
+++ empire-db/site/struts2ext/struts2ext.htm Thu Feb 16 22:14:20 2012
@@ -21,6 +21,23 @@
 	<link rel="stylesheet" href="../css/layout.css" type="text/css" />
 	<!-- #BeginEditable "stylesheets" -->
 <style type="text/css">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 table#struts2_comparison th {
 	width: 300px;
 	border: 1px #C0C0C0 solid;
@@ -45,8 +62,8 @@ table#struts2_comparison td {
 			<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>
@@ -63,69 +80,55 @@ table#struts2_comparison td {
 					<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.htm">Empire-db and Struts2</a>
 							<ul class="subMenu">
-								<li id="menu_struts2ext_forms_controls">
-								<a href="forms_controls.htm">Forms and controls</a></li>
-								<li id="menu_struts2ext_rendering_parsing">
-								<a href="rendering_parsing.htm">Rendering and parsing</a></li>
+								<li id="menu_struts2ext_forms_controls"><a href="forms_controls.htm">Forms and controls</a></li>
+								<li id="menu_struts2ext_rendering_parsing"><a href="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="input_controls.htm">Input controls</a></li>
+								<li id="menu_struts2ext_input_controls"><a href="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/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>
 				
@@ -220,8 +223,7 @@ table#struts2_comparison td {
 				</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>
@@ -260,12 +262,9 @@ table#struts2_comparison td {
 	
 	<!-- Footer -->		
 	<div id="footer">
-		<small>Copyright &copy; 2008-2009, 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>
 



Mime
View raw message