Author: xuhaihong
Date: Mon Oct 10 08:27:18 2011
New Revision: 1180825
URL: http://svn.apache.org/viewvc?rev=1180825&view=rev
Log:
License/Notice files update
Modified:
openejb/branches/openejb-3.0.x/assembly/openejb-itests-standalone-client/src/main/assembly/client.xml
openejb/branches/openejb-3.0.x/assembly/openejb-itests-standalone-client/src/main/resources/LICENSE
openejb/branches/openejb-3.0.x/assembly/openejb-itests-standalone-client/src/main/resources/NOTICE
openejb/branches/openejb-3.0.x/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/NOTICE
Modified:
openejb/branches/openejb-3.0.x/assembly/openejb-itests-standalone-client/src/main/assembly/client.xml
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-3.0.x/assembly/openejb-itests-standalone-client/src/main/assembly/client.xml?rev=1180825&r1=1180824&r2=1180825&view=diff
==============================================================================
---
openejb/branches/openejb-3.0.x/assembly/openejb-itests-standalone-client/src/main/assembly/client.xml
(original)
+++
openejb/branches/openejb-3.0.x/assembly/openejb-itests-standalone-client/src/main/assembly/client.xml
Mon Oct 10 08:27:18 2011
@@ -56,6 +56,7 @@
<excludes>
<exclude>META-INF/LICENSE.txt</exclude>
<exclude>META-INF/NOTICE.txt</exclude>
+ <exclude>LICENSE.txt</exclude>
</excludes>
</unpackOptions>
<includes>
Modified:
openejb/branches/openejb-3.0.x/assembly/openejb-itests-standalone-client/src/main/resources/LICENSE
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-3.0.x/assembly/openejb-itests-standalone-client/src/main/resources/LICENSE?rev=1180825&r1=1180824&r2=1180825&view=diff
==============================================================================
---
openejb/branches/openejb-3.0.x/assembly/openejb-itests-standalone-client/src/main/resources/LICENSE
(original)
+++
openejb/branches/openejb-3.0.x/assembly/openejb-itests-standalone-client/src/main/resources/LICENSE
Mon Oct 10 08:27:18 2011
@@ -200,3 +200,107 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+
+=========================================================================
+== ASM License ==
+=========================================================================
+
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+
+=========================================================================
+== Backport-Util-Concurrent ==
+=========================================================================
+
+Copyright-Only Dedication (based on United States law) or Public Domain
+Certification
+
+The person or persons who have associated work with this document (the
+"Dedicator" or "Certifier") hereby either (a) certifies that, to the
+best of his knowledge, the work of authorship identified is in the
+public domain of the country from which the work is published, or (b)
+hereby dedicates whatever copyright the dedicators holds in the work of
+authorship identified below (the "Work") to the public domain. A
+certifier, morever, dedicates any copyright interest he may have in the
+associated work, and for these purposes, is described as a "dedicator"
+below.
+
+A certifier has taken reasonable steps to verify the copyright status
+of this work. Certifier recognizes that his good faith efforts may not
+shield him from liability if in fact the work certified is not in the
+public domain.
+
+Dedicator makes this dedication for the benefit of the public at large
+and to the detriment of the Dedicator's heirs and successors. Dedicator
+intends this dedication to be an overt act of relinquishment in perpetuity
+of all present and future rights under copyright law, whether vested or
+contingent, in the Work. Dedicator understands that such relinquishment
+of all rights includes the relinquishment of all rights to enforce (by
+lawsuit or otherwise) those copyrights in the Work.
+
+Dedicator recognizes that, once placed in the public domain, the Work
+may be freely reproduced, distributed, transmitted, used, modified, built
+upon, or otherwise exploited by anyone for any purpose, commercial or
+non-commercial, and in any way, including by methods that have not yet
+been invented or conceived.
+
+=========================================================================
+ - JUnit junit:junit
+ License: BSD
+-------------------------------------------------------------------------
+
+BSD License
+
+Copyright (c) 2000-2006, www.hamcrest.org
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
list of
+conditions and the following disclaimer. Redistributions in binary form must
reproduce
+the above copyright notice, this list of conditions and the following
disclaimer in
+the documentation and/or other materials provided with the distribution.
+
+Neither the name of Hamcrest nor the names of its contributors may be used to
endorse
+or promote products derived from this software without specific prior written
+permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
EVENT
+SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY
+WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
Modified:
openejb/branches/openejb-3.0.x/assembly/openejb-itests-standalone-client/src/main/resources/NOTICE
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-3.0.x/assembly/openejb-itests-standalone-client/src/main/resources/NOTICE?rev=1180825&r1=1180824&r2=1180825&view=diff
==============================================================================
---
openejb/branches/openejb-3.0.x/assembly/openejb-itests-standalone-client/src/main/resources/NOTICE
(original)
+++
openejb/branches/openejb-3.0.x/assembly/openejb-itests-standalone-client/src/main/resources/NOTICE
Mon Oct 10 08:27:18 2011
@@ -5,4 +5,28 @@ Copyright 1999-2011 The Apache OpenEJB d
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+#########################################################################
+## APACHE OPENEJB DEPENDENCIES ##
+#########################################################################
+
+=========================================================================
+== ASM Notice ==
+=========================================================================
+
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+=========================================================================
+== Backport Util Concurrent Notice ==
+=========================================================================
+
+The backport-util-concurrent software has been released to the public domain,
+as explained at: http://creativecommons.org/licenses/publicdomain.
+
+Acknowledgements: backport-util-concurrent is based in large part on the public
+domain sources from:
+1) JSR166,
+2) package dl.util.concurrent,
+3) Doug Lea's "collections" package.
+
Modified:
openejb/branches/openejb-3.0.x/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-3.0.x/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/NOTICE?rev=1180825&r1=1180824&r2=1180825&view=diff
==============================================================================
---
openejb/branches/openejb-3.0.x/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/NOTICE
(original)
+++
openejb/branches/openejb-3.0.x/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/NOTICE
Mon Oct 10 08:27:18 2011
@@ -4,7 +4,7 @@
=========================================================================
Apache OpenEJB
-Copyright 2006-2007 The Apache Software Foundation
+Copyright 2006-2011 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
