Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 40563 invoked from network); 4 Dec 2006 18:40:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Dec 2006 18:40:35 -0000 Received: (qmail 76510 invoked by uid 500); 4 Dec 2006 18:40:43 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 76487 invoked by uid 500); 4 Dec 2006 18:40:43 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 76476 invoked by uid 99); 4 Dec 2006 18:40:43 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Dec 2006 10:40:43 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Dec 2006 10:40:34 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id A2F251A9846; Mon, 4 Dec 2006 10:39:52 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r482283 - in /geronimo/server/branches/1.2: applications/console/geronimo-console-core/ applications/console/geronimo-console-ear/ applications/console/geronimo-console-framework/ applications/console/geronimo-console-standard/ applications... Date: Mon, 04 Dec 2006 18:39:47 -0000 To: scm@geronimo.apache.org From: kevan@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061204183952.A2F251A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kevan Date: Mon Dec 4 10:39:46 2006 New Revision: 482283 URL: http://svn.apache.org/viewvc?view=rev&rev=482283 Log: Update Web Console notice.txt w/ ibm donation information, add copyright to assembly notice files, and remove ASF v 1.1 license from source borrowed from xerces project Modified: geronimo/server/branches/1.2/applications/console/geronimo-console-core/NOTICE.txt geronimo/server/branches/1.2/applications/console/geronimo-console-ear/NOTICE.txt geronimo/server/branches/1.2/applications/console/geronimo-console-framework/NOTICE.txt geronimo/server/branches/1.2/applications/console/geronimo-console-standard/NOTICE.txt geronimo/server/branches/1.2/applications/geronimo-remote-deploy/NOTICE.txt geronimo/server/branches/1.2/applications/geronimo-welcome/NOTICE.txt geronimo/server/branches/1.2/assemblies/geronimo-boilerplate-j2ee/NOTICE.txt geronimo/server/branches/1.2/assemblies/geronimo-boilerplate-minimal/NOTICE.txt geronimo/server/branches/1.2/assemblies/geronimo-framework/NOTICE.txt geronimo/server/branches/1.2/assemblies/geronimo-jetty-j2ee/NOTICE.txt geronimo/server/branches/1.2/assemblies/geronimo-jetty-minimal/NOTICE.txt geronimo/server/branches/1.2/assemblies/geronimo-tomcat-j2ee/NOTICE.txt geronimo/server/branches/1.2/assemblies/geronimo-tomcat-minimal/NOTICE.txt geronimo/server/branches/1.2/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/EncodingInfo.java geronimo/server/branches/1.2/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/Encodings.java Modified: geronimo/server/branches/1.2/applications/console/geronimo-console-core/NOTICE.txt URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/applications/console/geronimo-console-core/NOTICE.txt?view=diff&rev=482283&r1=482282&r2=482283 ============================================================================== --- geronimo/server/branches/1.2/applications/console/geronimo-console-core/NOTICE.txt (original) +++ geronimo/server/branches/1.2/applications/console/geronimo-console-core/NOTICE.txt Mon Dec 4 10:39:46 2006 @@ -4,3 +4,8 @@ This product includes software developed by The Apache Software Foundation (http://www.apache.org/). +Portions of the Web Console 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 "IBM Console CLA". Modified: geronimo/server/branches/1.2/applications/console/geronimo-console-ear/NOTICE.txt URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/applications/console/geronimo-console-ear/NOTICE.txt?view=diff&rev=482283&r1=482282&r2=482283 ============================================================================== --- geronimo/server/branches/1.2/applications/console/geronimo-console-ear/NOTICE.txt (original) +++ geronimo/server/branches/1.2/applications/console/geronimo-console-ear/NOTICE.txt Mon Dec 4 10:39:46 2006 @@ -4,3 +4,8 @@ This product includes software developed by The Apache Software Foundation (http://www.apache.org/). +Portions of the Web Console 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 "IBM Console CLA". Modified: geronimo/server/branches/1.2/applications/console/geronimo-console-framework/NOTICE.txt URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/applications/console/geronimo-console-framework/NOTICE.txt?view=diff&rev=482283&r1=482282&r2=482283 ============================================================================== --- geronimo/server/branches/1.2/applications/console/geronimo-console-framework/NOTICE.txt (original) +++ geronimo/server/branches/1.2/applications/console/geronimo-console-framework/NOTICE.txt Mon Dec 4 10:39:46 2006 @@ -4,3 +4,8 @@ This product includes software developed by The Apache Software Foundation (http://www.apache.org/). +Portions of the Web Console 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 "IBM Console CLA". Modified: geronimo/server/branches/1.2/applications/console/geronimo-console-standard/NOTICE.txt URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/applications/console/geronimo-console-standard/NOTICE.txt?view=diff&rev=482283&r1=482282&r2=482283 ============================================================================== --- geronimo/server/branches/1.2/applications/console/geronimo-console-standard/NOTICE.txt (original) +++ geronimo/server/branches/1.2/applications/console/geronimo-console-standard/NOTICE.txt Mon Dec 4 10:39:46 2006 @@ -4,3 +4,8 @@ This product includes software developed by The Apache Software Foundation (http://www.apache.org/). +Portions of the Web Console 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 "IBM Console CLA". Modified: geronimo/server/branches/1.2/applications/geronimo-remote-deploy/NOTICE.txt URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/applications/geronimo-remote-deploy/NOTICE.txt?view=diff&rev=482283&r1=482282&r2=482283 ============================================================================== --- geronimo/server/branches/1.2/applications/geronimo-remote-deploy/NOTICE.txt (original) +++ geronimo/server/branches/1.2/applications/geronimo-remote-deploy/NOTICE.txt Mon Dec 4 10:39:46 2006 @@ -3,9 +3,3 @@ This product includes software developed by The Apache Software Foundation (http://www.apache.org/). - -Portions of the Web Console 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 "IBM Console CLA". Modified: geronimo/server/branches/1.2/applications/geronimo-welcome/NOTICE.txt URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/applications/geronimo-welcome/NOTICE.txt?view=diff&rev=482283&r1=482282&r2=482283 ============================================================================== --- geronimo/server/branches/1.2/applications/geronimo-welcome/NOTICE.txt (original) +++ geronimo/server/branches/1.2/applications/geronimo-welcome/NOTICE.txt Mon Dec 4 10:39:46 2006 @@ -3,9 +3,3 @@ This product includes software developed by The Apache Software Foundation (http://www.apache.org/). - -Portions of the Web Console 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 "IBM Console CLA". Modified: geronimo/server/branches/1.2/assemblies/geronimo-boilerplate-j2ee/NOTICE.txt URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/assemblies/geronimo-boilerplate-j2ee/NOTICE.txt?view=diff&rev=482283&r1=482282&r2=482283 ============================================================================== --- geronimo/server/branches/1.2/assemblies/geronimo-boilerplate-j2ee/NOTICE.txt (original) +++ geronimo/server/branches/1.2/assemblies/geronimo-boilerplate-j2ee/NOTICE.txt Mon Dec 4 10:39:46 2006 @@ -1,3 +1,6 @@ +Apache Geronimo +Copyright 2003-2006 The Apache Software Foundation + This product includes software developed by The Apache Software Foundation (http://www.apache.org/). Modified: geronimo/server/branches/1.2/assemblies/geronimo-boilerplate-minimal/NOTICE.txt URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/assemblies/geronimo-boilerplate-minimal/NOTICE.txt?view=diff&rev=482283&r1=482282&r2=482283 ============================================================================== --- geronimo/server/branches/1.2/assemblies/geronimo-boilerplate-minimal/NOTICE.txt (original) +++ geronimo/server/branches/1.2/assemblies/geronimo-boilerplate-minimal/NOTICE.txt Mon Dec 4 10:39:46 2006 @@ -1,3 +1,6 @@ +Apache Geronimo +Copyright 2003-2006 The Apache Software Foundation + This product includes software developed by The Apache Software Foundation (http://www.apache.org/). Modified: geronimo/server/branches/1.2/assemblies/geronimo-framework/NOTICE.txt URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/assemblies/geronimo-framework/NOTICE.txt?view=diff&rev=482283&r1=482282&r2=482283 ============================================================================== --- geronimo/server/branches/1.2/assemblies/geronimo-framework/NOTICE.txt (original) +++ geronimo/server/branches/1.2/assemblies/geronimo-framework/NOTICE.txt Mon Dec 4 10:39:46 2006 @@ -1,3 +1,6 @@ +Apache Geronimo +Copyright 2003-2006 The Apache Software Foundation + This product includes software developed by The Apache Software Foundation (http://www.apache.org/). Modified: geronimo/server/branches/1.2/assemblies/geronimo-jetty-j2ee/NOTICE.txt URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/assemblies/geronimo-jetty-j2ee/NOTICE.txt?view=diff&rev=482283&r1=482282&r2=482283 ============================================================================== --- geronimo/server/branches/1.2/assemblies/geronimo-jetty-j2ee/NOTICE.txt (original) +++ geronimo/server/branches/1.2/assemblies/geronimo-jetty-j2ee/NOTICE.txt Mon Dec 4 10:39:46 2006 @@ -1,3 +1,6 @@ +Apache Geronimo +Copyright 2003-2006 The Apache Software Foundation + This product includes software developed by The Apache Software Foundation (http://www.apache.org/). Modified: geronimo/server/branches/1.2/assemblies/geronimo-jetty-minimal/NOTICE.txt URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/assemblies/geronimo-jetty-minimal/NOTICE.txt?view=diff&rev=482283&r1=482282&r2=482283 ============================================================================== --- geronimo/server/branches/1.2/assemblies/geronimo-jetty-minimal/NOTICE.txt (original) +++ geronimo/server/branches/1.2/assemblies/geronimo-jetty-minimal/NOTICE.txt Mon Dec 4 10:39:46 2006 @@ -1,3 +1,6 @@ +Apache Geronimo +Copyright 2003-2006 The Apache Software Foundation + This product includes software developed by The Apache Software Foundation (http://www.apache.org/). Modified: geronimo/server/branches/1.2/assemblies/geronimo-tomcat-j2ee/NOTICE.txt URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/assemblies/geronimo-tomcat-j2ee/NOTICE.txt?view=diff&rev=482283&r1=482282&r2=482283 ============================================================================== --- geronimo/server/branches/1.2/assemblies/geronimo-tomcat-j2ee/NOTICE.txt (original) +++ geronimo/server/branches/1.2/assemblies/geronimo-tomcat-j2ee/NOTICE.txt Mon Dec 4 10:39:46 2006 @@ -1,3 +1,6 @@ +Apache Geronimo +Copyright 2003-2006 The Apache Software Foundation + This product includes software developed by The Apache Software Foundation (http://www.apache.org/). Modified: geronimo/server/branches/1.2/assemblies/geronimo-tomcat-minimal/NOTICE.txt URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/assemblies/geronimo-tomcat-minimal/NOTICE.txt?view=diff&rev=482283&r1=482282&r2=482283 ============================================================================== --- geronimo/server/branches/1.2/assemblies/geronimo-tomcat-minimal/NOTICE.txt (original) +++ geronimo/server/branches/1.2/assemblies/geronimo-tomcat-minimal/NOTICE.txt Mon Dec 4 10:39:46 2006 @@ -1,3 +1,6 @@ +Apache Geronimo +Copyright 2003-2006 The Apache Software Foundation + This product includes software developed by The Apache Software Foundation (http://www.apache.org/). Modified: geronimo/server/branches/1.2/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/EncodingInfo.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/EncodingInfo.java?view=diff&rev=482283&r1=482282&r2=482283 ============================================================================== --- geronimo/server/branches/1.2/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/EncodingInfo.java (original) +++ geronimo/server/branches/1.2/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/EncodingInfo.java Mon Dec 4 10:39:46 2006 @@ -14,62 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the 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 "Xerces" 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 and was - * originally based on software copyright (c) 1999, International - * Business Machines, Inc., http://www.apache.org. For more - * information on the Apache Software Foundation, please see - * . - */ /* * This code has been borrowed from the Apache Xerces project. We're copying the code to Modified: geronimo/server/branches/1.2/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/Encodings.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/Encodings.java?view=diff&rev=482283&r1=482282&r2=482283 ============================================================================== --- geronimo/server/branches/1.2/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/Encodings.java (original) +++ geronimo/server/branches/1.2/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/Encodings.java Mon Dec 4 10:39:46 2006 @@ -14,62 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * The Apache Software License, Version 1.1 - * - * - * Copyright (c) 1999 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 "Xerces" 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 and was - * originally based on software copyright (c) 1999, International - * Business Machines, Inc., http://www.apache.org. For more - * information on the Apache Software Foundation, please see - * . - */ /* * This code has been borrowed from the Apache Xerces project. We're copying the code to