svn commit: r960459 - /forrest/trunk/LICENSE.txt

Author: crossley
Date: Mon Jul  5 06:49:43 2010
New Revision: 960459

URL: http://svn.apache.org/viewvc?rev=960459&view=rev
Log:
Some licenses were classified as AL-11 but are AL-20.
Issue: FOR-855 FOR-857

Modified:
    forrest/trunk/LICENSE.txt

Modified: forrest/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/forrest/trunk/LICENSE.txt?rev=960459&r1=960458&r2=960459&view=diff
==============================================================================
--- forrest/trunk/LICENSE.txt (original)
+++ forrest/trunk/LICENSE.txt Mon Jul  5 06:49:43 2010
@@ -213,6 +213,7 @@ license: lib/core/avalon-logkit-2.1.jar.
 license: lib/core/batik-all-1.6.jar.license.txt
 license: lib/core/cocoon.license.txt
 license: lib/core/commons-collections-3.2.jar.license.txt
+license: lib/core/commons-httpclient-2.0.2.jar.license.txt
 license: lib/core/commons-io.LICENSE.txt
 license: lib/core/commons-jci-r306555.jar.license.txt
 license: lib/core/commons-jexl-1.0.jar.license.txt
@@ -221,6 +222,7 @@ license: lib/core/commons-lang-2.4.jar.l
 license: lib/core/commons-logging.LICENSE.txt
 license: lib/core/excalibur-component-2.1.jar.license.txt
 license: lib/core/excalibur-i18n-1.1.jar.license.txt
+license: lib/core/excalibur-instrument-api-2.1.jar.license.txt
 license: lib/core/excalibur-logger-2.1.jar.license.txt
 license: lib/core/excalibur-pool-api-2.1.jar.license.txt
 license: lib/core/excalibur-pool-impl-2.1.jar.license.txt
@@ -246,6 +248,7 @@ license: tools/eclipse/plugins/org.apach
 license: tools/eclipse/plugins/org.apache.forrest.eclipse.servletEngine/lib/jasper-compiler.LICENSE.txt
 license: tools/eclipse/plugins/org.apache.forrest.eclipse.servletEngine/lib/jasper-runtime.LICENSE.txt
 license: tools/eclipse/plugins/org.apache.forrest.eclipse.servletEngine/lib/log4j-1.2.9.jar.license.txt
+license: tools/eclipse/plugins/org.apache.forrest.eclipse.servletEngine/lib/org.mortbay.jetty.LICENSE.txt
 license: tools/eclipse/plugins/org.apache.forrest.repository.daisy/lib/commons-httpclient-2.0-rc2.jar.license.txt
 license: tools/eclipse/plugins/org.apache.forrest.repository.daisy/lib/commons-logging-1.0.3.jar.license.txt
 license: tools/eclipse/plugins/org.apache.forrest.repository.daisy/lib/concurrent-1.3.2.jar.license.txt
@@ -264,6 +267,8 @@ license: whiteboard/plugins/org.apache.f
 license: whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/jaxen-LICENSE.txt
 license: whiteboard/plugins/org.apache.forrest.plugin.output.Chart/lib/log4j-1.2.8.jar.license.txt
 
+See the license text displayed above for Apache License, Version 2.0
+
 ----------------
 These supporting products are licensed: based on Apache License, Version 2.0
 license: lib/core/ehcache-1.2.3.jar.license.txt
@@ -274,8 +279,6 @@ license: lib/core/avalon-framework-api-4
 license: lib/core/avalon-framework-impl-4.3.jar.license.txt
 license: lib/core/chaperon-20040205.jar.license.txt
 license: lib/core/commons-cli-1.0.jar.license.txt
-license: lib/core/commons-httpclient-2.0.2.jar.license.txt
-license: lib/core/excalibur-instrument-api-2.1.jar.license.txt
 license: lib/core/excalibur-io-1.1.jar.license.txt
 license: lib/core/excalibur-naming-1.0.jar.license.txt
 license: lib/core/logkit-1.2.2.jar.license.txt
@@ -284,7 +287,6 @@ license: plugins/org.apache.forrest.plug
 license: tools/eclipse/plugins/org.apache.forrest/lib/log4j_LICENSE.txt
 license: tools/eclipse/plugins/org.apache.forrest.eclipse.servletEngine/lib/commons-cli-1.0.jar.license.txt
 license: tools/eclipse/plugins/org.apache.forrest.eclipse.servletEngine/lib/javax.servlet.LICENSE.txt
-license: tools/eclipse/plugins/org.apache.forrest.eclipse.servletEngine/lib/org.mortbay.jetty.LICENSE.txt
 license: tools/eclipse/plugins/org.apache.forrest.eclipse.servletEngine/lib/servlet-2.3.jar.license.txt
 license: tools/eclipse/plugins/org.apache.forrest.eclipse.servletEngine/lib/xercesImpl-2.6.2.jar.license.txt
 license: tools/eclipse/plugins/org.apache.forrest.eclipse.servletEngine/lib/xml-apis.jar.license.txt