You are viewing a plain text version of this content. The canonical link for it is here.
Posted to legal-discuss@apache.org by pq...@apache.org on 2008/04/10 11:27:27 UTC

svn commit: r646711 [3/3] - in /infrastructure/site/trunk/docs: legal/ licenses/ licenses/exports/ licenses/proposed/

Modified: infrastructure/site/trunk/docs/licenses/exports/index.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/licenses/exports/index.html?rev=646711&r1=646710&r2=646711&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/licenses/exports/index.html (original)
+++ infrastructure/site/trunk/docs/licenses/exports/index.html Thu Apr 10 02:27:01 2008
@@ -25,99 +25,48 @@
             This file is generated from XML source: DO NOT EDIT!
       XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
    -->
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <link rel="stylesheet" href="../../style/style.css" type="text/css" />
-      <title>ASF Export Classifications and Source Links - The Apache Software Foundation</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<link rel="stylesheet" href="../../style/compressed.css" type="text/css" media="screen, projection">
+	<link rel="stylesheet" href="../../style/style.css" type="text/css" media="screen, projection">
+	<!--[if IE]><link rel="stylesheet" href="../../style/ie.css" type="text/css" media="screen, projection"><![endif]-->
+
+    <title>ASF Export Classifications and Source Links - The Apache Software Foundation</title>
  </head>
- <body>        
-  <table border="0" width="100%" cellspacing="0">
-   <tr><!-- SITE BANNER AND PROJECT IMAGE -->
-    <td align="left" valign="top">
-<a href="http://www.apache.org/"><img src="../../images/asf_logo_wide.gif" alt="The Apache Software Foundation" title="The Apache Software Foundation" align="left" border="0"/></a>
-</td>
-<td>
-<!-- Need to specify height otherwise iframe seems to grab extra -->
-<iframe src="http://www.apache.org/ads/halfbanner.html" height="65"
-    style="border-width:0; float: right" frameborder="0" scrolling="no"></iframe>
-</td>
-   </tr>
-  </table>
-  <table border="0" width="100%" cellspacing="4">
-   <tr><td colspan="3"><hr noshade="noshade" size="1"/></td></tr>
-   <tr>
-    <!-- LEFT SIDE NAVIGATION -->
-    <td valign="top" nowrap="nowrap" class="navleft">
-           <div class="menuheader"><a 
-href="http://projects.apache.org/">Apache Projects</a></div> 
-    <menu compact="compact">
-          <li><a href="http://httpd.apache.org/" title="Apache Web Server (httpd)">HTTP Server</a></li> 
-          <li><a href="http://activemq.apache.org/" title="Distributed Messaging System">ActiveMQ</a></li> 
-          <li><a href="http://ant.apache.org/" title="Java-based build tool">Ant</a></li> 
-          <li><a href="http://apr.apache.org/" title="Apache Portable Runtime libraries">APR</a></li> 
-          <li><a href="http://beehive.apache.org/" title="Metadata frameworks for enterprise applications">Beehive</a></li> 
-          <li><a href="http://cayenne.apache.org/" title="User-friendly Java ORM with Tools">Cayenne</a></li> 
-          <li><a href="http://cocoon.apache.org/" title="Web development framework: separation of concerns, component-based">Cocoon</a></li> 
-          <li><a href="http://commons.apache.org/" title="Reusable Java components">Commons</a></li> 
-          <li><a href="http://continuum.apache.org/" title="Continuous Integration and Build Server">Continuum</a></li> 
-          <li><a href="http://db.apache.org/" title="Database access">DB</a></li> 
-          <li><a href="http://directory.apache.org/" title="Apache Directory Server">Directory</a></li> 
-          <li><a href="http://excalibur.apache.org/" title="Embeddable software libraries related to component and service management access">Excalibur</a></li> 
-          <li><a href="http://felix.apache.org/" title="OSGi Framework and components.">Felix</a></li> 
-          <li><a href="http://forrest.apache.org/" title="Aggregated multi-channel documentation, separation of concerns">Forrest</a></li> 
-          <li><a href="http://geronimo.apache.org/" title="Java2, Enterprise Edition (J2EE) container">Geronimo</a></li> 
-          <li><a href="http://gump.apache.org/" title="Continuous integration of open source projects">Gump</a></li> 
-          <li><a href="http://hadoop.apache.org/" title="Distributed computing platform">Hadoop</a></li> 
-          <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
-          <li><a href="http://hivemind.apache.org/" title="A services and configuration microkernel">HiveMind</a></li> 
-          <li><a href="http://hc.apache.org/" title="Java toolset of low level HTTP components">HttpComponents</a></li> 
-          <li><a href="http://ibatis.apache.org/" title="SQL Data Mapper for Java and .NET">iBATIS</a></li> 
-          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
-          <li><a href="http://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
-          <li><a href="http://jakarta.apache.org/" title="Server-side Java">Jakarta</a></li> 
-          <li><a href="http://james.apache.org/" title="Java Apache Mail Enterprise Server">James</a></li> 
-          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
-          <li><a href="http://lenya.apache.org/" title="Content Management System">Lenya</a></li> 
-          <li><a href="http://logging.apache.org/" title="Cross-language logging services">Logging</a></li> 
-          <li><a href="http://lucene.apache.org/" title="Search engine library">Lucene</a></li> 
-          <li><a href="http://maven.apache.org/" title="Java project management and comprehension tools">Maven</a></li> 
-          <li><a href="http://mina.apache.org/" title="Multipurpose Infrastructure for Network Application">Mina</a></li> 
-          <li><a href="http://myfaces.apache.org/" title="JavaServer(tm) Faces implementation and components">MyFaces</a></li> 
-          <li><a href="http://ode.apache.org/" title="Orchestration Director Engine: Business Process Management (BPM), Process Orchestration and Workflow through service compositioni.">ODE</a></li> 
-          <li><a href="http://ofbiz.apache.org/" title="Open for Business: enterprise automation software">OFBiz</a></li> 
-          <li><a href="http://openejb.apache.org/" title="OpenEJB: a modular, configurable, and extendable EJB Container System and Server">OpenEJB</a></li> 
-          <li><a href="http://openjpa.apache.org/" title="OpenJPA: Object Relational Mapping for Java">OpenJPA</a></li> 
-          <li><a href="http://perl.apache.org/" title="Dynamic websites using Perl">Perl</a></li> 
-          <li><a href="http://poi.apache.org/" title="Java API for OLE 2 Compound Documents">POI</a></li> 
-          <li><a href="http://portals.apache.org/" title="Portal technology">Portals</a></li> 
-          <li><a href="http://roller.apache.org/" title="Java blog server">Roller</a></li> 
-          <li><a href="http://santuario.apache.org/" title="XML Security in Java and C++">Santuario</a></li> 
-          <li><a href="http://servicemix.apache.org/" title="Enterprise Service Bus">ServiceMix</a></li> 
-          <li><a href="http://shale.apache.org/" title="Web application framework based on JavaServer(tm) Faces">Shale</a></li> 
-          <li><a href="http://spamassassin.apache.org/" title="Mail filter to identify spam">SpamAssassin</a></li> 
-          <li><a href="http://stdcxx.apache.org/" title="Apache C++ Standard Library">STDCXX</a></li> 
-          <li><a href="http://struts.apache.org/" title="Model 2 framework for building Java web applications">Struts</a></li> 
-          <li><a href="http://synapse.apache.org/" title="Enterprise Service Bus and Mediation Framework">Synapse</a></li> 
-          <li><a href="http://tapestry.apache.org/" title="Component-based Java Web Application Framework">Tapestry</a></li> 
-          <li><a href="http://tcl.apache.org/" title="Dynamic websites using TCL">TCL</a></li> 
-          <li><a href="http://tiles.apache.org/" title="A templating framework for web application user interfaces">Tiles</a></li> 
-          <li><a href="http://tomcat.apache.org/" title="A Java Servlet and JSP Container">Tomcat</a></li> 
-          <li><a href="http://turbine.apache.org/" title="A Java Servlet Web Application Framework and associated component library">
-         Turbine</a></li> 
-          <li><a href="http://velocity.apache.org/" title="A Java Templating Engine">Velocity</a></li> 
-          <li><a href="http://wicket.apache.org/" title="Component-based Java Web Application Framework.">Wicket</a></li> 
-          <li><a href="http://ws.apache.org/">Web Services</a></li> 
-          <li><a href="http://xalan.apache.org/" title="XSLT processors in Java and C++">Xalan</a></li> 
-          <li><a href="http://xerces.apache.org/" title="XML parsers in Java, C++ and Perl">Xerces</a></li> 
-          <li><a href="http://xml.apache.org/" title="XML solutions focused on the web">XML</a></li> 
-          <li><a href="http://xmlbeans.apache.org/" title="XML-Java binding tool">XMLBeans</a></li> 
-          <li><a href="http://xmlgraphics.apache.org/" title="Conversion from XML to graphical output">XML Graphics</a></li> 
-        </menu>
-    </td>
-    <!-- CONTENT -->
-    <td align="left" valign="top" class="content">
-                <h2><img src="/images/redarrow.gif" alt=" "/>
-   <a name="heading">ASF Export Classifications and Source Links</a>
-</h2>
+ <body id="sub">
+ 	<div class="navigation">
+		<ul>
+			<li><a href="../../" title="Foundation Home">Home</a></li>
+			<li><a href="../../foundation" title="About the Foundation">Foundation</a></li>
+			<li><a href="http://projects.apache.org" title="Apache Projects">Projects</a></li>
+			<li><a href="http://people.apache.org" title="Apache People">People</a></li>
+			<li><a href="../../foundation/getinvolved.html" title="Get invloved n Apache">Get Involved</a></li>
+			<li><a href="../../foundation/sponsorship.html" title="Support the mission of Apache">Support Apache</a></li>			
+			<li class="dlink"><a href="../../dyn/closer.cgi" title="Download Apache projects">Download</a></li>
+		</ul>
+	</div>
+	<div class="container">
+	<hr class="space col">
+	<div class="block">
+		<div class="column span-24">
+      <div id="header">
+                          <!-- Add 'default' header section here. -->
+                                <h1>ASF Export Classifications and Source Links</h1>
+                         </div>
+      </div>
+	</div>
+	<hr/>
+	<div class="block">
+    		<div class="column span-8 prepend-16 search searchsub">
+    			<form action="http://www.google.com/search" method="get">
+		         <input value="*.apache.org" name="sitesearch" type="hidden"/>
+		         <input size="10" name="q" id="query" type="text"/>
+		         <input name="Search" value="Go" type="submit"/>
+	       </form>
+		</div>
+	</div>
+	<div class="block content">
+		<div class="column span-15 colborder">
+                            
 <div class="section-content">
 <p>This page provides detailed information on the export control status
 of the Apache Software Foundation's <a href="#matrix">products</a>,
