From 90d6ec636de8180fec51dc1577aa88d5c37f36e9 Mon Sep 17 00:00:00 2001
From: Marko Gronroos <magi@vaadin.com>
Date: Tue, 29 Jan 2013 13:07:17 +0200
Subject: [PATCH] Split the license dependencies into runtime and development.
 #10858

Change-Id: I40f69b18f09252f2cf79ce7e22c43702f2787dd3
---
 WebContent/license.html | 173 ++++++++++++++++++++++++++++------------
 1 file changed, 120 insertions(+), 53 deletions(-)

diff --git a/WebContent/license.html b/WebContent/license.html
index 272d153f89..30d53d11f6 100644
--- a/WebContent/license.html
+++ b/WebContent/license.html
@@ -44,11 +44,92 @@
 
       <h3>Included Third-Party Software and Licenses</h3>
 
+      <h4>Vaadin Production Dependencies</h4>
+
+      <p>The following dependencies are used by the Vaadin runtime
+         libraries when running the application in the production
+	 mode, and some also by the development libraries:</p>
+
+      <table border="1" cellspacing="1">
+        <thead style="background: #ccc;">
+          <tr><th>Package</th><th>License</th></tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td>Apache Commons<br/>
+                CLI<br/> <!-- Used by theme-compiler -->
+                Discovery<br/>
+                IO<br/>
+                Jexl<br/>
+                Lang<br/>
+                Logging<br/> <!-- Used by theme-compiler -->
+                Math<br/>
+            </td>
+            <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td>
+          </tr>
+ 
+          <!-- Used by GWT and vaadin-server -->
+          <tr>
+            <td>Bean Validation (JSR-303) API</td>
+            <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td>
+          </tr>
+
+          <tr>
+            <td>Google AppEngine API*</td>
+            <td><a href="https://developers.google.com/appengine/terms">Google App Engine Terms of Service</a></td>
+          </tr>
+
+          <tr>
+            <td>Google Collections</td>
+            <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td>
+          </tr>
+
+          <!-- In vaadin-shared, vaadin-client-compiler, etc. -->
+          <tr>
+            <td>Google GWT</td>
+            <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td>
+          </tr>
+
+          <!-- In vaadin-shared-deps -->
+          <tr>
+            <td>Guava</td>
+            <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td>
+          </tr>
+
+          <!-- In vaadin-shared-deps -->
+          <tr>
+            <td>JSON</td>
+            <td><a href="http://www.json.org/license.html">The JSON License</a></td>
+          </tr>
+
+          <!-- Used by vaadin-server -->
+          <tr>
+            <td>JSoup</td>
+            <td><a href="http://jsoup.org/license">The MIT License</a></td>
+          </tr>
+
+          <tr>
+            <td>streamhtmlparser</td>
+            <td><a href="http://opensource.org/licenses/BSD-3-Clause">New BSD License</a></td>
+          </tr>
+
+        </tbody>
+      </table>
+      
+      <p>* Not required by Vaadin, only used if provided by the user.</p>
+
+      <h4>Vaadin Development Dependencies</h4>
+
+      <p>The following dependencies are only used by the Vaadin
+         development libraries. Some are also used when running a
+	 Vaadin application in the development mode:</p>
+
       <table border="1" cellspacing="1">
         <thead style="background: #ccc;">
           <tr><th>Package</th><th>License</th></tr>
         </thead>
         <tbody>
+          <!-- Required by Smartsprites -->
           <tr>
             <td>Apache Ant<br/>
                 Ant Launcher</td>
@@ -58,195 +139,180 @@
           <tr>
             <td>Apache Commons<br/>
                 BCEL<br/>
-                Beanutils<br/>
-                CLI<br/>
+                <!-- Beanutils<br/> --> <!-- Does not appear to be used anywhere -->
                 Codec<br/>
                 Collections<br/>
                 Digester 3<br/>
-                Discovery<br/>
                 EL<br/>
