geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r471798 - in /geronimo/devtools/eclipse-plugin/trunk: LICENSE NOTICE
Date Mon, 06 Nov 2006 17:30:48 GMT
Author: kevan
Date: Mon Nov  6 09:30:43 2006
New Revision: 471798

URL: http://svn.apache.org/viewvc?view=rev&rev=471798
Log:
GERONIMODEVTOOLS-115 Update LICENSE and NOTICE files with bouncy castle info (required due
to inclusion of geronimo-util). Also fix line endings in NOTICE. I also put everything in
alphabetical order

Modified:
    geronimo/devtools/eclipse-plugin/trunk/LICENSE
    geronimo/devtools/eclipse-plugin/trunk/NOTICE

Modified: geronimo/devtools/eclipse-plugin/trunk/LICENSE
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/LICENSE?view=diff&rev=471798&r1=471797&r2=471798
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/LICENSE (original)
+++ geronimo/devtools/eclipse-plugin/trunk/LICENSE Mon Nov  6 09:30:43 2006
@@ -202,6 +202,86 @@
    limitations under the License.
 
 =========================================================================
+==  Bouncy Castle License                                              ==
+=========================================================================
+
+The Bouncy Castle License
+
+Copyright (c) 2000-2005 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+and associated documentation files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute,
sublicense,
+and/or sell copies of the Software, and to permit persons to whom the Software is furnished
to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or
substantial
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+
+=========================================================================
+==  MX4J License                                                       ==
+=========================================================================
+
+The MX4J License, Version 1.0
+
+Copyright (c) 2001 MX4J.  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. The end-user documentation included with the redistribution,
+   if any, must include the following acknowledgment:
+      "This product includes software developed by the
+       MX4J project (http://sourceforge.net/projects/mx4j)."
+   Alternately, this acknowledgment may appear in the software itself,
+   if and wherever such third-party acknowledgments normally appear.
+
+4. The names "MX4J" and "mx4j" must not be used to endorse or promote
+   products derived from this software without prior written
+   permission. For written permission, please contact 
+   biorn_steedom@users.sourceforge.net
+
+5. Products derived from this software may not be called "MX4J",
+   nor may "MX4J" appear in their name, without prior written
+   permission of Simone Bordet.
+
+THIS SOFTWARE IS PROVIDED ``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 CHRIS SEGUIN 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.
+
+====================================================================
+
+This software consists of voluntary contributions made by many
+individuals on behalf of MX4J.  For more information on
+MX4J, please see <http://sourceforge.net/projects/mx4j>.
+
+=========================================================================
 ==  OPENEJB License                                                    ==
 =========================================================================
 
@@ -276,121 +356,4 @@
 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.
-
-=========================================================================
-==  MX4J License                                                       ==
-=========================================================================
-
-The MX4J License, Version 1.0
-
-Copyright (c) 2001 MX4J.  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. The end-user documentation included with the redistribution,
-   if any, must include the following acknowledgment:
-      "This product includes software developed by the
-       MX4J project (http://sourceforge.net/projects/mx4j)."
-   Alternately, this acknowledgment may appear in the software itself,
-   if and wherever such third-party acknowledgments normally appear.
-
-4. The names "MX4J" and "mx4j" must not be used to endorse or promote
-   products derived from this software without prior written
-   permission. For written permission, please contact 
-   biorn_steedom@users.sourceforge.net
-
-5. Products derived from this software may not be called "MX4J",
-   nor may "MX4J" appear in their name, without prior written
-   permission of Simone Bordet.
-
-THIS SOFTWARE IS PROVIDED ``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 CHRIS SEGUIN 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.
-
-====================================================================
-
-This software consists of voluntary contributions made by many
-individuals on behalf of MX4J.  For more information on
-MX4J, please see <http://sourceforge.net/projects/mx4j>.
-
-====================================================================
-== Hessian License                                                ==
-====================================================================
-
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000 The Apache Software Foundation.  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. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``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 APACHE SOFTWARE FOUNDATION 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.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * Portions of this software are based upon public domain software
- * originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
- */
 

Modified: geronimo/devtools/eclipse-plugin/trunk/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/NOTICE?view=diff&rev=471798&r1=471797&r2=471798
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/NOTICE (original)
+++ geronimo/devtools/eclipse-plugin/trunk/NOTICE Mon Nov  6 09:30:43 2006
@@ -1,13 +1,23 @@
-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 orginally 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".
 
 =========================================================================
+==  Bouncy Castle Notice                                               ==
+=========================================================================
+
+This product includes software (the ASN1 codec in the org.apache.geronimo.asn1
+package) which was developed by the Bouncy Castle project. 
+(http://www.bouncycastle.org/) 
+
+     Copyright (c) 2000-2005 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+
+=========================================================================
 ==  MX4J Notice                                                        ==
 =========================================================================
 
@@ -36,4 +46,4 @@
 
  - Piccolo XML Parser for Java from http://piccolo.sourceforge.net/,
    Copyright 2002 Yuval Oren under the terms of the Apache Software 
-   License 2.0
\ No newline at end of file
+   License 2.0



Mime
View raw message