You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2011/01/08 18:18:46 UTC
svn commit: r1056739 - in
/incubator/lcf/branches/release-0.1-incubating-branch: ./ CHANGES.txt
LICENSE.txt NOTICE.txt README.txt
Author: kwright
Date: Sat Jan 8 17:18:46 2011
New Revision: 1056739
URL: http://svn.apache.org/viewvc?rev=1056739&view=rev
Log:
Port fixes for CONNECTORS-142 and CONNECTORS-143 to release branch.
Modified:
incubator/lcf/branches/release-0.1-incubating-branch/ (props changed)
incubator/lcf/branches/release-0.1-incubating-branch/CHANGES.txt
incubator/lcf/branches/release-0.1-incubating-branch/LICENSE.txt
incubator/lcf/branches/release-0.1-incubating-branch/NOTICE.txt
incubator/lcf/branches/release-0.1-incubating-branch/README.txt
Propchange: incubator/lcf/branches/release-0.1-incubating-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 8 17:18:46 2011
@@ -1,2 +1,2 @@
/incubator/lcf/branches/release-0.1-branch:1056045
-/incubator/lcf/trunk:1039159,1041674,1041679,1041763,1041885,1041968,1042383,1042836-1042837,1042896,1042898,1043728,1044276,1044287,1044294,1044641,1049834,1050183,1050605,1056045,1056054,1056104,1056116,1056131-1056139,1056157,1056170-1056173,1056195,1056245,1056382-1056385,1056474
+/incubator/lcf/trunk:1039159,1041674,1041679,1041763,1041885,1041968,1042383,1042836-1042837,1042896,1042898,1043728,1044276,1044287,1044294,1044641,1049834,1050183,1050605,1056045,1056054,1056104,1056116,1056131-1056139,1056157,1056170-1056173,1056195,1056245,1056382-1056385,1056474,1056738
Modified: incubator/lcf/branches/release-0.1-incubating-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.1-incubating-branch/CHANGES.txt?rev=1056739&r1=1056738&r2=1056739&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.1-incubating-branch/CHANGES.txt (original)
+++ incubator/lcf/branches/release-0.1-incubating-branch/CHANGES.txt Sat Jan 8 17:18:46 2011
@@ -4,6 +4,12 @@ $Id$
======================= Release 0.1 =======================
Release Date: See http://incubator.apache.org/connectors for the official release date.
+CONNECTORS-143: Copyright notice needs to be changed to 2011.
+(Sebb, Karl Wright)
+
+CONNECTORS-142: License and notice file revisions.
+(Ant Elder, Sebb, Ralph Goers, Karl Wright)
+
CONNECTORS-140: Change build to generate both a -src and a -bin distribution.
(Grant Ingersoll, Karl Wright)
Modified: incubator/lcf/branches/release-0.1-incubating-branch/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.1-incubating-branch/LICENSE.txt?rev=1056739&r1=1056738&r2=1056739&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.1-incubating-branch/LICENSE.txt (original)
+++ incubator/lcf/branches/release-0.1-incubating-branch/LICENSE.txt Sat Jan 8 17:18:46 2011
@@ -174,7 +174,40 @@
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
-
+
+
+Includes software from other Apache Software Foundation projects,
+including, but not limited to:
+ - Apache Tomcat
+ - Apache Commons
+ - Apache Geronimo
+ - Apache Log4j
+ - Apache Derby
+ - Apache Axis
+ - Apache Xerces2
+ - Apache Jetty
+
+This product includes code from: http://www.json.org
+License: JSON license (http://www.json.org/license.html)
+
+This product includes a postgresql.jar: http://jdbc.postgresql.org
+License: BSD License (http://jdbc.postgresql.org/license.html)
+
+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)
+
+This product includes an hsqldb.jar: http://hsqldb.org/
+License: HSQL Development Group License (http://hsqldb.org/web/hsqlLicense.html)
+
+This product includes JSP API jars.
+License: Common Development and Distribution License (CDDL) v1.0 (https://glassfish.dev.java.net/public/CDDLv1.0.html)
+
==========================================================================
The following license applies to json.jar, which is generated from the json
sources from http://www.json.org/java/index.html
Modified: incubator/lcf/branches/release-0.1-incubating-branch/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.1-incubating-branch/NOTICE.txt?rev=1056739&r1=1056738&r2=1056739&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.1-incubating-branch/NOTICE.txt (original)
+++ incubator/lcf/branches/release-0.1-incubating-branch/NOTICE.txt Sat Jan 8 17:18:46 2011
@@ -1,137 +1,5 @@
-Apache Connectors Framework
-Copyright 2010 The Apache Software Foundation
+Apache ManifoldCF
+Copyright 2010-2011 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
-
-Includes software from other Apache Software Foundation projects,
-including, but not limited to:
- - Apache Tomcat
- - Apache Commons
- - Apache Geronimo
- - Apache Log4j
- - Apache Derby
- - Apache Axis
- - Apache Xerces2
- - Apache Jetty
-
-This product includes code from: http://www.json.org
-License: JSON license (http://www.json.org/license.html)
-
-This product includes a postgresql.jar: http://jdbc.postgresql.org
-License: BSD License (http://jdbc.postgresql.org/license.html)
-
-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)
-
-This product includes an hsqldb.jar: http://hsqldb.org/
-License: HSQL Development Group License (http://hsqldb.org/web/hsqlLicense.html)
-
-This product includes JSP API jars.
-License: Common Development and Distribution License (CDDL) v1.0 (https://glassfish.dev.java.net/public/CDDLv1.0.html)
-
-=========================================================================
-== Jetty Notice ==
-=========================================================================
-==============================================================
- Jetty Web Container
- Copyright 1995-2006 Mort Bay Consulting Pty Ltd
-==============================================================
-
-This product includes some software developed at The Apache Software
-Foundation (http://www.apache.org/).
-
-The javax.servlet package used by Jetty is copyright
-Sun Microsystems, Inc and Apache Software Foundation. It is
-distributed under the Common Development and Distribution License.
-You can obtain a copy of the license at
-https://glassfish.dev.java.net/public/CDDLv1.0.html.
-
-The UnixCrypt.java code ~Implements the one way cryptography used by
-Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
-modified April 2001 by Iris Van den Broeke, Daniel Deville.
-
-The default JSP implementation is provided by the Glassfish JSP engine
-from project Glassfish http://glassfish.dev.java.net. Copyright 2005
-Sun Microsystems, Inc. and portions Copyright Apache Software Foundation.
-
-Some portions of the code are Copyright:
- 2006 Tim Vernum
- 1999 Jason Gilbert.
-
-The jboss integration module contains some LGPL code.
-
-=========================================================================
-== HSQLDB Notice ==
-=========================================================================
-
-For content, code, and products originally developed by Thomas Mueller and the Hypersonic SQL Group:
-
-Copyright (c) 1995-2000 by the Hypersonic SQL Group.
-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 the Hypersonic SQL Group 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 HYPERSONIC SQL GROUP,
-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.
-
-This software consists of voluntary contributions made by many individuals on behalf of the
-Hypersonic SQL Group.
-
-For work added by the HSQL Development Group (a.k.a. hsqldb_lic.txt):
-
-Copyright (c) 2001-2005, The HSQL Development Group
-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 the HSQL Development Group 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 HSQL DEVELOPMENT GROUP, HSQLDB.ORG,
-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: incubator/lcf/branches/release-0.1-incubating-branch/README.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.1-incubating-branch/README.txt?rev=1056739&r1=1056738&r2=1056739&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.1-incubating-branch/README.txt (original)
+++ incubator/lcf/branches/release-0.1-incubating-branch/README.txt Sat Jan 8 17:18:46 2011
@@ -129,3 +129,102 @@ Contact
http://incubator.apache.org/connectors
+=========================================================================
+== Jetty Notice ==
+=========================================================================
+==============================================================
+ Jetty Web Container
+ Copyright 1995-2006 Mort Bay Consulting Pty Ltd
+==============================================================
+
+This product includes some software developed at The Apache Software
+Foundation (http://www.apache.org/).
+
+The javax.servlet package used by Jetty is copyright
+Sun Microsystems, Inc and Apache Software Foundation. It is
+distributed under the Common Development and Distribution License.
+You can obtain a copy of the license at
+https://glassfish.dev.java.net/public/CDDLv1.0.html.
+
+The UnixCrypt.java code ~Implements the one way cryptography used by
+Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
+modified April 2001 by Iris Van den Broeke, Daniel Deville.
+
+The default JSP implementation is provided by the Glassfish JSP engine
+from project Glassfish http://glassfish.dev.java.net. Copyright 2005
+Sun Microsystems, Inc. and portions Copyright Apache Software Foundation.
+
+Some portions of the code are Copyright:
+ 2006 Tim Vernum
+ 1999 Jason Gilbert.
+
+The jboss integration module contains some LGPL code.
+
+=========================================================================
+== HSQLDB Notice ==
+=========================================================================
+
+For content, code, and products originally developed by Thomas Mueller and the Hypersonic SQL Group:
+
+Copyright (c) 1995-2000 by the Hypersonic SQL Group.
+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 the Hypersonic SQL Group 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 HYPERSONIC SQL GROUP,
+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.
+
+This software consists of voluntary contributions made by many individuals on behalf of the
+Hypersonic SQL Group.
+
+For work added by the HSQL Development Group (a.k.a. hsqldb_lic.txt):
+
+Copyright (c) 2001-2005, The HSQL Development Group
+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 the HSQL Development Group 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 HSQL DEVELOPMENT GROUP, HSQLDB.ORG,
+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.