Author: crossley
Date: Tue Feb 15 00:54:32 2011
New Revision: 1070710
URL: http://svn.apache.org/viewvc?rev=1070710&view=rev
Log:
Follow upgrade of our packaged jetty.
Issue: FOR-1222
Added:
forrest/trunk/tools/jetty/jetty-NOTICE.txt (with props)
Modified:
forrest/trunk/LICENSE.txt
Modified: forrest/trunk/LICENSE.txt
URL:
http://svn.apache.org/viewvc/forrest/trunk/LICENSE.txt?rev=1070710&r1=1070709&r2=1070710&view=diff
==============================================================================
--- forrest/trunk/LICENSE.txt (original)
+++ forrest/trunk/LICENSE.txt Tue Feb 15 00:54:32 2011
@@ -261,6 +261,8 @@ license: tools/eclipse/plugins/org.apach
license:
tools/eclipse/plugins/org.apache.forrest.repository.daisy/lib/daisy-repository-spi-1.2.jar.license.txt
license:
tools/eclipse/plugins/org.apache.forrest.repository.daisy/lib/daisy-repository-xmlschema-bindings-1.2.jar.license.txt
license:
tools/eclipse/plugins/org.apache.forrest.repository.daisy/lib/xbean-20040211.jar.license.txt
+license: tools/jetty/jetty-6.1.26.jar.license.txt
+license: tools/jetty/jetty-util-6.1.26.jar.license.txt
license: tools/forrestbot/lib/ant-contrib-1.0b2.jar.license.txt
license: whiteboard/f9/lib/commons-io.license.txt
license: whiteboard/f9/lib/jetty.license.txt
@@ -294,7 +296,6 @@ license: tools/eclipse/plugins/org.apach
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
license:
tools/eclipse/plugins/org.apache.forrest.repository.daisy/lib/avalon-framework-api-4.1.5.jar.license.txt
-license: tools/jetty/servlet-2.3.jar.license.txt
----------------
These supporting products are licensed: based on Apache Software License,
Version 1.1
@@ -349,6 +350,10 @@ license: lib/core/slf4j-api-1.5.11.jar.l
license: lib/core/slf4j-log4j12-1.5.11.jar.license.txt
----------------
+These supporting products are licensed: Common Development and Distribution
License (CDDL) Version 1.0
+license: tools/jetty/servlet-api-2.5-6.1.5.jar.license.txt
+
+----------------
These supporting products are licensed: Common Public License Version 1.0
license:
whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/lib/jdtcore-3.1.0.jar.license.html
license:
whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/lib/junit.jar.license.html
Added: forrest/trunk/tools/jetty/jetty-NOTICE.txt
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/jetty/jetty-NOTICE.txt?rev=1070710&view=auto
==============================================================================
--- forrest/trunk/tools/jetty/jetty-NOTICE.txt (added)
+++ forrest/trunk/tools/jetty/jetty-NOTICE.txt Tue Feb 15 00:54:32 2011
@@ -0,0 +1,36 @@
+==============================================================
+ Jetty Web Container
+ Copyright 1995-2009 Mort Bay Consulting Pty Ltd
+==============================================================
+
+The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
+unless otherwise noted. It is licensed under the apache 2.0
+license.
+
+The javax.servlet package used by Jetty is copyright
+Sun Microsystems, Inc and Apache Software Foundation. It is
+distributed under the Common Development and Distribution License.
+You can obtain a copy of the license at
+https://glassfish.dev.java.net/public/CDDLv1.0.html.
+
+The UnixCrypt.java code ~Implements the one way cryptography used by
+Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
+modified April 2001 by Iris Van den Broeke, Daniel Deville.
+Permission to use, copy, modify and distribute UnixCrypt
+for non-commercial or commercial purposes and without fee is
+granted provided that the copyright notice appears in all copies.
+
+The default JSP implementation is provided by the Glassfish JSP engine
+from project Glassfish http://glassfish.dev.java.net. Copyright 2005
+Sun Microsystems, Inc. and portions Copyright Apache Software Foundation.
+
+Some portions of the code are Copyright:
+ 2006 Tim Vernum
+ 1999 Jason Gilbert.
+
+The jboss integration module contains some LGPL code.
+
+The win32 Java Service Wrapper (v3.2.3) is Copyright (c) 1999, 2006
+Tanuki Software, Inc. and 2001 Silver Egg Technology. It is
+covered by an open license which is viewable at
+http://svn.codehaus.org/jetty/jetty/branches/jetty-6.1/extras/win32service/LICENSE.txt
Propchange: forrest/trunk/tools/jetty/jetty-NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
