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

Author: crossley
Date: Mon Sep 14 05:03:18 2009
New Revision: 814474

URL: http://svn.apache.org/viewvc?rev=814474&view=rev
Log:
Added sections for licenses similar to "Apache Software License 1.1".
Ensured that each has attribution in NOTICE.txt file.
Consistent section headings.

Modified:
    forrest/trunk/LICENSE.txt

Modified: forrest/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/forrest/trunk/LICENSE.txt?rev=814474&r1=814473&r2=814474&view=diff
==============================================================================
--- forrest/trunk/LICENSE.txt (original)
+++ forrest/trunk/LICENSE.txt Mon Sep 14 05:03:18 2009
@@ -216,8 +216,7 @@
 For the moment the following is a manual listing.
 
 ----------------
-The following supporting products are licensed: Apache License 2.0
-The license text is as shown above.
+These supporting products are licensed: Apache License, Version 2.0
 license: lib/core/avalon-logkit-2.1.jar.license.txt
 license: lib/core/batik-all-1.6.jar.license.txt
 license: lib/core/cocoon.license.txt
@@ -263,7 +262,7 @@
 license: whiteboard/plugins/org.apache.forrest.plugin.output.Chart/lib/log4j-1.2.8.jar.license.txt
 
 ----------------
-The following supporting products are licensed: Apache Software License 1.1
+These supporting products are licensed: Apache Software License, Version 1.1
 license: lib/core/avalon-framework-api-4.3.jar.license.txt
 license: lib/core/avalon-framework-impl-4.3.jar.license.txt
 license: lib/core/chaperon-20040205.jar.license.txt
@@ -285,31 +284,42 @@
 license: whiteboard/plugins/org.apache.forrest.plugin.output.Chart/lib/logkit-1.2.2.jar.license.txt
 
 ----------------
-The following supporting products are licensed: Academic Free License 1.2
+These supporting products are licensed: derived Apache Software License, Version 1.1
+license: whiteboard/plugins/rtf-output/WEB-INF/lib/jfor-0.7.2rc1.jar.license.txt
+
+----------------
+These supporting products are licensed: CyberNeko Software License, Version 1.0
+(which is similar to Apache Software License 1.1)
+license: lib/core/nekopull-0.2.4.jar.license.txt
+license: plugins/org.apache.forrest.plugin.input.dtdx/lib/nekodtd-0.1.11.jar.license.txt
+
+----------------
+These supporting products are licensed: OpenSymphony Software License, Version 1.0
+(which is similar to Apache Software License 1.1)
+license: tools/forrestbot/webapp/lib/oscore-2.2.2.jar.license.txt
+license: tools/forrestbot/webapp/lib/osuser-1.0-dev.jar.license.txt
+license: tools/forrestbot/webapp/lib/propertyset-1.2.jar.license.txt
+
+----------------
+These supporting products are licensed: Academic Free License 1.2
 license: tools/ant/lib/jsvn-0.9-dev.jar.license.txt
 license: tools/forrestbot/lib/jsvn-0.9-dev.jar.license.txt
 
 ----------------
 Others not yet classified ...
 
-? BSD +Notice lib/core/castor-0.9.6-xml.jar.license.txt
+? BSD 5c +Notice lib/core/castor-0.9.6-xml.jar.license.txt
 ? lib/core/concurrent-1.3.4.jar.license.txt
 AL-20-other lib/core/ehcache-1.2.jar.license.txt
 ? lib/core/fop-0.20.5.jar.license.txt
-BSD lib/core/jing-20030619.jar.license.txt
+BSD 3c lib/core/jing-20030619.jar.license.txt
 ? W3C lib/core/jtidy-04aug2000r7-dev.jar.license.txt
-? BSD+ +Notice lib/core/nekopull-0.2.4.jar.license.txt
 MPL-11 (see a.o/legal/resolved.html#category-b) lib/core/rhino-1.6R2.jar.license.txt
 ? W3C lib/core/w3c-dtd-license.txt
 ? W3C main/webapp/resources/schema/w3c-dtd/w3c-license.txt
-? BSD+ +Notice plugins/org.apache.forrest.plugin.input.dtdx/lib/nekodtd-0.1.11.jar.license.txt
-BSD tools/ant/lib/jsch-0.1.28.jar.license.txt
-OpenSymphony-Software-License-1.1 ? BSD+ +Notice tools/forrestbot/webapp/lib/oscore-2.2.2.jar.license.txt
-OpenSymphony-Software-License-1.1 ? BSD+ +Notice tools/forrestbot/webapp/lib/osuser-1.0-dev.jar.license.txt
-OpenSymphony-Software-License-1.1 ? BSD+ +Notice tools/forrestbot/webapp/lib/propertyset-1.2.jar.license.txt
-? BSD+ +Notice whiteboard/plugins/org.apache.forrest.plugin.output.Chart/lib/jaxen.license.txt
-? BSD+ +Notice whiteboard/plugins/org.apache.forrest.plugin.output.Chart/lib/saxpath.license.txt
-htmlArea License (BSD) whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/tools/htmlArea-license.txt
-? BSD+ +Notice whiteboard/plugins/rtf-output/WEB-INF/lib/jfor-0.7.2rc1.jar.license.txt
+BSD 3c tools/ant/lib/jsch-0.1.28.jar.license.txt
+BSD 5c +Notice whiteboard/plugins/org.apache.forrest.plugin.output.Chart/lib/jaxen.license.txt
+BSD 5c +Notice whiteboard/plugins/org.apache.forrest.plugin.output.Chart/lib/saxpath.license.txt
+htmlArea License - BSD 3c whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/tools/htmlArea-license.txt
 
 ------------------------------------------------------------------------