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 [2/3] - in /infrastructure/site/trunk/docs: legal/ licenses/ licenses/exports/ licenses/proposed/

Modified: infrastructure/site/trunk/docs/legal/src-headers.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/legal/src-headers.html?rev=646711&r1=646710&r2=646711&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/legal/src-headers.html (original)
+++ infrastructure/site/trunk/docs/legal/src-headers.html Thu Apr 10 02:27:01 2008
@@ -25,104 +25,54 @@
             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" />
-  <link rel="alternate" title="ASF legal-disuss Mailing List" type="application/atom+xml" href="http://mail-archives.apache.org/mod_mbox/www-legal-discuss/?format=atom" />
+	<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]-->
+
+<link rel="alternate" title="ASF legal-disuss Mailing List" type="application/atom+xml" href="http://mail-archives.apache.org/mod_mbox/www-legal-discuss/?format=atom" />
     <title>ASF Source Header and Copyright Notice Policy - 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=" "/>
-   ASF Source Header and Copyright Notice Policy
-</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 Source Header and Copyright Notice Policy</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">
-<h3>
+
+<h4>
    <a name="purpose">Purpose and Intended Audience</a>
-</h3>
+</h4>
 <div class="section-content">
 <p>This document describes how Apache committers and PMC members should handle source file licensing and copyright notices.  
 It does not apply to developers outside the ASF who are applying the Apache License to their work.  The 
@@ -132,9 +82,10 @@
 product release, nor what are the <a href="/legal/3party.html">acceptable licenses for distribution of third-party components</a>.  
 </p>
 </div>
-<h3>
+
+<h4>
    <a name="overview">Overview</a>
-</h3>
+</h4>
 <div class="section-content">
 <p>Apache products are composed of lots of pieces of code across numerous source files, licensed to the ASF by various authors 
 who maintain ownership of their contributions.  When a PMC goes through the process of selecting, coordinating, and arranging 
@@ -155,17 +106,19 @@
 which will be updated as new questions come up on the <a href="/foundation/mailinglists.html#foundation-legal">legal-discuss</a> mailing list.
 </p>
 </div>
-<h3>
+
+<h4>
    <a name="updates">Notification of Updates to this Page</a>
-</h3>
+</h4>
 <div class="section-content">
 <p>Updates to this page are sent to the <a href="/foundation/mailinglists.html#foundation-legal">legal-discuss</a> mailing list. 
 </p>
 </div>
 </div>
-           <h2><img src="/images/redarrow.gif" alt=" "/>
+                 
+<h4>
    <a name="headers">Source File Headers for Code Developed at the ASF</a>
-</h2>
+</h4>
 <div class="section-content">
 <ol start="0">  
  <li><a name="header-asf" />This section refers only to works submitted directly to the ASF by the copyright owner or owner's agent.</li>
@@ -198,9 +151,10 @@
   </li>
 </ol>
 </div>
-           <h2><img src="/images/redarrow.gif" alt=" "/>
+                 
+<h4>
    <a name="3party">Treatment of Third-Party Works</a>
-</h2>
+</h4>
 <div class="section-content">
 <ol start="0">  
  <li><a name="3party-defn" />The term "third-party work" refers to a work not submitted directly to the ASF by the copyright owner or owner's agent.</li>
@@ -212,9 +166,10 @@
  <li><a name="3party-majormodpmc" />Major modifications/additions to third-party should be dealt with on a case-by-case basis by the PMC.</li>
 </ol>
 </div>
-           <h2><img src="/images/redarrow.gif" alt=" "/>
+                 
+<h4>
    <a name="notice">NOTICE file</a>
-</h2>
+</h4>
 <div class="section-content">
 <ol start="0">  
  <li><a name="notice-required" />Every Apache distribution should include a NOTICE file in the top directory, along with the standard LICENSE file.</li>
@@ -232,44 +187,50 @@
  The NOTICE file may also include copyright notices moved <a href="#header-existingcopyright">from source files submitted to the ASF</a>.</li>
 </ol>
 </div>