@@ -125,9 +74,10 @@
 are built.</p>
 <p>ASF projects and PMCs should consult our <a href="/dev/crypto.html">guide to handling cryptography</a> in order to comply with our export
 policies.</p>
-<h3>
+
+<h4>
    <a name="exporting">Exporting ASF Products</a>
-</h3>
+</h4>
 <div class="section-content">
 <p><a href="http://www.apache.org/foundation/">The Apache Software Foundation
 (ASF)</a> is a 501(c)3 nonprofit charity based in the United States of America.
@@ -158,9 +108,10 @@
 in the export of ASF products and to provide guidance to BIS employees that
 seek the source code for ASF products. All export classification information
 contained in the matrix is subject to change without notice.</p>
-<h4> 
-   <a name="embargoed">Embargoed Destinations</a> 
-</h4> 
+
+<h5>
+   <a name="embargoed">Embargoed Destinations</a>
+</h5>
 <div class="section-content">
 <p>ASF software and/or technical data may NOT be exported/reexported, either
 directly or indirectly, to any destination subject to U.S. embargoes or
@@ -173,9 +124,10 @@
 <a href="http://www.treas.gov/offices/enforcement/ofac/">Treasury Department
 regulations</a>.</p>
 </div>
-<h4> 
+
+<h6> 
    <a name="denied">Denied Parties List</a> 
-</h4> 
+</h6> 
 <div class="section-content">
 <p>U.S. export regulations require that all international and domestic
 transactions be screened against the U.S. Government listing of prohibited
@@ -189,9 +141,10 @@
 Entity and Denied Persons Lists</a>.</p>
 </div>
 </div>
-<h3>
+
+<h4>
    <a name="matrix">ASF Product Classification Matrix</a>
-</h3>
+</h4>
 <div class="section-content">
 <p>The Apache Software Foundation (ASF) makes NO WARRANTY or representation
 that the information contained in the ASF Product Classification Matrix is
@@ -783,12 +736,82 @@
 </table>
 </div>
 </div>
-         </td>
-    <!-- RIGHT SIDE NAVIGATION -->
-    <td valign="top" nowrap="nowrap" class="navright">
-           <div class="menuheader"><a 
-href="/foundation/">Foundation</a></div>
-    <menu compact="compact">
+         </div>
+  <div class="column span-8 last">
+    <div class="block">
+      <div class="nav column span-11">
+        <div>
+             <div class="menuheader"><a 
+href="http://projects.apache.org/">Apache Projects</a></div> 
+  <ul>
+          <li><a href="http://httpd.apache.org/" title="Apache Web Server (httpd)">HTTP Server</a></li> 
+          <li><a href="http://activemq.apache.org/" title="Distributed Messaging System">ActiveMQ</a></li> 
+          <li><a href="http://ant.apache.org/" title="Java-based build tool">Ant</a></li> 
+          <li><a href="http://apr.apache.org/" title="Apache Portable Runtime libraries">APR</a></li> 
+          <li><a href="http://beehive.apache.org/" title="Metadata frameworks for enterprise applications">Beehive</a></li> 
+          <li><a href="http://cayenne.apache.org/" title="User-friendly Java ORM with Tools">Cayenne</a></li> 
+          <li><a href="http://cocoon.apache.org/" title="Web development framework: separation of concerns, component-based">Cocoon</a></li> 
+          <li><a href="http://commons.apache.org/" title="Reusable Java components">Commons</a></li> 
+          <li><a href="http://continuum.apache.org/" title="Continuous Integration and Build Server">Continuum</a></li> 
+          <li><a href="http://db.apache.org/" title="Database access">DB</a></li> 
+          <li><a href="http://directory.apache.org/" title="Apache Directory Server">Directory</a></li> 
+          <li><a href="http://excalibur.apache.org/" title="Embeddable software libraries related to component and service management access">Excalibur</a></li> 
+          <li><a href="http://felix.apache.org/" title="OSGi Framework and components.">Felix</a></li> 
+          <li><a href="http://forrest.apache.org/" title="Aggregated multi-channel documentation, separation of concerns">Forrest</a></li> 
+          <li><a href="http://geronimo.apache.org/" title="Java2, Enterprise Edition (J2EE) container">Geronimo</a></li> 
+          <li><a href="http://gump.apache.org/" title="Continuous integration of open source projects">Gump</a></li> 
+          <li><a href="http://hadoop.apache.org/" title="Distributed computing platform">Hadoop</a></li> 
+          <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
+          <li><a href="http://hivemind.apache.org/" title="A services and configuration microkernel">HiveMind</a></li> 
+          <li><a href="http://hc.apache.org/" title="Java toolset of low level HTTP components">HttpComponents</a></li> 
+          <li><a href="http://ibatis.apache.org/" title="SQL Data Mapper for Java and .NET">iBATIS</a></li> 
+          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
+          <li><a href="http://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
+          <li><a href="http://jakarta.apache.org/" title="Server-side Java">Jakarta</a></li> 
+          <li><a href="http://james.apache.org/" title="Java Apache Mail Enterprise Server">James</a></li> 
+          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
+          <li><a href="http://lenya.apache.org/" title="Content Management System">Lenya</a></li> 
+          <li><a href="http://logging.apache.org/" title="Cross-language logging services">Logging</a></li> 
+          <li><a href="http://lucene.apache.org/" title="Search engine library">Lucene</a></li> 
+          <li><a href="http://maven.apache.org/" title="Java project management and comprehension tools">Maven</a></li> 
+          <li><a href="http://mina.apache.org/" title="Multipurpose Infrastructure for Network Application">Mina</a></li> 
+          <li><a href="http://myfaces.apache.org/" title="JavaServer(tm) Faces implementation and components">MyFaces</a></li> 
+          <li><a href="http://ode.apache.org/" title="Orchestration Director Engine: Business Process Management (BPM), Process Orchestration and Workflow through service compositioni.">ODE</a></li> 
+          <li><a href="http://ofbiz.apache.org/" title="Open for Business: enterprise automation software">OFBiz</a></li> 
+          <li><a href="http://openejb.apache.org/" title="OpenEJB: a modular, configurable, and extendable EJB Container System and Server">OpenEJB</a></li> 
+          <li><a href="http://openjpa.apache.org/" title="OpenJPA: Object Relational Mapping for Java">OpenJPA</a></li> 
+          <li><a href="http://perl.apache.org/" title="Dynamic websites using Perl">Perl</a></li> 
+          <li><a href="http://poi.apache.org/" title="Java API for OLE 2 Compound Documents">POI</a></li> 
+          <li><a href="http://portals.apache.org/" title="Portal technology">Portals</a></li> 
+          <li><a href="http://roller.apache.org/" title="Java blog server">Roller</a></li> 
+          <li><a href="http://santuario.apache.org/" title="XML Security in Java and C++">Santuario</a></li> 
+          <li><a href="http://servicemix.apache.org/" title="Enterprise Service Bus">ServiceMix</a></li> 
+          <li><a href="http://shale.apache.org/" title="Web application framework based on JavaServer(tm) Faces">Shale</a></li> 
+          <li><a href="http://spamassassin.apache.org/" title="Mail filter to identify spam">SpamAssassin</a></li> 
+          <li><a href="http://stdcxx.apache.org/" title="Apache C++ Standard Library">STDCXX</a></li> 
+          <li><a href="http://struts.apache.org/" title="Model 2 framework for building Java web applications">Struts</a></li> 
+          <li><a href="http://synapse.apache.org/" title="Enterprise Service Bus and Mediation Framework">Synapse</a></li> 
+          <li><a href="http://tapestry.apache.org/" title="Component-based Java Web Application Framework">Tapestry</a></li> 
+          <li><a href="http://tcl.apache.org/" title="Dynamic websites using TCL">TCL</a></li> 
+          <li><a href="http://tiles.apache.org/" title="A templating framework for web application user interfaces">Tiles</a></li> 
+          <li><a href="http://tomcat.apache.org/" title="A Java Servlet and JSP Container">Tomcat</a></li> 
+          <li><a href="http://turbine.apache.org/" title="A Java Servlet Web Application Framework and associated component library">
+         Turbine</a></li> 
+          <li><a href="http://velocity.apache.org/" title="A Java Templating Engine">Velocity</a></li> 
+          <li><a href="http://wicket.apache.org/" title="Component-based Java Web Application Framework.">Wicket</a></li> 
+          <li><a href="http://ws.apache.org/">Web Services</a></li> 
+          <li><a href="http://xalan.apache.org/" title="XSLT processors in Java and C++">Xalan</a></li> 
+          <li><a href="http://xerces.apache.org/" title="XML parsers in Java, C++ and Perl">Xerces</a></li> 
+          <li><a href="http://xml.apache.org/" title="XML solutions focused on the web">XML</a></li> 
+          <li><a href="http://xmlbeans.apache.org/" title="XML-Java binding tool">XMLBeans</a></li> 
+          <li><a href="http://xmlgraphics.apache.org/" title="Conversion from XML to graphical output">XML Graphics</a></li> 
+      </ul>
+        </div>
+      </div>
+      <div class="nav column prepend-1 span-12 last">
+             <h6><a 
+href="/foundation/">Foundation</a></h6>
+  <ul>
           <li><a href="/foundation/faq.html">FAQ</a></li> 
           <li><a href="/licenses/">Licenses</a></li> 
           <li><a href="/foundation/news.html">News</a></li> 