-                IO<br/>
-                Jexl<br/>
-                Lang<br/>
-                Logging<br/>
-                Math<br/>
                 Modeler</td>
             <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td>
           </tr>
 
+          <!-- Is this used anywhere? -->
           <tr>
             <td>Apache HttpComponents Core</td>
             <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td>
           </tr>
 
+          <!-- In vaadin-client-compiler -->
           <tr>
             <td>Apache Jakarta Regexp</td>
             <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td>
           </tr>
 
+          <!-- The Mime4j does not appear to be used anywhere. Remove if necessary.
           <tr>
             <td>Apache James Server<br/>
                 Apache James Mime4j</td>
             <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td>
           </tr>
+          -->
 
+          <!-- In vaadin-client-compiler -->
           <tr>
             <td>Apache Tapestry</td>
             <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td>
           </tr>
 
           <tr>
-            <td>Apache Tomcat<br/>Catalina<br/>Coyote<br/>Jasper<br/>JK<br/>Naming</td>
+            <td>Apache Tomcat<br/>
+                Catalina<br/> <!-- Is this used anywhere? -->
+                Coyote<br/> <!-- Is this used anywhere? -->
+                Jasper<br/> <!-- In vaadin-client-compiler -->
+                JK<br/> <!-- Is this used anywhere? -->
+                Naming <!-- In vaadin-client-compiler -->
+            </td>
             <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td>
           </tr>
 
+          <!-- In vaadin-client-compiler -->
           <tr>
             <td>Apache Xalan</td>
             <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td>
           </tr>
 
+          <!-- In vaadin-client-compiler -->
           <tr>
             <td>Apache Xerces</td>
             <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td>
           </tr>
 
+          <!-- Used by GWT and smartsprites -->
           <tr>
             <td>Args4j</td>
             <td><a href="https://github.com/kohsuke/args4j/blob/master/args4j/LICENSE.txt">The MIT License (MIT)</a></td>
           </tr>
 
-          <tr>
-            <td>Bean Validation (JSR-303) API</td>
-            <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td>
-          </tr>
-
+          <!-- Used by theme-compiler -->
           <tr>
             <td>CSS Parser</td>
             <td><a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html">GNU Lesser General Public License, version 2.0</a></td>
           </tr>
 
+          <!-- In vaadin-client-compiler -->
           <tr>
             <td>CUP</td>
             <td><a href="http://www.cs.princeton.edu/~appel/modern/java/CUP/#LICENSE">CUP Open Source License</a></td>
           </tr>
 
+          <!-- In vaadin-client-compiler -->
           <tr>
             <td>CyberNeko HTML Parser</td>
             <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td>
           </tr>
 
+          <!-- In vaadin-client-compiler -->
           <tr>
-            <td>Eclipse
-      JDT</td>
+            <td>Eclipse JDT</td>
             <td><a href="http://eclipse.org/org/documents/epl-v10.php">Eclipse Public License - v 1.0</a></td>
           </tr>
 
+          <!-- In vaadin-shared-deps but only invoked in development mode -->
           <tr>
             <td>Flute</td>
             <td><a href="http://www.w3.org/Consortium/Legal/copyright-software-19980720">W3C Software Copyright Notice and License</a></td>
           </tr>
 
-          <tr>
-            <td>Google AppEngine API</td>
-            <td><a href="https://developers.google.com/appengine/terms">Google App Engine Terms of Service</a></td>
-          </tr>
-
+          <!-- Is this used anywhere? -->
           <tr>
             <td>Google Closure Compiler</td>
             <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td>
           </tr>
 
-          <tr>
-            <td>Google Collections</td>
-            <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td>
-          </tr>
-
+          <!-- In vaadin-client-compiler -->
           <tr>
             <td>Google Protocol Buffers</td>
             <td><a href="http://protobuf.googlecode.com/svn/trunk/COPYING.txt">BSD License</a></td>
           </tr>
 