-           <h2><img src="/images/redarrow.gif" alt=" "/>
+                 
+<h4>
    <a name="faq">Frequently Asked Questions</a>
-</h2>
+</h4>
 <div class="section-content">
-<h3>
+
+<h5>
    <a name="faq-when">When must Apache projects comply with this policy?</a>
-</h3>
+</h5>
 <div class="section-content">
 <p>All releases created and distributed after November 1, 2006 must comply with this policy.</p>
 </div>
-<h3>
+
+<h5>
    <a name="faq-why">Why is this change required?</a>
-</h3>
+</h5>
 <div class="section-content">
 <p>Since contributors maintain their copyright ownership in the works they submit, it is misleading to place the ASF
 copyright at the top of each source file.  The previous ASF copyright notice represented the ASF's ownership in the collective work
 of the entire distribution, but placing it at the top of each source file was causing a lot of confusion. To avoid this confusion, 
 we are placing all copyright notices in a single file and leaving only the licensing information within each source file.
 </p>
-<h4> 
+
+<h6> 
    <a name="faq-branches">Is it sufficient just to change the headers on files in trunk and active branches?</a> 
-</h4> 
+</h6> 
 <div class="section-content">
 <p>Yes.  Only active branches from which releases are cut need to be updated.</p>
 </div>
-<h4> 
+
+<h6> 
    <a name="faq-moveothercopyright">Should a project move non-ASF copyright notices from Apache source files 
 to the NOTICE file?</a> 
-</h4> 
+</h6> 
 <div class="section-content">
 <p>No.  If the copyright owner is still involved with the project, they should move the notice themselves or permit us to do so.
 If the owner cannot be found, the copyright notice should be left as is, but the new licensing header should be added or
 substituted for any existing Apache license header.</p>
 </div>
 </div>
-<h3>
+
+<h5>
    <a name="faq-update-scripts">What scripts are available to update existing source headers?</a>
-</h3>
+</h5>
 <div class="section-content">
 <p>See <a href="https://svn.apache.org/repos/private/committers/">https://svn.apache.org/repos/private/committers/</a>
 for some examples.  In particular, the following files have been updated to reflect the latest header requirement:
@@ -281,48 +242,54 @@
 <a href="http://mail-archives.apache.org/mod_mbox/www-legal-discuss/200606.mbox/%3c20060605043627.GQ28229@igg.indexgeo.com.au%3e">
 post on legal-discuss</a> on this topic.</p>
 </div>
-<h3>
+
+<h5>
    <a name="faq-examplenotice">Where can I find an example of the NOTICE file that is required to be included
 in every ASF release?</a>
-</h3>
+</h5>
 <div class="section-content">
 <p>See the <a href="/licenses/example-NOTICE.txt">httpd project NOTICE example</a>.</p>
 </div>
-<h3>
+
+<h5>
    <a name="faq-docs">Does this policy apply to documentation files included in a release?</a>
-</h3>
+</h5>
 <div class="section-content">
 <p>Yes.</p>
 </div>
-<h3>
+
+<h5>
    <a name="faq-webpages">Does this policy also apply to content displayed on our web sites?</a>
-</h3>
+</h5>
 <div class="section-content">
 <p>No.  Our web sites do not have an associated NOTICE file.  Instead we may soon be making the terms of such content
 explicit through a "Terms of Use" or "Legal Information" link in the footer of web pages.  At this point, no action is
 required for Apache web sites.</p>
 </div>
-<h3>
+
+<h5>
    <a name="faq-siteindocs">What if my project includes its web site within a product distribution?</a>
-</h3>
+</h5>
 <div class="section-content">
 <p>With <a href="#faq-exceptions">few exceptions</a>, all human-readable Apache-developed files that are included within a distribution must
 include the <a href="#header-text">header text</a>.  Documentation, including web site documentation distributed with the 
 release, may include the header text within some form of metadata (such as HTML comments) or as a header or footer
 appearing in the visible documentation.</p>
 </div>
-<h3>
+
+<h5>
    <a name="faq-exceptions">What files in an Apache release do not require a license header?</a>