@@ -797,15 +820,15 @@
           <li><a href="/foundation/contributing.html">Donations</a></li> 
           <li><a href="/foundation/thanks.html">Thanks</a></li> 
           <li><a href="/foundation/contact.html">Contact</a></li> 
-        </menu>
-      <div class="menuheader">Foundation Projects</div>
-    <menu compact="compact">
+      </ul>
+      <h6>Foundation Projects</h6>
+  <ul>
           <li><a href="/foundation/conferences.html" title="Meetings of developers and users">Conferences</a></li> 
           <li><a href="/dev/" title="ASF Infrastructure: Operations and howto documents for PMCs and contributors">Infrastructure</a></li> 
           <li><a href="/jcp/" title="Apache and the Java Community Process">JCP</a></li> 
-        </menu>
-      <div class="menuheader">How it works</div>
-    <menu compact="compact">
+      </ul>
+      <h6>How it works</h6>
+  <ul>
           <li><a href="/foundation/how-it-works.html">Introduction</a></li> 
           <li><a href="/foundation/how-it-works.html#meritocracy">Meritocracy</a></li> 
           <li><a href="/foundation/how-it-works.html#structure">Structure</a></li> 
@@ -816,44 +839,32 @@
           <li><a href="/foundation/how-it-works.html#other">Other entities</a></li> 
           <li><a href="/foundation/glossary.html">Glossary</a></li> 
           <li><a href="/foundation/voting.html">Voting</a></li> 
-        </menu>
-      <div class="menuheader"><a 
-href="/foundation/getinvolved.html">Get Involved</a></div>
-    <menu compact="compact">
+      </ul>
+      <h6><a 
+href="/foundation/getinvolved.html">Get Involved</a></h6>
+  <ul>
           <li><a href="/foundation/mailinglists.html">Mailing Lists</a></li> 
           <li><a href="/dev/version-control.html">Version Control</a></li> 
           <li><a href="/dev/">Developer Info</a></li> 
-        </menu>
-      <div class="menuheader">Download</div>
-    <menu compact="compact">
-          <li><a href="http://www.apache.org/dyn/closer.cgi">from a mirror</a></li> 
-        </menu>
-      <div class="menuheader">Related Sites</div>
-    <menu compact="compact">
+      </ul>
+      <h6>Download</h6>
+  <ul>
+          <li><a href="/dyn/closer.cgi">from a mirror</a></li> 
+      </ul>
+      <h6>Related Sites</h6>
+  <ul>
           <li><a href="http://apachecon.com/" title="Official Apache Conference">ApacheCon</a></li> 
           <li><a href="http://apachebookstore.com/" title="Apache Books">Bookstore</a></li> 
           <li><a href="http://feathercast.org/" title="Apache Podcasts">Feathercast</a></li> 
           <li><a href="http://planetapache.org/" title="Apache Community Blogs">PlanetApache</a></li> 
-        </menu>
-
-     <div class="menuheader">Search apache.org</div>
-     <div class="searchbox">
-       <form action="http://www.google.com/search" method="get">
-         <input value="*.apache.org" name="sitesearch" type="hidden"/>
-         <input size="10" name="q" id="query" type="text"/>
-         <input name="Search" value="Go" type="submit"/>
-       </form>
-     </div>
-
-    </td>     
-   </tr>
-   <!-- FOOTER -->
-   <tr><td colspan="3"><hr noshade="noshade" size="1"/></td></tr>
-   <tr><td colspan="3" class="footer">
-         Copyright &#169; 2007 The Apache Software Foundation<br />
-Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-       </td>
-   </tr>
-  </table>
- </body>
+      </ul>
+      </div>
+    </div>
+  </div>
+	<div class="column span-24 footer">
+		<hr>
+		<p>Copyright &#169; 2008 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+	</div>
+</div>
+</body>
 </html>

Modified: infrastructure/site/trunk/docs/licenses/index.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/licenses/index.html?rev=646711&r1=646710&r2=646711&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/licenses/index.html (original)
+++ infrastructure/site/trunk/docs/licenses/index.html Thu Apr 10 02:27:01 2008
@@ -25,100 +25,49 @@
             This file is generated from XML source: DO NOT EDIT!
       XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
    -->
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <link rel="stylesheet" href="../style/style.css" type="text/css" />
-       <meta name="author" content="The Apache Software Foundation" /><meta name="email" content="apache.AT.apache.DOT.org" />
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<link rel="stylesheet" href="../style/compressed.css" type="text/css" media="screen, projection">
+	<link rel="stylesheet" href="../style/style.css" type="text/css" media="screen, projection">
+	<!--[if IE]><link rel="stylesheet" href="../style/ie.css" type="text/css" media="screen, projection"><![endif]-->
+
+     <meta name="author" content="The Apache Software Foundation" /><meta name="email" content="apache.AT.apache.DOT.org" />
     <title>Licenses - The Apache Software Foundation</title>
  </head>