-          <tr>
-            <td>Google GWT</td>
-            <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td>
-          </tr>
-
-          <tr>
-            <td>Guava</td>
-            <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td>
-          </tr>
-
+          <!-- In vaadin-client-compiler -->
           <tr>
             <td>HtmlUnit</td>
             <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td>
           </tr>
 
+          <!-- In vaadin-client-compiler -->
           <tr>
             <td>ICU</td>
             <td><a href="http://source.icu-project.org/repos/icu/icu/trunk/license.html">ICU License</a></td>
           </tr>
 
+          <!-- In vaadin-client-compiler -->
           <tr>
             <td>Jetty</td>
             <td><a href="http://www.google.com/url?q=http%3A%2F%2Fwww.eclipse.org%2Fjetty%2Flicenses.php&amp;sa=D&amp;sntz=1&amp;usg=AFQjCNEwpnb4RRBBG6c4gF-zsuA9eaNJuA">Apache License, Version 2.0 OR Eclipse 1.0 (see exceptions)</a></td>
           </tr>
 
+          <!-- Is this used anywhere? -->
           <tr>
             <td>Jsilver</td>
             <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td>
           </tr>
 
-          <tr>
-            <td>JSON</td>
-            <td><a href="http://www.json.org/license.html">The JSON License</a></td>
-          </tr>
-
-          <tr>
-            <td>JSoup</td>
-            <td><a href="http://jsoup.org/license">The MIT License</a></td>
-          </tr>
-
-          <tr>
-            <td>JUnit</td>
-            <td><a href="http://www.junit.org/license">Common Public License (CPL) - v 1.0</a></td>
-          </tr>
-
           <!-- Includes portal-service -->
           <tr>
-            <td>Liferay Service Interfaces</td>
+            <td>Liferay Service Interfaces*</td>
             <td><a href="http://www.gnu.org/licenses/lgpl.html">GNU Lesser General Public License 2.1 or newer</a></td>
           </tr>
 
+          <!-- In vaadin-client-compiler -->
           <tr>
             <td>Mozilla Rhino</td>
             <td><a href="http://www.mozilla.org/MPL/1.1/">Mozilla Public License v. 1.1</a></td>
           </tr>
 
+          <!-- Is this used anywhere? -->
           <tr>
             <td>MX4J</td>
             <td><a href="http://mx4j.sourceforge.net/docs/ch01s06.html">The MX4J License</a></td>
           </tr>
 
+          <!-- Used by theme-compiler -->
           <tr>
             <td>SAC: The Simple API for CSS</td>
             <td><a href="http://www.w3.org/Consortium/Legal/copyright-software-19980720">W3C Software Copyright Notice and License</a></td>
           </tr>
 
+          <!-- Used by theme-compiler -->
           <tr>
             <td>SmartSprites</td>
             <td><a href="https://github.com/carrotsearch/smartsprites/blob/master/smartsprites.LICENSE">BSD License</a></td>
           </tr>
 
+          <!-- Explicitly excluded from vaadin-client-compiler
           <tr>
             <td>Swingworker</td>
             <td><a href="http://www.gnu.org/licenses/lgpl-2.1.html">GNU Lesser General Public License 2.1</a></td>
           </tr>
+          -->
         </tbody>
       </table>
 
+      <p>* Not required by Vaadin, only used if provided by the user.</p>
+
 		<h1>Copyright and trademarks</h1>
 		<p>
-			"Vaadin" and "}>" are registered trademarks of <a
+			"Vaadin" and "}&gt;" are registered trademarks of <a
 				href="http://vaadin.com/company">Vaadin Ltd</a>. You may not market
 			your products or services using the Vaadin -brand name, use Vaadin
 			logos or trademarks without written permission from <a
@@ -261,6 +327,7 @@
 		<h1>
 			<a name="apachelicense">Apache License</a>
 		</h1>
+
 		<h2>Terms and Conditions for Use, Reproduction and Distribution</h2>
 		<pre>
 Apache License
-- 
2.39.5