You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by mc...@apache.org on 2008/06/10 21:51:22 UTC
svn commit: r666300 - in /geronimo/devtools/eclipse-plugin/trunk: ./
features/ plugins/ plugins/org.apache.geronimo.jee.v21.jaxbmodel/
plugins/org.apache.geronimo.runtime.common/
plugins/org.apache.geronimo.runtime.v20/ plugins/org.apache.geronimo.runt...
Author: mcconne
Date: Tue Jun 10 12:51:21 2008
New Revision: 666300
URL: http://svn.apache.org/viewvc?rev=666300&view=rev
Log:
GERONIMODEVTOOLS-357 Changes to numerous LICENSE and NOTICE files to fix legal notifications -- Thanks to Ted Kirby for this patch (and for catching all these) !!
Modified:
geronimo/devtools/eclipse-plugin/trunk/LICENSE
geronimo/devtools/eclipse-plugin/trunk/NOTICE
geronimo/devtools/eclipse-plugin/trunk/features/NOTICE
geronimo/devtools/eclipse-plugin/trunk/plugins/NOTICE
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/LICENSE
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/NOTICE
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/NOTICE
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/NOTICE
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/NOTICE
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/about.ini
Modified: geronimo/devtools/eclipse-plugin/trunk/LICENSE
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/LICENSE?rev=666300&r1=666299&r2=666300&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/LICENSE (original)
+++ geronimo/devtools/eclipse-plugin/trunk/LICENSE Tue Jun 10 12:51:21 2008
@@ -225,46 +225,3 @@
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
-=========================================================================
-== OPENEJB License ==
-=========================================================================
-
-OpenEJB License Copyright 2001-2006 (C) The OpenEJB Group. All
-Rights Reserved. This software consists of voluntary contributions made
-by many individuals on behalf of the OpenEJB Project. For more
-information please see http://openejb.org/.
-
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided that
-the following conditions are met:
-
-1. Redistributions of source code must retain copyright statements and
- notices. Redistributions must also contain a copy of this document.
-
-2. Redistributions in binary form must reproduce this list of conditions
- and the following disclaimer in the documentation and/or other
- materials provided with the distribution.
-
-3. The name "OpenEJB" must not be used to endorse or promote products
- derived from this Software without prior written permission of The
- OpenEJB Group. For written permission, please contact
- openejb-group@openejb.sf.net.
-
-4. Products derived from this Software may not be called "OpenEJB" nor may
- "OpenEJB" appear in their names without prior written permission of The
- OpenEJB Group. OpenEJB is a registered trademark of The OpenEJB Group.
-
-5. Due credit should be given to the OpenEJB Project (http://openejb.org/).
-
-THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS ``AS IS''
-AND ANY EXPRESSED 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 OPENEJB GROUP OR ITS 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: geronimo/devtools/eclipse-plugin/trunk/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/NOTICE?rev=666300&r1=666299&r2=666300&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/NOTICE (original)
+++ geronimo/devtools/eclipse-plugin/trunk/NOTICE Tue Jun 10 12:51:21 2008
@@ -6,7 +6,7 @@
Apache Geronimo Eclipse Plugin
Copyright 2003-2007 The Apache Software Foundation
-Portions of the Eclipse Geronimo Server Adapter were orginally developed by
+Portions of the Eclipse Geronimo Server Adapter were originally developed by
International Business Machines Corporation and are
licensed to the Apache Software Foundation under the
"Software Grant and Corporate Contribution License Agreement",
@@ -21,36 +21,15 @@
(http://www.bouncycastle.org/)
Copyright (c) 2000-2005 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
-
+
=========================================================================
== OpenEJB Notice ==
=========================================================================
-This product includes software created by the OpenEJB project (http://openejb.org/).
-
- Copyright 2001-2006 (C) The OpenEJB Group. All Rights Reserved.
-
-=========================================================================
-== XmlBeans Notice ==
-=========================================================================
-
-Portions of this software were originally based on the following:
- - software copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
-
-Aside from contributions to the Apache XMLBeans project, this
-software also includes:
-
- - one or more source files from the Apache Xerces-J and Apache Axis
- products, Copyright (c) 1999-2003 Apache Software Foundation
-
- - W3C XML Schema documents Copyright 2001-2003 (c) World Wide Web
- Consortium (Massachusetts Institute of Technology, European Research
- Consortium for Informatics and Mathematics, Keio University)
+This product includes software developed by the Apache OpenEJB project (http://openejb.apache.org/).
- - resolver.jar from Apache Xml Commons project,
- Copyright (c) 2001-2003 Apache Software Foundation
+Copyright 1999-2008 The Apache OpenEJB development community
- - Piccolo XML Parser for Java from http://piccolo.sourceforge.net/,
- Copyright 2002 Yuval Oren under the terms of the Apache Software
- License 2.0
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
Modified: geronimo/devtools/eclipse-plugin/trunk/features/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/NOTICE?rev=666300&r1=666299&r2=666300&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/NOTICE (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/NOTICE Tue Jun 10 12:51:21 2008
@@ -1,8 +1,8 @@
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of the Eclipse Geronimo Server Adapter were orginally developed by
-International Business Machines Corporation and are
-licensed to the Apache Software Foundation under the
-"Software Grant and Corporate Contribution License Agreement",
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of the Eclipse Geronimo Server Adapter were originally developed by
+International Business Machines Corporation and are
+licensed to the Apache Software Foundation under the
+"Software Grant and Corporate Contribution License Agreement",
informally known as the "Eclipse Geronimo Server Adapter CLA".
\ No newline at end of file
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/NOTICE?rev=666300&r1=666299&r2=666300&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/NOTICE (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/NOTICE Tue Jun 10 12:51:21 2008
@@ -1,8 +1,8 @@
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of the Eclipse Geronimo Server Adapter were orginally developed by
-International Business Machines Corporation and are
-licensed to the Apache Software Foundation under the
-"Software Grant and Corporate Contribution License Agreement",
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of the Eclipse Geronimo Server Adapter were originally developed by
+International Business Machines Corporation and are
+licensed to the Apache Software Foundation under the
+"Software Grant and Corporate Contribution License Agreement",
informally known as the "Eclipse Geronimo Server Adapter CLA".
\ No newline at end of file
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/LICENSE
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/LICENSE?rev=666300&r1=666299&r2=666300&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/LICENSE (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/LICENSE Tue Jun 10 12:51:21 2008
@@ -201,46 +201,3 @@
See the License for the specific language governing permissions and
limitations under the License.
-=========================================================================
-== OPENEJB License ==
-=========================================================================
-
-OpenEJB License Copyright 2001-2006 (C) The OpenEJB Group. All
-Rights Reserved. This software consists of voluntary contributions made
-by many individuals on behalf of the OpenEJB Project. For more
-information please see http://openejb.org/.
-
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided that
-the following conditions are met:
-
-1. Redistributions of source code must retain copyright statements and
- notices. Redistributions must also contain a copy of this document.
-
-2. Redistributions in binary form must reproduce this list of conditions
- and the following disclaimer in the documentation and/or other
- materials provided with the distribution.
-
-3. The name "OpenEJB" must not be used to endorse or promote products
- derived from this Software without prior written permission of The
- OpenEJB Group. For written permission, please contact
- openejb-group@openejb.sf.net.
-
-4. Products derived from this Software may not be called "OpenEJB" nor may
- "OpenEJB" appear in their names without prior written permission of The
- OpenEJB Group. OpenEJB is a registered trademark of The OpenEJB Group.
-
-5. Due credit should be given to the OpenEJB Project (http://openejb.org/).
-
-THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS ``AS IS''
-AND ANY EXPRESSED 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 OPENEJB GROUP OR ITS 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: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/NOTICE?rev=666300&r1=666299&r2=666300&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/NOTICE (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/NOTICE Tue Jun 10 12:51:21 2008
@@ -1,7 +1,7 @@
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
-Portions of the Eclipse Geronimo Server Adapter were orginally developed by
+Portions of the Eclipse Geronimo Server Adapter were originally developed by
International Business Machines Corporation and are
licensed to the Apache Software Foundation under the
"Software Grant and Corporate Contribution License Agreement",
@@ -11,6 +11,10 @@
== OpenEJB Notice ==
=========================================================================
-This product includes software created by the OpenEJB project (http://openejb.org/).
+This product includes software developed by the Apache OpenEJB project (http://openejb.apache.org/).
+
+Copyright 1999-2008 The Apache OpenEJB development community
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
- Copyright 2001-2006 (C) The OpenEJB Group. All Rights Reserved.
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/NOTICE?rev=666300&r1=666299&r2=666300&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/NOTICE (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/NOTICE Tue Jun 10 12:51:21 2008
@@ -1,32 +1,8 @@
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
-Portions of the Eclipse Geronimo Server Adapter were orginally developed by
+Portions of the Eclipse Geronimo Server Adapter were originally developed by
International Business Machines Corporation and are
licensed to the Apache Software Foundation under the
"Software Grant and Corporate Contribution License Agreement",
informally known as the "Eclipse Geronimo Server Adapter CLA".
-
-=========================================================================
-== XmlBeans Notice ==
-=========================================================================
-
-Portions of this software were originally based on the following:
- - software copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
-
-Aside from contributions to the Apache XMLBeans project, this
-software also includes:
-
- - one or more source files from the Apache Xerces-J and Apache Axis
- products, Copyright (c) 1999-2003 Apache Software Foundation
-
- - W3C XML Schema documents Copyright 2001-2003 (c) World Wide Web
- Consortium (Massachusetts Institute of Technology, European Research
- Consortium for Informatics and Mathematics, Keio University)
-
- - resolver.jar from Apache Xml Commons project,
- Copyright (c) 2001-2003 Apache Software Foundation
-
- - Piccolo XML Parser for Java from http://piccolo.sourceforge.net/,
- Copyright 2002 Yuval Oren under the terms of the Apache Software
- License 2.0
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/NOTICE?rev=666300&r1=666299&r2=666300&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/NOTICE (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/NOTICE Tue Jun 10 12:51:21 2008
@@ -1,8 +1,8 @@
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of the Eclipse Geronimo Server Adapter were orginally developed by
-International Business Machines Corporation and are
-licensed to the Apache Software Foundation under the
-"Software Grant and Corporate Contribution License Agreement",
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of the Eclipse Geronimo Server Adapter were originally developed by
+International Business Machines Corporation and are
+licensed to the Apache Software Foundation under the
+"Software Grant and Corporate Contribution License Agreement",
informally known as the "Eclipse Geronimo Server Adapter CLA".
\ No newline at end of file
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/NOTICE?rev=666300&r1=666299&r2=666300&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/NOTICE (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/NOTICE Tue Jun 10 12:51:21 2008
@@ -1,8 +1,8 @@
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of the Eclipse Geronimo Server Adapter were orginally developed by
-International Business Machines Corporation and are
-licensed to the Apache Software Foundation under the
-"Software Grant and Corporate Contribution License Agreement",
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of the Eclipse Geronimo Server Adapter were originally developed by
+International Business Machines Corporation and are
+licensed to the Apache Software Foundation under the
+"Software Grant and Corporate Contribution License Agreement",
informally known as the "Eclipse Geronimo Server Adapter CLA".
\ No newline at end of file
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/about.ini
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/about.ini?rev=666300&r1=666299&r2=666300&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/about.ini (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/about.ini Tue Jun 10 12:51:21 2008
@@ -23,7 +23,7 @@
#
aboutText=Geronimo v2.1 Server Adapter\n\
\n\
-Version: 2.1.0\n\
+Version: 2.1.1\n\
\n\
(c) Copyright 2003-2008 The Apache Software Foundation\n\
Visit http://www.apache.org/licenses/LICENSE-2.0.txt/ for additional details\n\