- <body>        
-  <table border="0" width="100%" cellspacing="0">
-   <tr><!-- SITE BANNER AND PROJECT IMAGE -->
-    <td align="left" valign="top">
-<a href="http://www.apache.org/"><img src="../images/asf_logo_wide.gif" alt="The Apache Software Foundation" title="The Apache Software Foundation" align="left" border="0"/></a>
-</td>
-<td>
-<!-- Need to specify height otherwise iframe seems to grab extra -->
-<iframe src="http://www.apache.org/ads/halfbanner.html" height="65"
-    style="border-width:0; float: right" frameborder="0" scrolling="no"></iframe>
-</td>
-   </tr>
-  </table>
-  <table border="0" width="100%" cellspacing="4">
-   <tr><td colspan="3"><hr noshade="noshade" size="1"/></td></tr>
-   <tr>
-    <!-- LEFT SIDE NAVIGATION -->
-    <td valign="top" nowrap="nowrap" class="navleft">
-           <div class="menuheader"><a 
-href="http://projects.apache.org/">Apache Projects</a></div> 
-    <menu compact="compact">
-          <li><a href="http://httpd.apache.org/" title="Apache Web Server (httpd)">HTTP Server</a></li> 
-          <li><a href="http://activemq.apache.org/" title="Distributed Messaging System">ActiveMQ</a></li> 
-          <li><a href="http://ant.apache.org/" title="Java-based build tool">Ant</a></li> 
-          <li><a href="http://apr.apache.org/" title="Apache Portable Runtime libraries">APR</a></li> 
-          <li><a href="http://beehive.apache.org/" title="Metadata frameworks for enterprise applications">Beehive</a></li> 
-          <li><a href="http://cayenne.apache.org/" title="User-friendly Java ORM with Tools">Cayenne</a></li> 
-          <li><a href="http://cocoon.apache.org/" title="Web development framework: separation of concerns, component-based">Cocoon</a></li> 
-          <li><a href="http://commons.apache.org/" title="Reusable Java components">Commons</a></li> 
-          <li><a href="http://continuum.apache.org/" title="Continuous Integration and Build Server">Continuum</a></li> 
-          <li><a href="http://db.apache.org/" title="Database access">DB</a></li> 
-          <li><a href="http://directory.apache.org/" title="Apache Directory Server">Directory</a></li> 
-          <li><a href="http://excalibur.apache.org/" title="Embeddable software libraries related to component and service management access">Excalibur</a></li> 
-          <li><a href="http://felix.apache.org/" title="OSGi Framework and components.">Felix</a></li> 
-          <li><a href="http://forrest.apache.org/" title="Aggregated multi-channel documentation, separation of concerns">Forrest</a></li> 
-          <li><a href="http://geronimo.apache.org/" title="Java2, Enterprise Edition (J2EE) container">Geronimo</a></li> 
-          <li><a href="http://gump.apache.org/" title="Continuous integration of open source projects">Gump</a></li> 
-          <li><a href="http://hadoop.apache.org/" title="Distributed computing platform">Hadoop</a></li> 
-          <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
-          <li><a href="http://hivemind.apache.org/" title="A services and configuration microkernel">HiveMind</a></li> 
-          <li><a href="http://hc.apache.org/" title="Java toolset of low level HTTP components">HttpComponents</a></li> 
-          <li><a href="http://ibatis.apache.org/" title="SQL Data Mapper for Java and .NET">iBATIS</a></li> 
-          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
-          <li><a href="http://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
-          <li><a href="http://jakarta.apache.org/" title="Server-side Java">Jakarta</a></li> 
-          <li><a href="http://james.apache.org/" title="Java Apache Mail Enterprise Server">James</a></li> 
-          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
-          <li><a href="http://lenya.apache.org/" title="Content Management System">Lenya</a></li> 
-          <li><a href="http://logging.apache.org/" title="Cross-language logging services">Logging</a></li> 
-          <li><a href="http://lucene.apache.org/" title="Search engine library">Lucene</a></li> 
-          <li><a href="http://maven.apache.org/" title="Java project management and comprehension tools">Maven</a></li> 
-          <li><a href="http://mina.apache.org/" title="Multipurpose Infrastructure for Network Application">Mina</a></li> 
-          <li><a href="http://myfaces.apache.org/" title="JavaServer(tm) Faces implementation and components">MyFaces</a></li> 
-          <li><a href="http://ode.apache.org/" title="Orchestration Director Engine: Business Process Management (BPM), Process Orchestration and Workflow through service compositioni.">ODE</a></li> 
-          <li><a href="http://ofbiz.apache.org/" title="Open for Business: enterprise automation software">OFBiz</a></li> 
-          <li><a href="http://openejb.apache.org/" title="OpenEJB: a modular, configurable, and extendable EJB Container System and Server">OpenEJB</a></li> 
-          <li><a href="http://openjpa.apache.org/" title="OpenJPA: Object Relational Mapping for Java">OpenJPA</a></li> 
-          <li><a href="http://perl.apache.org/" title="Dynamic websites using Perl">Perl</a></li> 
-          <li><a href="http://poi.apache.org/" title="Java API for OLE 2 Compound Documents">POI</a></li> 
-          <li><a href="http://portals.apache.org/" title="Portal technology">Portals</a></li> 
-          <li><a href="http://roller.apache.org/" title="Java blog server">Roller</a></li> 
-          <li><a href="http://santuario.apache.org/" title="XML Security in Java and C++">Santuario</a></li> 
-          <li><a href="http://servicemix.apache.org/" title="Enterprise Service Bus">ServiceMix</a></li> 
-          <li><a href="http://shale.apache.org/" title="Web application framework based on JavaServer(tm) Faces">Shale</a></li> 
-          <li><a href="http://spamassassin.apache.org/" title="Mail filter to identify spam">SpamAssassin</a></li> 
-          <li><a href="http://stdcxx.apache.org/" title="Apache C++ Standard Library">STDCXX</a></li> 
-          <li><a href="http://struts.apache.org/" title="Model 2 framework for building Java web applications">Struts</a></li> 
-          <li><a href="http://synapse.apache.org/" title="Enterprise Service Bus and Mediation Framework">Synapse</a></li> 
-          <li><a href="http://tapestry.apache.org/" title="Component-based Java Web Application Framework">Tapestry</a></li> 
-          <li><a href="http://tcl.apache.org/" title="Dynamic websites using TCL">TCL</a></li> 
-          <li><a href="http://tiles.apache.org/" title="A templating framework for web application user interfaces">Tiles</a></li> 
-          <li><a href="http://tomcat.apache.org/" title="A Java Servlet and JSP Container">Tomcat</a></li> 
-          <li><a href="http://turbine.apache.org/" title="A Java Servlet Web Application Framework and associated component library">
-         Turbine</a></li> 
-          <li><a href="http://velocity.apache.org/" title="A Java Templating Engine">Velocity</a></li> 
-          <li><a href="http://wicket.apache.org/" title="Component-based Java Web Application Framework.">Wicket</a></li> 
-          <li><a href="http://ws.apache.org/">Web Services</a></li> 
-          <li><a href="http://xalan.apache.org/" title="XSLT processors in Java and C++">Xalan</a></li> 
-          <li><a href="http://xerces.apache.org/" title="XML parsers in Java, C++ and Perl">Xerces</a></li> 
-          <li><a href="http://xml.apache.org/" title="XML solutions focused on the web">XML</a></li> 
-          <li><a href="http://xmlbeans.apache.org/" title="XML-Java binding tool">XMLBeans</a></li> 
-          <li><a href="http://xmlgraphics.apache.org/" title="Conversion from XML to graphical output">XML Graphics</a></li> 
-        </menu>
-    </td>
-    <!-- CONTENT -->
-    <td align="left" valign="top" class="content">
-                <h2><img src="/images/redarrow.gif" alt=" "/>
-   Licenses
-</h2>
+ <body id="sub">
+ 	<div class="navigation">
+		<ul>
+			<li><a href="../" title="Foundation Home">Home</a></li>
+			<li><a href="../foundation" title="About the Foundation">Foundation</a></li>
+			<li><a href="http://projects.apache.org" title="Apache Projects">Projects</a></li>
+			<li><a href="http://people.apache.org" title="Apache People">People</a></li>
+			<li><a href="../foundation/getinvolved.html" title="Get invloved n Apache">Get Involved</a></li>
+			<li><a href="../foundation/sponsorship.html" title="Support the mission of Apache">Support Apache</a></li>			
+			<li class="dlink"><a href="../dyn/closer.cgi" title="Download Apache projects">Download</a></li>
+		</ul>
+	</div>
+	<div class="container">
+	<hr class="space col">
+	<div class="block">
+		<div class="column span-24">
+      <div id="header">
+                          <!-- Add 'default' header section here. -->
+                                <h1>Licenses</h1>
+                         </div>
+      </div>
+	</div>
+	<hr/>
+	<div class="block">
+    		<div class="column span-8 prepend-16 search searchsub">
+    			<form action="http://www.google.com/search" method="get">
+		         <input value="*.apache.org" name="sitesearch" type="hidden"/>
+		         <input size="10" name="q" id="query" type="text"/>
+		         <input name="Search" value="Go" type="submit"/>
+	       </form>
+		</div>
+	</div>
+	<div class="block content">
+		<div class="column span-15 colborder">
+                            
 <div class="section-content">
 <p>
 The Apache Software Foundation uses various licenses to
@@ -139,9 +88,10 @@
 purpose outside of Apache while providing the ASF and its projects
 the right to distribute and build upon their work within Apache.
 </p>
-<h3>
+
+<h4>
    <a name="distributions">Licensing of Distributions</a>
-</h3>
+</h4>
 <div class="section-content">
 <p>
 All software produced by The Apache Software Foundation or any
@@ -149,9 +99,10 @@
 of the documents listed below.
 
 </p>
