svn commit: r673431 - in /ofbiz/trunk: .classpath LICENSE NOTICE

[jacopoc]

Author: jacopoc
Date: Wed Jul  2 09:19:00 2008
New Revision: 673431

URL: http://svn.apache.org/viewvc?rev=673431&view=rev
Log:
Updated license and classpath information after Jetty upgrade.

Modified:
    ofbiz/trunk/.classpath
    ofbiz/trunk/LICENSE
    ofbiz/trunk/NOTICE

Modified: ofbiz/trunk/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=673431&r1=673430&r2=673431&view=diff
==============================================================================
--- ofbiz/trunk/.classpath (original)
+++ ofbiz/trunk/.classpath Wed Jul  2 09:19:00 2008
@@ -47,10 +47,12 @@
  <classpathentry kind="lib" path="framework/service/lib/wsdl4j.jar"/>
  <classpathentry kind="lib" path="framework/service/lib/axis-ant.jar"/>
  <classpathentry kind="lib" path="framework/service/lib/axis.jar"/>
- <classpathentry kind="lib" path="framework/jetty/lib/org.mortbay.jmx.jar"/>
- <classpathentry kind="lib" path="framework/jetty/lib/org.mortbay.jetty.jar"/>
- <classpathentry kind="lib" path="framework/jetty/lib/jasper-runtime.jar"/>
- <classpathentry kind="lib" path="framework/jetty/lib/jasper-compiler.jar"/>
+ <classpathentry kind="lib" path="framework/jetty/lib/jetty-6.1.11.jar"/>
+    <classpathentry kind="lib" path="framework/jetty/lib/jetty-ajp-6.1.11.jar"/>
+    <classpathentry kind="lib" path="framework/jetty/lib/jetty-sslengine-6.1.11.jar"/>
+    <classpathentry kind="lib" path="framework/jetty/lib/jetty-util-6.1.11.jar"/>
+ <classpathentry kind="lib" path="framework/jetty/lib/jasper-runtime-5.5.15.jar"/>
+ <classpathentry kind="lib" path="framework/jetty/lib/jasper-compiler-5.5.15.jar"/>
  <classpathentry kind="lib" path="framework/guiapp/lib/XuiCoreSwing-v3.2rc2b.jar"/>
  <classpathentry kind="lib" path="framework/guiapp/lib/XuiOptional-v3.2rc2b.jar"/>
  <classpathentry kind="lib" path="applications/content/lib/poi.jar"/>

Modified: ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=673431&r1=673430&r2=673431&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Wed Jul  2 09:19:00 2008
@@ -66,9 +66,15 @@
 ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-tomcat-juli-adapters.jar
 ofbiz/trunk/framework/entity/lib/commons-dbcp-1.3-20071125.225953-2.jar
 ofbiz/trunk/framework/entity/lib/jdbc/derby-10.3.1.4.jar
-ofbiz/trunk/framework/jetty/lib/ant.jar
-ofbiz/trunk/framework/jetty/lib/org.mortbay.jetty.jar
-ofbiz/trunk/framework/jetty/lib/org.mortbay.jmx.jar
+ofbiz/trunk/framework/jetty/lib/ant-1.6.5.jar
+ofbiz/trunk/framework/jetty/lib/jasper-compiler-5.5.15.jar
+ofbiz/trunk/framework/jetty/lib/jasper-compiler-jdt-5.5.15.jar
+ofbiz/trunk/framework/jetty/lib/jasper-runtime-5.5.15.jar
+ofbiz/trunk/framework/jetty/lib/jetty-6.1.11.jar
+ofbiz/trunk/framework/jetty/lib/jetty-ajp-6.1.11.jar
+ofbiz/trunk/framework/jetty/lib/jetty-sslengine-6.1.11.jar
+ofbiz/trunk/framework/jetty/lib/jetty-util-6.1.11.jar
+ofbiz/trunk/framework/jetty/lib/xmlParserAPIs-2.6.2.jar
 ofbiz/trunk/framework/service/lib/axis-ant.jar
 ofbiz/trunk/framework/service/lib/axis.jar
 ofbiz/trunk/framework/webapp/lib/barcode4j-fop-ext-0.93.jar
@@ -301,8 +307,6 @@
 =========================================================================
 The following libraries distributed with Apache OFBiz are licensed under the
 Apache Software License:
-ofbiz/trunk/framework/jetty/lib/jasper-compiler.jar
-ofbiz/trunk/framework/jetty/lib/jasper-runtime.jar
 ofbiz/trunk/framework/webapp/lib/DataVision-1.0.0.jar
 =========================================================================
 Apache Software License
@@ -1183,6 +1187,9 @@
 MIT/X License:
 ofbiz/trunk/framework/base/lib/icu4j_3_6.jar
 ofbiz/trunk/framework/entity/lib/ofbiz-minerva.jar
+ofbiz/trunk/framework/jetty/lib/jcl104-over-slf4j-1.3.1.jar
+ofbiz/trunk/framework/jetty/lib/slf4j-api-1.3.1.jar
+ofbiz/trunk/framework/jetty/lib/slf4j-log4j12-1.3.1.jar
 ofbiz/trunk/framework/images/webapp/images/htmledit/whizzywig_v55i.js
 ofbiz/trunk/framework/images/webapp/images/calendar_date_select.js
 =========================================================================

Modified: ofbiz/trunk/NOTICE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/NOTICE?rev=673431&r1=673430&r2=673431&view=diff
==============================================================================
--- ofbiz/trunk/NOTICE (original)
+++ ofbiz/trunk/NOTICE Wed Jul  2 09:19:00 2008
@@ -222,12 +222,22 @@
  Copyright 1995-2006 Mort Bay Consulting Pty Ltd
 ==============================================================
 
-This product includes software developed at The Apache Software Foundation
-(http://www.apache.org/).
+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
@@ -237,6 +247,8 @@
   2006 Tim Vernum
   1999 Jason Gilbert.
 
+The jboss integration module contains some LGPL code.
+
 =========================================================================
 ==  MX4J Notice                                                        ==
 =========================================================================