-</h3>
+</h5>
 <div class="section-content">
 <p>A file without any degree of creativity in either its literal elements or its structure is not protected by
 copyright law; therefore, such a file does not require a license header.  If in doubt about the extent of the
 file's creativity, add the license header to the file.
 </p>
 </div>
-<h3>
+
+<h5>
    <a name="faq-binaries">Does the policy apply to binary/object files, such as executables or JAR files?</a>
-</h3>
+</h5>
 <div class="section-content">
 <p>
 Yes.  Even if there are no source files within the release, the LICENSE file and NOTICE file are still both required within 
@@ -330,18 +297,20 @@
 other file format used for distributions.  For example, Windows .exe files must not be used as a unit of distribution 
 unless they are installers and include the LICENSE and NOTICE files in their installation.</p>
 </div>
-<h3>
+
+<h5>
    <a name="faq-3partybinaries">Does this policy apply to third-party binary/object files included within an ASF release?</a>
-</h3>
+</h5>
 <div class="section-content">
 <p>
 Yes.  See the policy's <a href="#3party">third-party works</a> section, particularly the 
 <a href="#3party-addlicense">requirement</a> to ensure a license exists for each third-party work.
 </p>
 </div>
-<h3>
+
+<h5>
    <a name="faq-media">Do images or other media require a copyright line in the NOTICE file?</a>
-</h3>
+</h5>
 <div class="section-content">
 <p>If the media was contributed directly to an ASF project, the contributor has the option to insert their copyright notice 
 in the  NOTICE file, as is <a href="#header-existingcopyright">described for source files</a>.  If the media comes from a 
@@ -349,29 +318,101 @@
 the media should be copied into the NOTICE file. 
 </p>
 </div>
-<h3>
+
+<h5>
    <a name="faq-whyheader">Why is a licensing header necessary?</a>
-</h3>
+</h5>
 <div class="section-content">
 <p>License headers allow someone examining the file to know the terms for the work, even when it is distributed without 
 the rest of the distribution.  Without a licensing notice, it must be assumed that the author has reserved all rights, 
 including the right to copy, modify, and redistribute.
 </p>
 </div>
-<h3>
+
+<h5>
    <a name="faq-nonasf">Does this policy apply to projects outside the ASF that use the Apache License?</a>
-</h3>
+</h5>
 <div class="section-content">
 <p>No.  This is strictly an ASF policy.  Other projects using the Apache License should still refer to the 
 <a href="/licenses/LICENSE-2.0.html#apply">license's appendix</a> for guidance on applying a header to their source files.</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> 
@@ -380,15 +421,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> 
@@ -399,44 +440,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/GPL-compatibility.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/licenses/GPL-compatibility.html?rev=646711&r1=646710&r2=646711&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/licenses/GPL-compatibility.html (original)
+++ infrastructure/site/trunk/docs/licenses/GPL-compatibility.html Thu Apr 10 02:27:01 2008
@@ -25,32 +25,98 @@
             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>Apache License v2.0 and GPL Compatibility - 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 
+ <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>Apache License v2.0 and GPL Compatibility</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 <a href="http://www.fsf.org/">Free Software Foundation</a>
+<a href="http://www.fsf.org/licensing/licenses/#apache2">considers</a>
+the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
+to be a <a href="http://www.gnu.org/philosophy/free-sw.html">free software</a>
+license, <a href="http://www.fsf.org/licensing/licenses/compat.html">compatible</a> with version 3 of the <a href="http://www.fsf.org/licensing/licenses/gpl.html">GPL</a>.
+</p>
+<p>Despite our best efforts, the FSF has never considered the Apache
+License to be compatible with GPL version 2, citing the patent
+termination and indemnification provisions as restrictions not present
+in the older GPL license.  The Apache Software Foundation believes
+that you should always try to obey the constraints expressed by the
+copyright holder when redistributing their work.</p>
+</div>
+                 
+<h4>
+   No, we don't have any patents
+</h4>
+<div class="section-content">
+<p>
+The Apache Software Foundation is a nonprofit organization
+that is dedicated to open source software development.
+We never knowingly incorporate patented technology in our own products
+unless such technology has been offered free for everyone.
+</p>
+<p>
+Please note that this discussion only benefits third parties that
+produce GPL-covered products.  The Apache Software Foundation does not
+allow its own projects to distribute software under licenses more
+restrictive than the Apache License, and the Free Software Foundation
+does not distribute software under the Apache License.
+</p>
+<p>
+The ASF will not dual-license our software because such licenses
+make it impossible to determine the conditions under which we have
+agreed to collaborate on a collective product, and are thus contrary to
+the Apache spirit of open, collaborative development among individuals,
+industry, and nonprofit organizations.
+</p>
+</div>
+         </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> 
-    <menu compact="compact">
+  <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> 
@@ -112,59 +178,13 @@
           <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=" "/>
