diff options
| -rw-r--r-- | WebContent/license.html | 250 | ||||
| -rw-r--r-- | WebContent/release-notes.html | 230 |
2 files changed, 228 insertions, 252 deletions
diff --git a/WebContent/license.html b/WebContent/license.html index 10d760a782..272d153f89 100644 --- a/WebContent/license.html +++ b/WebContent/license.html @@ -18,31 +18,231 @@ <div id="content"> - <h1>Licensing</h1> - - <p> - <strong><i>Vaadin Framework</i> is intended to be freely - used and extended by anyone without any fees</strong>. In order to guarantee - these freedoms, <i>Vaadin Framework</i> is licensed under the Apache - License, Version 2.0. - </p> - <p>Vaadin Framework is built using Google Web Toolkit, which is - also licensed under the Apache License, v 2.0. Development using - Vaadin Framework or use of applications created with Vaadin Framework - do not require Google Web Toolkit. Vaadin Framework includes a - precompiled "widget set", which uses only Apache 2 licensed code from - Google Web Toolkit.</p> - - <p> - Extending Vaadin Framework requires use of Google Web Toolkit. For - details on Google Web Toolkit licensing, see <a - href="http://code.google.com/webtoolkit/terms.html">http://code.google.com/webtoolkit/terms.html</a>. - </p> - <p> - If you have any questions on licensing terms, please contact us - through <a href="http://vaadin.com/contact">the vaadin.com - web-site</a>. - </p> + <h1>Licensing</h1> + + <p> + <strong><i>Vaadin Framework</i> is intended to be freely used and extended by + anyone without any fees</strong>. In order to guarantee these freedoms, <i>Vaadin + Framework</i> is licensed under the Apache License, Version 2.0, as given below. + </p> + + <p> + Third-party software included in this distribution is provided under the same + license or compatible licenses, as listed in the section below. + </p> + + <p> + The license of the Vaadin Framework is for this product only and may not apply to + all Vaadin add-ons, such as those available from Vaadin Directory, or other Vaadin + products, which may have different licenses. + </p> + + <p> + If you have any questions on licensing terms, please contact us through <a + href="http://vaadin.com/contact">the vaadin.com web-site</a>. + </p> + + <h3>Included Third-Party Software and Licenses</h3> + + <table border="1" cellspacing="1"> + <thead style="background: #ccc;"> + <tr><th>Package</th><th>License</th></tr> + </thead> + <tbody> + <tr> + <td>Apache Ant<br/> + Ant Launcher</td> + <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td> + </tr> + + <tr> + <td>Apache Commons<br/> + BCEL<br/> + Beanutils<br/> + CLI<br/> + 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> + + <tr> + <td>Apache HttpComponents Core</td> + <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td> + </tr> + + <tr> + <td>Apache Jakarta Regexp</td> + <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td> + </tr> + + <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> + + <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><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td> + </tr> + + <tr> + <td>Apache Xalan</td> + <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td> + </tr> + + <tr> + <td>Apache Xerces</td> + <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td> + </tr> + + <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> + + <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> + + <tr> + <td>CUP</td> + <td><a href="http://www.cs.princeton.edu/~appel/modern/java/CUP/#LICENSE">CUP Open Source License</a></td> + </tr> + + <tr> + <td>CyberNeko HTML Parser</td> + <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td> + </tr> + + <tr> + <td>Eclipse + JDT</td> + <td><a href="http://eclipse.org/org/documents/epl-v10.php">Eclipse Public License - v 1.0</a></td> + </tr> + + <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> + + <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> + + <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> + + <tr> + <td>HtmlUnit</td> + <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td> + </tr> + + <tr> + <td>ICU</td> + <td><a href="http://source.icu-project.org/repos/icu/icu/trunk/license.html">ICU License</a></td> + </tr> + + <tr> + <td>Jetty</td> + <td><a href="http://www.google.com/url?q=http%3A%2F%2Fwww.eclipse.org%2Fjetty%2Flicenses.php&sa=D&sntz=1&usg=AFQjCNEwpnb4RRBBG6c4gF-zsuA9eaNJuA">Apache License, Version 2.0 OR Eclipse 1.0 (see exceptions)</a></td> + </tr> + + <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><a href="http://www.gnu.org/licenses/lgpl.html">GNU Lesser General Public License 2.1 or newer</a></td> + </tr> + + <tr> + <td>Mozilla Rhino</td> + <td><a href="http://www.mozilla.org/MPL/1.1/">Mozilla Public License v. 1.1</a></td> + </tr> + + <tr> + <td>MX4J</td> + <td><a href="http://mx4j.sourceforge.net/docs/ch01s06.html">The MX4J License</a></td> + </tr> + + <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> + + <tr> + <td>SmartSprites</td> + <td><a href="https://github.com/carrotsearch/smartsprites/blob/master/smartsprites.LICENSE">BSD License</a></td> + </tr> + + <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> <h1>Copyright and trademarks</h1> <p> diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html index ec2d2548fe..b0522b3727 100644 --- a/WebContent/release-notes.html +++ b/WebContent/release-notes.html @@ -45,16 +45,15 @@ <li><a href="#upgrading">Upgrading to Vaadin @version-minor@</a></li> <li><a href="#supportedversions">Supported technologies</a></li> <li><a href="#vaadinontheweb">Vaadin on the Web</a></li> - <li><a href="#terms">Vaadin Framework Terms and Conditions</a></li> </ul> <h2 id="overview">Overview</h2> <p> <b>Vaadin</b> is a Java framework for building modern web applications that look - great, perform well and make you and your users happy. <b>Vaadin</b> and is - available under the Apache 2 license (see <a href="#terms">Vaadin Framework Terms - and Conditions</a>). + great, perform well and make you and your users happy. <b>Vaadin</b> is + available under the Apache License, Version 2.0 (see the <tt>license.html</tt> in + the Vaadin ZIP or JAR package). </p> <p> @@ -490,229 +489,6 @@ </li> </ul> - <h2 id="terms">Vaadin Framework Terms and Conditions for Use, Reproduction and Distribution</h2> - - <p> - The Vaadin Framework software developed by Vaadin is licensed under the Apache - License version 2.0. The full license text is included in the ZIP installation - package, in the Vaadin JARs, and on-line at <a - href="https://vaadin.com/license">vaadin.com/license</a> or <a - href="http://www.apache.org/licenses/">apache.org/licenses</a>. - </p> - - <p> - The license of the Vaadin Framework is for this product only and may not apply to - all Vaadin add-on components, such as those available from Vaadin Directory, or - other Vaadin products, which may have a different license. - </p> - - <p> - Other software included in this distribution is provided under other licenses, as - listed in the following section. - </p> - - <h3>Included Third-Party Software and Licenses</h3> - - <table border="1" cellspacing="1"> - <thead style="background: #ccc;"> - <tr><th>Package</th><th>License</th></tr> - </thead> - <tbody> - <tr> - <td>Apache Ant<br/> - Ant Launcher</td> - <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td> - </tr> - - <tr> - <td>Apache Commons<br/> - BCEL<br/> - Beanutils<br/> - CLI<br/> - 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> - - <tr> - <td>Apache HttpComponents Core</td> - <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td> - </tr> - - <tr> - <td>Apache Jakarta Regexp</td> - <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td> - </tr> - - <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> - - <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><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td> - </tr> - - <tr> - <td>Apache Xalan</td> - <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td> - </tr> - - <tr> - <td>Apache Xerces</td> - <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td> - </tr> - - <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> - - <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> - - <tr> - <td>CUP</td> - <td><a href="http://www.cs.princeton.edu/~appel/modern/java/CUP/#LICENSE">CUP Open Source License</a></td> - </tr> - - <tr> - <td>CyberNeko HTML Parser</td> - <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td> - </tr> - - <tr> - <td>Eclipse - JDT</td> - <td><a href="http://eclipse.org/org/documents/epl-v10.php">Eclipse Public License - v 1.0</a></td> - </tr> - - <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> - - <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> - - <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> - - <tr> - <td>HtmlUnit</td> - <td><a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a></td> - </tr> - - <tr> - <td>ICU</td> - <td><a href="http://source.icu-project.org/repos/icu/icu/trunk/license.html">ICU License</a></td> - </tr> - - <tr> - <td>Jetty</td> - <td><a href="http://www.google.com/url?q=http%3A%2F%2Fwww.eclipse.org%2Fjetty%2Flicenses.php&sa=D&sntz=1&usg=AFQjCNEwpnb4RRBBG6c4gF-zsuA9eaNJuA">Apache License, Version 2.0 OR Eclipse 1.0 (see exceptions)</a></td> - </tr> - - <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><a href="http://www.gnu.org/licenses/lgpl.html">GNU Lesser General Public License 2.1 or newer</a></td> - </tr> - - <tr> - <td>Mozilla Rhino</td> - <td><a href="http://www.mozilla.org/MPL/1.1/">Mozilla Public License v. 1.1</a></td> - </tr> - - <tr> - <td>MX4J</td> - <td><a href="http://mx4j.sourceforge.net/docs/ch01s06.html">The MX4J License</a></td> - </tr> - - <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> - - <tr> - <td>SmartSprites</td> - <td><a href="https://github.com/carrotsearch/smartsprites/blob/master/smartsprites.LICENSE">BSD License</a></td> - </tr> - - <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> - </div> <!-- /content--> <div id="footer"> |