-<h4> 
-   <a name="2.0">Apache License, Version 2.0 (current)</a> 
-</h4> 
+
+<h5>
+   <a name="2.0">Apache License, Version 2.0 (current)</a>
+</h5>
 <div class="section-content">
 <p><a href="LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>
 (<a href="LICENSE-2.0.txt">TXT</a> or
@@ -181,9 +132,10 @@
 the Apache License, Version 2.0</a></i>.</p>
 <p>See the <a href="../foundation/licence-FAQ.html">Licence FAQ</a>.</p>
 </div>
-<h4> 
+
+<h6> 
    <a name="1.1">Apache License, Version 1.1 (historic)</a> 
-</h4> 
+</h6> 
 <div class="section-content">
 <p><a href="LICENSE-1.1">http://www.apache.org/licenses/LICENSE-1.1</a></p>
 <p>The 1.1 version of the Apache License was approved
@@ -195,9 +147,10 @@
 wording due to varying requirements for attribution or mark identification,
 but the binding terms were all the same.</p>
 </div>
-<h4> 
+
+<h6> 
    <a name="1.0">Apache License, Version 1.0 (historic)</a> 
-</h4> 
+</h6> 
 <div class="section-content">
 <p><a href="LICENSE-1.0">http://www.apache.org/licenses/LICENSE-1.0</a></p>
 <p>This is the original Apache License which applies only to older
@@ -205,9 +158,10 @@
 </p>
 </div>
 </div>
-<h3>
+
+<h4>
    <a name="clas">Contributor License Agreements</a>
-</h3>
+</h4>
 <div class="section-content">
 <p>
 The ASF desires that all contributors of ideas, code, or documentation
@@ -239,9 +193,10 @@
 blank, or totally illegible.
 </p>
 </div>
-<h3>
+
+<h4>
    <a name="grants">Software Grants</a>
-</h3>
+</h4>
 <div class="section-content">
 <p>
 When an individual or corporation decides to donate a body of existing
@@ -253,21 +208,92 @@
 viable community available to support a collaborative project.
 </p>
 </div>
-<h3>
+
+<h4>
    <a name="crypto">Export restrictions</a>
-</h3>
+</h4>
 <div class="section-content">
 <p>For export restriction information, please consult our 
 <a href="/licenses/exports/">ASF Export Classifications</a> page. 
 </p>
 </div>
 </div>
-         </td>
-    <!-- RIGHT SIDE NAVIGATION -->
-    <td valign="top" nowrap="nowrap" class="navright">
-           <div class="menuheader"><a 
-href="/foundation/">Foundation</a></div>
-    <menu compact="compact">
+         </div>
+  <div class="column span-8 last">
+    <div class="block">
+      <div class="nav column span-11">
+        <div>
+             <div class="menuheader"><a 
+href="http://projects.apache.org/">Apache Projects</a></div> 
+  <ul>
+          <li><a href="http://httpd.apache.org/" title="Apache Web Server (httpd)">HTTP Server</a></li> 
+          <li><a href="http://activemq.apache.org/" title="Distributed Messaging System">ActiveMQ</a></li> 
+          <li><a href="http://ant.apache.org/" title="Java-based build tool">Ant</a></li> 
+          <li><a href="http://apr.apache.org/" title="Apache Portable Runtime libraries">APR</a></li> 
+          <li><a href="http://beehive.apache.org/" title="Metadata frameworks for enterprise applications">Beehive</a></li> 
+          <li><a href="http://cayenne.apache.org/" title="User-friendly Java ORM with Tools">Cayenne</a></li> 
+          <li><a href="http://cocoon.apache.org/" title="Web development framework: separation of concerns, component-based">Cocoon</a></li> 
+          <li><a href="http://commons.apache.org/" title="Reusable Java components">Commons</a></li> 
+          <li><a href="http://continuum.apache.org/" title="Continuous Integration and Build Server">Continuum</a></li> 
+          <li><a href="http://db.apache.org/" title="Database access">DB</a></li> 
+          <li><a href="http://directory.apache.org/" title="Apache Directory Server">Directory</a></li> 
+          <li><a href="http://excalibur.apache.org/" title="Embeddable software libraries related to component and service management access">Excalibur</a></li> 
+          <li><a href="http://felix.apache.org/" title="OSGi Framework and components.">Felix</a></li> 
+          <li><a href="http://forrest.apache.org/" title="Aggregated multi-channel documentation, separation of concerns">Forrest</a></li> 
+          <li><a href="http://geronimo.apache.org/" title="Java2, Enterprise Edition (J2EE) container">Geronimo</a></li> 
+          <li><a href="http://gump.apache.org/" title="Continuous integration of open source projects">Gump</a></li> 
+          <li><a href="http://hadoop.apache.org/" title="Distributed computing platform">Hadoop</a></li> 
+          <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
+          <li><a href="http://hivemind.apache.org/" title="A services and configuration microkernel">HiveMind</a></li> 
+          <li><a href="http://hc.apache.org/" title="Java toolset of low level HTTP components">HttpComponents</a></li> 
+          <li><a href="http://ibatis.apache.org/" title="SQL Data Mapper for Java and .NET">iBATIS</a></li> 
+          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
+          <li><a href="http://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
+          <li><a href="http://jakarta.apache.org/" title="Server-side Java">Jakarta</a></li> 
+          <li><a href="http://james.apache.org/" title="Java Apache Mail Enterprise Server">James</a></li> 
+          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
+          <li><a href="http://lenya.apache.org/" title="Content Management System">Lenya</a></li> 
+          <li><a href="http://logging.apache.org/" title="Cross-language logging services">Logging</a></li> 
+          <li><a href="http://lucene.apache.org/" title="Search engine library">Lucene</a></li> 
+          <li><a href="http://maven.apache.org/" title="Java project management and comprehension tools">Maven</a></li> 
+          <li><a href="http://mina.apache.org/" title="Multipurpose Infrastructure for Network Application">Mina</a></li> 
+          <li><a href="http://myfaces.apache.org/" title="JavaServer(tm) Faces implementation and components">MyFaces</a></li> 
+          <li><a href="http://ode.apache.org/" title="Orchestration Director Engine: Business Process Management (BPM), Process Orchestration and Workflow through service compositioni.">ODE</a></li> 
+          <li><a href="http://ofbiz.apache.org/" title="Open for Business: enterprise automation software">OFBiz</a></li> 
+          <li><a href="http://openejb.apache.org/" title="OpenEJB: a modular, configurable, and extendable EJB Container System and Server">OpenEJB</a></li> 
+          <li><a href="http://openjpa.apache.org/" title="OpenJPA: Object Relational Mapping for Java">OpenJPA</a></li> 
+          <li><a href="http://perl.apache.org/" title="Dynamic websites using Perl">Perl</a></li> 
+          <li><a href="http://poi.apache.org/" title="Java API for OLE 2 Compound Documents">POI</a></li> 
+          <li><a href="http://portals.apache.org/" title="Portal technology">Portals</a></li> 
+          <li><a href="http://roller.apache.org/" title="Java blog server">Roller</a></li> 
+          <li><a href="http://santuario.apache.org/" title="XML Security in Java and C++">Santuario</a></li> 
+          <li><a href="http://servicemix.apache.org/" title="Enterprise Service Bus">ServiceMix</a></li> 
+          <li><a href="http://shale.apache.org/" title="Web application framework based on JavaServer(tm) Faces">Shale</a></li> 
+          <li><a href="http://spamassassin.apache.org/" title="Mail filter to identify spam">SpamAssassin</a></li> 
+          <li><a href="http://stdcxx.apache.org/" title="Apache C++ Standard Library">STDCXX</a></li> 
+          <li><a href="http://struts.apache.org/" title="Model 2 framework for building Java web applications">Struts</a></li> 
+          <li><a href="http://synapse.apache.org/" title="Enterprise Service Bus and Mediation Framework">Synapse</a></li> 
+          <li><a href="http://tapestry.apache.org/" title="Component-based Java Web Application Framework">Tapestry</a></li> 
+          <li><a href="http://tcl.apache.org/" title="Dynamic websites using TCL">TCL</a></li> 
+          <li><a href="http://tiles.apache.org/" title="A templating framework for web application user interfaces">Tiles</a></li> 
+          <li><a href="http://tomcat.apache.org/" title="A Java Servlet and JSP Container">Tomcat</a></li> 
+          <li><a href="http://turbine.apache.org/" title="A Java Servlet Web Application Framework and associated component library">
+         Turbine</a></li> 
+          <li><a href="http://velocity.apache.org/" title="A Java Templating Engine">Velocity</a></li> 
+          <li><a href="http://wicket.apache.org/" title="Component-based Java Web Application Framework.">Wicket</a></li> 
+          <li><a href="http://ws.apache.org/">Web Services</a></li> 
+          <li><a href="http://xalan.apache.org/" title="XSLT processors in Java and C++">Xalan</a></li> 
+          <li><a href="http://xerces.apache.org/" title="XML parsers in Java, C++ and Perl">Xerces</a></li> 
+          <li><a href="http://xml.apache.org/" title="XML solutions focused on the web">XML</a></li> 
+          <li><a href="http://xmlbeans.apache.org/" title="XML-Java binding tool">XMLBeans</a></li> 
+          <li><a href="http://xmlgraphics.apache.org/" title="Conversion from XML to graphical output">XML Graphics</a></li> 
+      </ul>
+        </div>
+      </div>
+      <div class="nav column prepend-1 span-12 last">
+             <h6><a 
+href="/foundation/">Foundation</a></h6>
+  <ul>
           <li><a href="/foundation/faq.html">FAQ</a></li> 
           <li><a href="/licenses/">Licenses</a></li> 
           <li><a href="/foundation/news.html">News</a></li> 
@@ -276,15 +302,15 @@
           <li><a href="/foundation/contributing.html">Donations</a></li> 
           <li><a href="/foundation/thanks.html">Thanks</a></li> 
           <li><a href="/foundation/contact.html">Contact</a></li> 
-        </menu>
-      <div class="menuheader">Foundation Projects</div>
-    <menu compact="compact">
+      </ul>
+      <h6>Foundation Projects</h6>
+  <ul>
           <li><a href="/foundation/conferences.html" title="Meetings of developers and users">Conferences</a></li> 
           <li><a href="/dev/" title="ASF Infrastructure: Operations and howto documents for PMCs and contributors">Infrastructure</a></li> 
           <li><a href="/jcp/" title="Apache and the Java Community Process">JCP</a></li> 
-        </menu>
-      <div class="menuheader">How it works</div>
-    <menu compact="compact">
+      </ul>
+      <h6>How it works</h6>
+  <ul>
           <li><a href="/foundation/how-it-works.html">Introduction</a></li> 
           <li><a href="/foundation/how-it-works.html#meritocracy">Meritocracy</a></li> 
           <li><a href="/foundation/how-it-works.html#structure">Structure</a></li> 
@@ -295,44 +321,32 @@
           <li><a href="/foundation/how-it-works.html#other">Other entities</a></li> 
           <li><a href="/foundation/glossary.html">Glossary</a></li> 
           <li><a href="/foundation/voting.html">Voting</a></li> 
-        </menu>
-      <div class="menuheader"><a 
-href="/foundation/getinvolved.html">Get Involved</a></div>
-    <menu compact="compact">
+      </ul>
+      <h6><a 
+href="/foundation/getinvolved.html">Get Involved</a></h6>
+  <ul>
           <li><a href="/foundation/mailinglists.html">Mailing Lists</a></li> 
           <li><a href="/dev/version-control.html">Version Control</a></li> 
           <li><a href="/dev/">Developer Info</a></li> 
-        </menu>
-      <div class="menuheader">Download</div>
-    <menu compact="compact">
-          <li><a href="http://www.apache.org/dyn/closer.cgi">from a mirror</a></li> 
-        </menu>
-      <div class="menuheader">Related Sites</div>
-    <menu compact="compact">
+      </ul>
+      <h6>Download</h6>
+  <ul>
+          <li><a href="/dyn/closer.cgi">from a mirror</a></li> 
+      </ul>
+      <h6>Related Sites</h6>
+  <ul>
           <li><a href="http://apachecon.com/" title="Official Apache Conference">ApacheCon</a></li> 
           <li><a href="http://apachebookstore.com/" title="Apache Books">Bookstore</a></li> 
           <li><a href="http://feathercast.org/" title="Apache Podcasts">Feathercast</a></li> 
           <li><a href="http://planetapache.org/" title="Apache Community Blogs">PlanetApache</a></li> 
-        </menu>
-
-     <div class="menuheader">Search apache.org</div>
-     <div class="searchbox">
-       <form action="http://www.google.com/search" method="get">
-         <input value="*.apache.org" name="sitesearch" type="hidden"/>
-         <input size="10" name="q" id="query" type="text"/>
-         <input name="Search" value="Go" type="submit"/>
-       </form>
-     </div>
-
-    </td>     
-   </tr>
-   <!-- FOOTER -->
-   <tr><td colspan="3"><hr noshade="noshade" size="1"/></td></tr>
-   <tr><td colspan="3" class="footer">
-         Copyright &#169; 2007 The Apache Software Foundation<br />
-Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-       </td>
-   </tr>
-  </table>
- </body>
+      </ul>
+      </div>
+    </div>
+  </div>
+	<div class="column span-24 footer">
+		<hr>
+		<p>Copyright &#169; 2008 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+	</div>
+</div>
+</body>
 </html>

Modified: infrastructure/site/trunk/docs/licenses/proposed/index.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/licenses/proposed/index.html?rev=646711&r1=646710&r2=646711&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/licenses/proposed/index.html (original)
+++ infrastructure/site/trunk/docs/licenses/proposed/index.html Thu Apr 10 02:27:01 2008
@@ -25,99 +25,48 @@
             This file is generated from XML source: DO NOT EDIT!
       XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
    -->
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <link rel="stylesheet" href="../../style/style.css" type="text/css" />
-      <title>Proposed Licenses - The Apache Software Foundation</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<link rel="stylesheet" href="../../style/compressed.css" type="text/css" media="screen, projection">
+	<link rel="stylesheet" href="../../style/style.css" type="text/css" media="screen, projection">
+	<!--[if IE]><link rel="stylesheet" href="../../style/ie.css" type="text/css" media="screen, projection"><![endif]-->
+
+    <title>Proposed Licenses - The Apache Software Foundation</title>
  </head>
- <body>        
-  <table border="0" width="100%" cellspacing="0">
-   <tr><!-- SITE BANNER AND PROJECT IMAGE -->
-    <td align="left" valign="top">
-<a href="http://www.apache.org/"><img src="../../images/asf_logo_wide.gif" alt="The Apache Software Foundation" title="The Apache Software Foundation" align="left" border="0"/></a>
-</td>
-<td>
-<!-- Need to specify height otherwise iframe seems to grab extra -->
-<iframe src="http://www.apache.org/ads/halfbanner.html" height="65"
-    style="border-width:0; float: right" frameborder="0" scrolling="no"></iframe>
-</td>
-   </tr>
-  </table>
-  <table border="0" width="100%" cellspacing="4">
-   <tr><td colspan="3"><hr noshade="noshade" size="1"/></td></tr>
-   <tr>
-    <!-- LEFT SIDE NAVIGATION -->
-    <td valign="top" nowrap="nowrap" class="navleft">
-           <div class="menuheader"><a 
-href="http://projects.apache.org/">Apache Projects</a></div> 
-    <menu compact="compact">
-          <li><a href="http://httpd.apache.org/" title="Apache Web Server (httpd)">HTTP Server</a></li> 
-          <li><a href="http://activemq.apache.org/" title="Distributed Messaging System">ActiveMQ</a></li> 
-          <li><a href="http://ant.apache.org/" title="Java-based build tool">Ant</a></li> 
-          <li><a href="http://apr.apache.org/" title="Apache Portable Runtime libraries">APR</a></li> 
-          <li><a href="http://beehive.apache.org/" title="Metadata frameworks for enterprise applications">Beehive</a></li> 
-          <li><a href="http://cayenne.apache.org/" title="User-friendly Java ORM with Tools">Cayenne</a></li> 
-          <li><a href="http://cocoon.apache.org/" title="Web development framework: separation of concerns, component-based">Cocoon</a></li> 
-          <li><a href="http://commons.apache.org/" title="Reusable Java components">Commons</a></li> 
-          <li><a href="http://continuum.apache.org/" title="Continuous Integration and Build Server">Continuum</a></li> 
-          <li><a href="http://db.apache.org/" title="Database access">DB</a></li> 
-          <li><a href="http://directory.apache.org/" title="Apache Directory Server">Directory</a></li> 
-          <li><a href="http://excalibur.apache.org/" title="Embeddable software libraries related to component and service management access">Excalibur</a></li> 
-          <li><a href="http://felix.apache.org/" title="OSGi Framework and components.">Felix</a></li> 
-          <li><a href="http://forrest.apache.org/" title="Aggregated multi-channel documentation, separation of concerns">Forrest</a></li> 
-          <li><a href="http://geronimo.apache.org/" title="Java2, Enterprise Edition (J2EE) container">Geronimo</a></li> 
-          <li><a href="http://gump.apache.org/" title="Continuous integration of open source projects">Gump</a></li> 
-          <li><a href="http://hadoop.apache.org/" title="Distributed computing platform">Hadoop</a></li> 
-          <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
-          <li><a href="http://hivemind.apache.org/" title="A services and configuration microkernel">HiveMind</a></li> 
-          <li><a href="http://hc.apache.org/" title="Java toolset of low level HTTP components">HttpComponents</a></li> 
-          <li><a href="http://ibatis.apache.org/" title="SQL Data Mapper for Java and .NET">iBATIS</a></li> 
-          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
-          <li><a href="http://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
-          <li><a href="http://jakarta.apache.org/" title="Server-side Java">Jakarta</a></li> 
-          <li><a href="http://james.apache.org/" title="Java Apache Mail Enterprise Server">James</a></li> 
-          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
-          <li><a href="http://lenya.apache.org/" title="Content Management System">Lenya</a></li> 
-          <li><a href="http://logging.apache.org/" title="Cross-language logging services">Logging</a></li> 
-          <li><a href="http://lucene.apache.org/" title="Search engine library">Lucene</a></li> 
-          <li><a href="http://maven.apache.org/" title="Java project management and comprehension tools">Maven</a></li> 
-          <li><a href="http://mina.apache.org/" title="Multipurpose Infrastructure for Network Application">Mina</a></li> 
-          <li><a href="http://myfaces.apache.org/" title="JavaServer(tm) Faces implementation and components">MyFaces</a></li> 
-          <li><a href="http://ode.apache.org/" title="Orchestration Director Engine: Business Process Management (BPM), Process Orchestration and Workflow through service compositioni.">ODE</a></li> 
-          <li><a href="http://ofbiz.apache.org/" title="Open for Business: enterprise automation software">OFBiz</a></li> 
-          <li><a href="http://openejb.apache.org/" title="OpenEJB: a modular, configurable, and extendable EJB Container System and Server">OpenEJB</a></li> 
-          <li><a href="http://openjpa.apache.org/" title="OpenJPA: Object Relational Mapping for Java">OpenJPA</a></li> 
-          <li><a href="http://perl.apache.org/" title="Dynamic websites using Perl">Perl</a></li> 
-          <li><a href="http://poi.apache.org/" title="Java API for OLE 2 Compound Documents">POI</a></li> 
-          <li><a href="http://portals.apache.org/" title="Portal technology">Portals</a></li> 
-          <li><a href="http://roller.apache.org/" title="Java blog server">Roller</a></li> 
-          <li><a href="http://santuario.apache.org/" title="XML Security in Java and C++">Santuario</a></li> 
-          <li><a href="http://servicemix.apache.org/" title="Enterprise Service Bus">ServiceMix</a></li> 
-          <li><a href="http://shale.apache.org/" title="Web application framework based on JavaServer(tm) Faces">Shale</a></li> 
-          <li><a href="http://spamassassin.apache.org/" title="Mail filter to identify spam">SpamAssassin</a></li> 
-          <li><a href="http://stdcxx.apache.org/" title="Apache C++ Standard Library">STDCXX</a></li> 
-          <li><a href="http://struts.apache.org/" title="Model 2 framework for building Java web applications">Struts</a></li> 
-          <li><a href="http://synapse.apache.org/" title="Enterprise Service Bus and Mediation Framework">Synapse</a></li> 
-          <li><a href="http://tapestry.apache.org/" title="Component-based Java Web Application Framework">Tapestry</a></li> 
-          <li><a href="http://tcl.apache.org/" title="Dynamic websites using TCL">TCL</a></li> 
-          <li><a href="http://tiles.apache.org/" title="A templating framework for web application user interfaces">Tiles</a></li> 
-          <li><a href="http://tomcat.apache.org/" title="A Java Servlet and JSP Container">Tomcat</a></li> 
-          <li><a href="http://turbine.apache.org/" title="A Java Servlet Web Application Framework and associated component library">
-         Turbine</a></li> 
-          <li><a href="http://velocity.apache.org/" title="A Java Templating Engine">Velocity</a></li> 
-          <li><a href="http://wicket.apache.org/" title="Component-based Java Web Application Framework.">Wicket</a></li> 
-          <li><a href="http://ws.apache.org/">Web Services</a></li> 
-          <li><a href="http://xalan.apache.org/" title="XSLT processors in Java and C++">Xalan</a></li> 
-          <li><a href="http://xerces.apache.org/" title="XML parsers in Java, C++ and Perl">Xerces</a></li> 
-          <li><a href="http://xml.apache.org/" title="XML solutions focused on the web">XML</a></li> 
-          <li><a href="http://xmlbeans.apache.org/" title="XML-Java binding tool">XMLBeans</a></li> 
-          <li><a href="http://xmlgraphics.apache.org/" title="Conversion from XML to graphical output">XML Graphics</a></li> 
-        </menu>
-    </td>
-    <!-- CONTENT -->
-    <td align="left" valign="top" class="content">
-                <h2><img src="/images/redarrow.gif" alt=" "/>
-   Proposed Licenses
-</h2>
+ <body id="sub">
+ 	<div class="navigation">
+		<ul>
+			<li><a href="../../" title="Foundation Home">Home</a></li>
+			<li><a href="../../foundation" title="About the Foundation">Foundation</a></li>
+			<li><a href="http://projects.apache.org" title="Apache Projects">Projects</a></li>
+			<li><a href="http://people.apache.org" title="Apache People">People</a></li>
+			<li><a href="../../foundation/getinvolved.html" title="Get invloved n Apache">Get Involved</a></li>
+			<li><a href="../../foundation/sponsorship.html" title="Support the mission of Apache">Support Apache</a></li>			
+			<li class="dlink"><a href="../../dyn/closer.cgi" title="Download Apache projects">Download</a></li>
+		</ul>
+	</div>
+	<div class="container">
+	<hr class="space col">
+	<div class="block">
+		<div class="column span-24">
+      <div id="header">
+                          <!-- Add 'default' header section here. -->
+                                <h1>Proposed Licenses</h1>
+                         </div>
+      </div>
+	</div>
+	<hr/>
+	<div class="block">
+    		<div class="column span-8 prepend-16 search searchsub">
+    			<form action="http://www.google.com/search" method="get">
+		         <input value="*.apache.org" name="sitesearch" type="hidden"/>
+		         <input size="10" name="q" id="query" type="text"/>
+		         <input name="Search" value="Go" type="submit"/>
+	       </form>
+		</div>
+	</div>
+	<div class="block content">
+		<div class="column span-15 colborder">
+                            
 <div class="section-content">
 <p>
 The Apache Software Foundation is considering a new set of licenses to
@@ -145,9 +94,10 @@
 purpose outside of Apache while providing the ASF and its projects
 the right to distribute and build upon their work within Apache.
 </p>
-<h3>
+
+<h4>
    <a name="distributions">Licensing of Distributions</a>
-</h3>
+</h4>
 <div class="section-content">
 <p>
 For more than two years, we have worked on improvements to the
@@ -224,9 +174,10 @@
 </li>
 </ol>
 </p>
-<h4> 
-   <a name="2.0">Apache License, version 2.0</a> 
-</h4> 
+
+<h5>
+   <a name="2.0">Apache License, version 2.0</a>
+</h5>
 <div class="section-content">
 <p>
 <a href="../LICENSE-2.0.txt">http://www.apache.org/licenses/LICENSE-2.0</a>
@@ -238,9 +189,10 @@
 the new license by March 1, 2004.
 </p>
 </div>
-<h4> 
+
+<h6> 
    <a name="JSR">Apache JSR License, version 2.0 (proposed)</a> 
-</h4> 
+</h6> 
 <div class="section-content">
 <p>
 <a href="JSR-LICENSE-2.0.txt">http://www.apache.org/licenses/proposed/JSR-LICENSE-2.0.txt</a>
@@ -259,9 +211,10 @@
 limiting open source experimentation and innovation.
 </p>
 </div>
-<h4> 
+
+<h6> 
    <a name="TCK">Apache TCK License, version 2.0 (proposed)</a> 
-</h4> 
+</h6> 
 <div class="section-content">
 <p>
 <a href="TCK-LICENSE-2.0.txt">http://www.apache.org/licenses/proposed/TCK-LICENSE-2.0.txt</a>
@@ -276,9 +229,10 @@
 </p>
 </div>
 </div>
-<h3>
+
+<h4>
    <a name="clas">Contributor License Agreements</a>
-</h3>
+</h4>
 <div class="section-content">
 <p>
 Although the 2.0 license contains a built-in contribution agreement,
@@ -303,9 +257,10 @@
 claim they were ignorant of the terms for contributing.
 </p>
 </div>
-<h3>
+
+<h4>
    <a name="grants">Software Grants</a>
-</h3>
+</h4>
 <div class="section-content">
 <p>
 When an individual or corporation decides to donate a body of existing
@@ -318,12 +273,82 @@
 </p>
 </div>
 </div>
-         </td>
-    <!-- RIGHT SIDE NAVIGATION -->
-    <td valign="top" nowrap="nowrap" class="navright">
-           <div class="menuheader"><a 
-href="/foundation/">Foundation</a></div>
-    <menu compact="compact">
+         </div>
+  <div class="column span-8 last">
+    <div class="block">
+      <div class="nav column span-11">
+        <div>
+             <div class="menuheader"><a 
+href="http://projects.apache.org/">Apache Projects</a></div> 
+  <ul>
+          <li><a href="http://httpd.apache.org/" title="Apache Web Server (httpd)">HTTP Server</a></li> 
+          <li><a href="http://activemq.apache.org/" title="Distributed Messaging System">ActiveMQ</a></li> 
+          <li><a href="http://ant.apache.org/" title="Java-based build tool">Ant</a></li> 
+          <li><a href="http://apr.apache.org/" title="Apache Portable Runtime libraries">APR</a></li> 
+          <li><a href="http://beehive.apache.org/" title="Metadata frameworks for enterprise applications">Beehive</a></li> 
+          <li><a href="http://cayenne.apache.org/" title="User-friendly Java ORM with Tools">Cayenne</a></li> 
+          <li><a href="http://cocoon.apache.org/" title="Web development framework: separation of concerns, component-based">Cocoon</a></li> 
+          <li><a href="http://commons.apache.org/" title="Reusable Java components">Commons</a></li> 
+          <li><a href="http://continuum.apache.org/" title="Continuous Integration and Build Server">Continuum</a></li> 
+          <li><a href="http://db.apache.org/" title="Database access">DB</a></li> 
+          <li><a href="http://directory.apache.org/" title="Apache Directory Server">Directory</a></li> 
+          <li><a href="http://excalibur.apache.org/" title="Embeddable software libraries related to component and service management access">Excalibur</a></li> 
+          <li><a href="http://felix.apache.org/" title="OSGi Framework and components.">Felix</a></li> 
+          <li><a href="http://forrest.apache.org/" title="Aggregated multi-channel documentation, separation of concerns">Forrest</a></li> 
+          <li><a href="http://geronimo.apache.org/" title="Java2, Enterprise Edition (J2EE) container">Geronimo</a></li> 
+          <li><a href="http://gump.apache.org/" title="Continuous integration of open source projects">Gump</a></li> 
+          <li><a href="http://hadoop.apache.org/" title="Distributed computing platform">Hadoop</a></li> 
+          <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
+          <li><a href="http://hivemind.apache.org/" title="A services and configuration microkernel">HiveMind</a></li> 
+          <li><a href="http://hc.apache.org/" title="Java toolset of low level HTTP components">HttpComponents</a></li> 
+          <li><a href="http://ibatis.apache.org/" title="SQL Data Mapper for Java and .NET">iBATIS</a></li> 
+          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
+          <li><a href="http://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
+          <li><a href="http://jakarta.apache.org/" title="Server-side Java">Jakarta</a></li> 
+          <li><a href="http://james.apache.org/" title="Java Apache Mail Enterprise Server">James</a></li> 
+          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
+          <li><a href="http://lenya.apache.org/" title="Content Management System">Lenya</a></li> 
+          <li><a href="http://logging.apache.org/" title="Cross-language logging services">Logging</a></li> 
+          <li><a href="http://lucene.apache.org/" title="Search engine library">Lucene</a></li> 
+          <li><a href="http://maven.apache.org/" title="Java project management and comprehension tools">Maven</a></li> 
+          <li><a href="http://mina.apache.org/" title="Multipurpose Infrastructure for Network Application">Mina</a></li> 
+          <li><a href="http://myfaces.apache.org/" title="JavaServer(tm) Faces implementation and components">MyFaces</a></li> 
+          <li><a href="http://ode.apache.org/" title="Orchestration Director Engine: Business Process Management (BPM), Process Orchestration and Workflow through service compositioni.">ODE</a></li> 
+          <li><a href="http://ofbiz.apache.org/" title="Open for Business: enterprise automation software">OFBiz</a></li> 
+          <li><a href="http://openejb.apache.org/" title="OpenEJB: a modular, configurable, and extendable EJB Container System and Server">OpenEJB</a></li> 
+          <li><a href="http://openjpa.apache.org/" title="OpenJPA: Object Relational Mapping for Java">OpenJPA</a></li> 
+          <li><a href="http://perl.apache.org/" title="Dynamic websites using Perl">Perl</a></li> 
+          <li><a href="http://poi.apache.org/" title="Java API for OLE 2 Compound Documents">POI</a></li> 
+          <li><a href="http://portals.apache.org/" title="Portal technology">Portals</a></li> 
+          <li><a href="http://roller.apache.org/" title="Java blog server">Roller</a></li> 
+          <li><a href="http://santuario.apache.org/" title="XML Security in Java and C++">Santuario</a></li> 
+          <li><a href="http://servicemix.apache.org/" title="Enterprise Service Bus">ServiceMix</a></li> 
+          <li><a href="http://shale.apache.org/" title="Web application framework based on JavaServer(tm) Faces">Shale</a></li> 
+          <li><a href="http://spamassassin.apache.org/" title="Mail filter to identify spam">SpamAssassin</a></li> 
+          <li><a href="http://stdcxx.apache.org/" title="Apache C++ Standard Library">STDCXX</a></li> 
+          <li><a href="http://struts.apache.org/" title="Model 2 framework for building Java web applications">Struts</a></li> 
+          <li><a href="http://synapse.apache.org/" title="Enterprise Service Bus and Mediation Framework">Synapse</a></li> 
+          <li><a href="http://tapestry.apache.org/" title="Component-based Java Web Application Framework">Tapestry</a></li> 
+          <li><a href="http://tcl.apache.org/" title="Dynamic websites using TCL">TCL</a></li> 
+          <li><a href="http://tiles.apache.org/" title="A templating framework for web application user interfaces">Tiles</a></li> 
+          <li><a href="http://tomcat.apache.org/" title="A Java Servlet and JSP Container">Tomcat</a></li> 
+          <li><a href="http://turbine.apache.org/" title="A Java Servlet Web Application Framework and associated component library">
+         Turbine</a></li> 
+          <li><a href="http://velocity.apache.org/" title="A Java Templating Engine">Velocity</a></li> 
+          <li><a href="http://wicket.apache.org/" title="Component-based Java Web Application Framework.">Wicket</a></li> 
+          <li><a href="http://ws.apache.org/">Web Services</a></li> 
+          <li><a href="http://xalan.apache.org/" title="XSLT processors in Java and C++">Xalan</a></li> 
+          <li><a href="http://xerces.apache.org/" title="XML parsers in Java, C++ and Perl">Xerces</a></li> 
+          <li><a href="http://xml.apache.org/" title="XML solutions focused on the web">XML</a></li> 
+          <li><a href="http://xmlbeans.apache.org/" title="XML-Java binding tool">XMLBeans</a></li> 
+          <li><a href="http://xmlgraphics.apache.org/" title="Conversion from XML to graphical output">XML Graphics</a></li> 
+      </ul>
+        </div>
+      </div>
+      <div class="nav column prepend-1 span-12 last">
+             <h6><a 
+href="/foundation/">Foundation</a></h6>
+  <ul>
           <li><a href="/foundation/faq.html">FAQ</a></li> 
           <li><a href="/licenses/">Licenses</a></li> 
           <li><a href="/foundation/news.html">News</a></li> 
@@ -332,15 +357,15 @@
           <li><a href="/foundation/contributing.html">Donations</a></li> 
           <li><a href="/foundation/thanks.html">Thanks</a></li> 
           <li><a href="/foundation/contact.html">Contact</a></li> 
-        </menu>
-      <div class="menuheader">Foundation Projects</div>
-    <menu compact="compact">
+      </ul>
+      <h6>Foundation Projects</h6>
+  <ul>
           <li><a href="/foundation/conferences.html" title="Meetings of developers and users">Conferences</a></li> 
           <li><a href="/dev/" title="ASF Infrastructure: Operations and howto documents for PMCs and contributors">Infrastructure</a></li> 
           <li><a href="/jcp/" title="Apache and the Java Community Process">JCP</a></li> 
-        </menu>
-      <div class="menuheader">How it works</div>
-    <menu compact="compact">
+      </ul>
+      <h6>How it works</h6>
+  <ul>
           <li><a href="/foundation/how-it-works.html">Introduction</a></li> 
           <li><a href="/foundation/how-it-works.html#meritocracy">Meritocracy</a></li> 
           <li><a href="/foundation/how-it-works.html#structure">Structure</a></li> 
@@ -351,44 +376,32 @@
           <li><a href="/foundation/how-it-works.html#other">Other entities</a></li> 
           <li><a href="/foundation/glossary.html">Glossary</a></li> 
           <li><a href="/foundation/voting.html">Voting</a></li> 
-        </menu>
-      <div class="menuheader"><a 
-href="/foundation/getinvolved.html">Get Involved</a></div>
-    <menu compact="compact">
+      </ul>
+      <h6><a 
+href="/foundation/getinvolved.html">Get Involved</a></h6>
+  <ul>
           <li><a href="/foundation/mailinglists.html">Mailing Lists</a></li> 
           <li><a href="/dev/version-control.html">Version Control</a></li> 
           <li><a href="/dev/">Developer Info</a></li> 
-        </menu>
-      <div class="menuheader">Download</div>
-    <menu compact="compact">
-          <li><a href="http://www.apache.org/dyn/closer.cgi">from a mirror</a></li> 
-        </menu>
-      <div class="menuheader">Related Sites</div>
-    <menu compact="compact">
+      </ul>
+      <h6>Download</h6>
+  <ul>
+          <li><a href="/dyn/closer.cgi">from a mirror</a></li> 
+      </ul>
+      <h6>Related Sites</h6>
+  <ul>
           <li><a href="http://apachecon.com/" title="Official Apache Conference">ApacheCon</a></li> 
           <li><a href="http://apachebookstore.com/" title="Apache Books">Bookstore</a></li> 
           <li><a href="http://feathercast.org/" title="Apache Podcasts">Feathercast</a></li> 
           <li><a href="http://planetapache.org/" title="Apache Community Blogs">PlanetApache</a></li> 
-        </menu>
-
-     <div class="menuheader">Search apache.org</div>
-     <div class="searchbox">
-       <form action="http://www.google.com/search" method="get">
-         <input value="*.apache.org" name="sitesearch" type="hidden"/>
-         <input size="10" name="q" id="query" type="text"/>
-         <input name="Search" value="Go" type="submit"/>
-       </form>
-     </div>
-
-    </td>     
-   </tr>
-   <!-- FOOTER -->
-   <tr><td colspan="3"><hr noshade="noshade" size="1"/></td></tr>
-   <tr><td colspan="3" class="footer">
-         Copyright &#169; 2007 The Apache Software Foundation<br />
-Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-       </td>
-   </tr>
-  </table>
- </body>
+      </ul>
+      </div>
+    </div>
+  </div>
+	<div class="column span-24 footer">
+		<hr>
+		<p>Copyright &#169; 2008 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+	</div>
+</div>
+</body>
 </html>



---------------------------------------------------------------------
DISCLAIMER: Discussions on this list are informational and educational
only.  Statements made on this list are not privileged, do not
constitute legal advice, and do not necessarily reflect the opinions
and policies of the ASF.  See <http://www.apache.org/licenses/> for
official ASF policies and documents.
---------------------------------------------------------------------
To unsubscribe, e-mail: legal-discuss-unsubscribe@apache.org
For additional commands, e-mail: legal-discuss-help@apache.org