manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1336935 - in /incubator/lcf/branches/CONNECTORS-96: dist-license/LICENSE.txt lib-license/LICENSE.txt
Date Thu, 10 May 2012 22:42:59 GMT
Author: kwright
Date: Thu May 10 22:42:59 2012
New Revision: 1336935

URL: http://svn.apache.org/viewvc?rev=1336935&view=rev
Log:
Update license files so they don't refer to jdbcpool anymore.

Modified:
    incubator/lcf/branches/CONNECTORS-96/dist-license/LICENSE.txt
    incubator/lcf/branches/CONNECTORS-96/lib-license/LICENSE.txt

Modified: incubator/lcf/branches/CONNECTORS-96/dist-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-96/dist-license/LICENSE.txt?rev=1336935&r1=1336934&r2=1336935&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-96/dist-license/LICENSE.txt (original)
+++ incubator/lcf/branches/CONNECTORS-96/dist-license/LICENSE.txt Thu May 10 22:42:59 2012
@@ -201,9 +201,6 @@ License: BSD License (http://jdbc.postgr
 This product includes a JUnit jar: http://junit.sourceforge.net/
 License: Common Public License - v 1.0 (http://junit.sourceforge.net/cpl-v10.html)
 
-This product includes a jdbcpool-0.99.jar.
-License: Apache Software Foundation - v 1.1
-
 This product includes an eclipse-ecj.jar.
 License: Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html)
 
@@ -561,65 +558,6 @@ resulting litigation.
 
 
 ==========================================================================
-The following license applies to jdbcpool-0.99.jar
---------------------------------------------------------------------------
-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.
-
-==========================================================================
 The following license applies to eclipse-ecj.jar, and
 h2-1.3.158.jar:
 --------------------------------------------------------------------------

Modified: incubator/lcf/branches/CONNECTORS-96/lib-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-96/lib-license/LICENSE.txt?rev=1336935&r1=1336934&r2=1336935&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-96/lib-license/LICENSE.txt (original)
+++ incubator/lcf/branches/CONNECTORS-96/lib-license/LICENSE.txt Thu May 10 22:42:59 2012
@@ -201,9 +201,6 @@ License: BSD License (http://jdbc.postgr
 This product includes a JUnit jar: http://junit.sourceforge.net/
 License: Common Public License - v 1.0 (http://junit.sourceforge.net/cpl-v10.html)
 
-This product includes a jdbcpool-0.99.jar.
-License: Apache Software Foundation - v 1.1
-
 This product includes an eclipse-ecj.jar.
 License: Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html)
 
@@ -561,65 +558,6 @@ resulting litigation.
 
 
 ==========================================================================
-The following license applies to jdbcpool-0.99.jar
---------------------------------------------------------------------------
-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.
-
-==========================================================================
 The following license applies to eclipse-ecj.jar, and
 h2-1.3.158.jar:
 --------------------------------------------------------------------------



Mime
View raw message