You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2011/09/29 20:07:14 UTC
svn commit: r1177381 - in /openejb/trunk/openejb3/assembly:
openejb-standalone/src/main/resources/
openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/resources/META-INF/plus/
openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/resources/META-INF/web...
Author: dblevins
Date: Thu Sep 29 18:07:13 2011
New Revision: 1177381
URL: http://svn.apache.org/viewvc?rev=1177381&view=rev
Log:
added "This product includes software developed at" in the correct place in the NOTICE files
tweaked the license text for standalone -- needs to contain the servlet api specific license info
Modified:
openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/LICENSE
openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/NOTICE
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/resources/META-INF/plus/NOTICE
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/resources/META-INF/webprofile/NOTICE
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-plus-webapp/src/main/resources/META-INF/NOTICE
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/NOTICE
Modified: openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/LICENSE
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/LICENSE?rev=1177381&r1=1177380&r2=1177381&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/LICENSE (original)
+++ openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/LICENSE Thu Sep 29 18:07:13 2011
@@ -203,6 +203,59 @@
=========================================================================
+
+The XMLSchema.dtd included in this project was developed by the
+W3C Consortium (http://www.w3c.org/).
+Use of the source code, thus licensed, and the resultant binary are
+subject to the terms and conditions of the following license.
+
+W3C¨ SOFTWARE NOTICE AND LICENSE
+Copyright © 1994-2002 World Wide Web Consortium, (Massachusetts Institute of
+Technology, Institut National de Recherche en Informatique et en Automatique,
+Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
+
+This W3C work (including software, documents, or other related items) is
+being provided by the copyright holders under the following license. By
+obtaining, using and/or copying this work, you (the licensee) agree that you
+have read, understood, and will comply with the following terms and
+conditions:
+
+Permission to use, copy, modify, and distribute this software and its
+documentation, with or without modification, for any purpose and without
+fee or royalty is hereby granted, provided that you include the following on
+ALL copies of the software and documentation or portions thereof, including
+modifications, that you make:
+
+ 1. The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+ 2. Any pre-existing intellectual property disclaimers, notices, or terms
+ and conditions. If none exist, a short notice of the following form
+ (hypertext is preferred, text is permitted) should be used within
+ the body of any redistributed or derivative code: "Copyright ©
+ [$date-of-software] World Wide Web Consortium, (Massachusetts Institute
+ of Technology, Institut National de Recherche en Informatique et en
+ Automatique, Keio University). All Rights Reserved.
+ http://www.w3.org/Consortium/Legal/"
+ 3. Notice of any changes or modifications to the W3C files, including the
+ date changes were made. (We recommend you provide URIs to the location
+ from which the code is derived.)
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE
+NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
+THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS,
+COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the software without specific, written prior permission.
+Title to copyright in this software and any associated documentation will at all
+times remain with copyright holders.
+
+
+=========================================================================
- HSQLDB (http://hsqldb.org/) hsqldb:hsqldb:jar:1.8.0.10
License: HSQLDB License (http://hsqldb.org/web/hsqlLicense.html)
-------------------------------------------------------------------------
Modified: openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/NOTICE
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/NOTICE?rev=1177381&r1=1177380&r2=1177381&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/NOTICE (original)
+++ openejb/trunk/openejb3/assembly/openejb-standalone/src/main/resources/NOTICE Thu Sep 29 18:07:13 2011
@@ -1,6 +1,9 @@
Apache OpenEJB
Copyright 1999-2011 The Apache Software Foundation
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
This product includes schema files developed for the Glassfish Java EE
reference implementation (http://java.sun.com/xml/ns/j2ee/).
Apache OpenEJB elects to include this software in this distribution
@@ -11,9 +14,6 @@ under the CDDL license. You can obtain
=====================================
Apache Xerces Java NOTICE
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
Portions of this software were originally based on the following:
- software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
- software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/resources/META-INF/plus/NOTICE
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/resources/META-INF/plus/NOTICE?rev=1177381&r1=1177380&r2=1177381&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/resources/META-INF/plus/NOTICE (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/resources/META-INF/plus/NOTICE Thu Sep 29 18:07:13 2011
@@ -1,6 +1,9 @@
Apache OpenEJB
Copyright 1999-2011 The Apache Software Foundation
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
This product includes schema files developed for the Glassfish Java EE
reference implementation (http://java.sun.com/xml/ns/j2ee/).
Apache OpenEJB elects to include this software in this distribution
@@ -11,9 +14,6 @@ under the CDDL license. You can obtain
=====================================
Apache Xerces Java NOTICE
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
Portions of this software were originally based on the following:
- software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
- software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/resources/META-INF/webprofile/NOTICE
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/resources/META-INF/webprofile/NOTICE?rev=1177381&r1=1177380&r2=1177381&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/resources/META-INF/webprofile/NOTICE (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/resources/META-INF/webprofile/NOTICE Thu Sep 29 18:07:13 2011
@@ -1,6 +1,9 @@
Apache OpenEJB
Copyright 1999-2011 The Apache Software Foundation
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
This product includes schema files developed for the Glassfish Java EE
reference implementation (http://java.sun.com/xml/ns/j2ee/).
Apache OpenEJB elects to include this software in this distribution
@@ -11,9 +14,6 @@ under the CDDL license. You can obtain
=====================================
Apache Xerces Java NOTICE
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
Portions of this software were originally based on the following:
- software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
- software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-plus-webapp/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-plus-webapp/src/main/resources/META-INF/NOTICE?rev=1177381&r1=1177380&r2=1177381&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-plus-webapp/src/main/resources/META-INF/NOTICE (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-plus-webapp/src/main/resources/META-INF/NOTICE Thu Sep 29 18:07:13 2011
@@ -1,6 +1,9 @@
Apache OpenEJB
Copyright 1999-2011 The Apache Software Foundation
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
This product includes schema files developed for the Glassfish Java EE
reference implementation (http://java.sun.com/xml/ns/j2ee/).
Apache OpenEJB elects to include this software in this distribution
@@ -11,9 +14,6 @@ under the CDDL license. You can obtain
=====================================
Apache Xerces Java NOTICE
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
Portions of this software were originally based on the following:
- software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
- software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/NOTICE?rev=1177381&r1=1177380&r2=1177381&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/NOTICE (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/NOTICE Thu Sep 29 18:07:13 2011
@@ -1,6 +1,9 @@
Apache OpenEJB
Copyright 1999-2011 The Apache Software Foundation
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
This product includes schema files developed for the Glassfish Java EE
reference implementation (http://java.sun.com/xml/ns/j2ee/).
Apache OpenEJB elects to include this software in this distribution
@@ -11,9 +14,6 @@ under the CDDL license. You can obtain
=====================================
Apache Xerces Java NOTICE
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
Portions of this software were originally based on the following:
- software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
- software copyright (c) 1999, Sun Microsystems., http://www.sun.com.