-   Apache License v2.0 and GPL Compatibility
-</h2>
-<div class="section-content">
-<p>
-The <a href="http://www.fsf.org/">Free Software Foundation</a>
-<a href="http://www.fsf.org/licensing/licenses/#apache2">considers</a>
-the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
-to be a <a href="http://www.gnu.org/philosophy/free-sw.html">free software</a>
-license, <a href="http://www.fsf.org/licensing/licenses/compat.html">compatible</a> with version 3 of the <a href="http://www.fsf.org/licensing/licenses/gpl.html">GPL</a>.
-</p>
-<p>Despite our best efforts, the FSF has never considered the Apache
-License to be compatible with GPL version 2, citing the patent
-termination and indemnification provisions as restrictions not present
-in the older GPL license.  The Apache Software Foundation believes
-that you should always try to obey the constraints expressed by the
-copyright holder when redistributing their work.</p>
-</div>
-           <h2><img src="/images/redarrow.gif" alt=" "/>
-   No, we don't have any patents
-</h2>
-<div class="section-content">
-<p>
-The Apache Software Foundation is a nonprofit organization
-that is dedicated to open source software development.
-We never knowingly incorporate patented technology in our own products
-unless such technology has been offered free for everyone.
-</p>
-<p>
-Please note that this discussion only benefits third parties that
-produce GPL-covered products.  The Apache Software Foundation does not
-allow its own projects to distribute software under licenses more
-restrictive than the Apache License, and the Free Software Foundation
-does not distribute software under the Apache License.
-</p>
-<p>
-The ASF will not dual-license our software because such licenses
-make it impossible to determine the conditions under which we have
-agreed to collaborate on a collective product, and are thus contrary to
-the Apache spirit of open, collaborative development among individuals,
-industry, and nonprofit organizations.
-</p>
-</div>
-         </td>
-    <!-- RIGHT SIDE NAVIGATION -->
-    <td valign="top" nowrap="nowrap" class="navright">
-           <div class="menuheader"><a 
-href="/foundation/">Foundation</a></div>
-    <menu compact="compact">
+      </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> 
@@ -173,15 +193,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> 
@@ -192,44 +212,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/LICENSE-2.0.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/licenses/LICENSE-2.0.html?rev=646711&r1=646710&r2=646711&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/licenses/LICENSE-2.0.html (original)
+++ infrastructure/site/trunk/docs/licenses/LICENSE-2.0.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>Apache License, Version 2.0 - 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=" "/>
-   Apache License, Version 2.0
-</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>Apache License, Version 2.0</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 align="center">
 Apache License<br />
@@ -321,9 +270,10 @@
 END OF TERMS AND CONDITIONS
 </p>
 </div>
-           <h2><img src="/images/redarrow.gif" alt=" "/>
+                 
+<h4>
    <a name="apply">APPENDIX: How to apply the Apache License to your work</a>
-</h2>
+</h4>
 <div class="section-content">
 <p>
       To apply the Apache License to your work, attach the following
@@ -352,12 +302,82 @@
 </code>
 </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> 
@@ -366,15 +386,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> 
@@ -385,44 +405,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