You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cd...@apache.org on 2013/02/08 18:56:23 UTC

svn commit: r1444168 [1/3] - in /cocoon/branches/BRANCH_2_1_X: CREDITS.txt LICENSE.txt NOTICE.txt legal/LICENSE.txt legal/NOTICE.txt

Author: cdamioli
Date: Fri Feb  8 17:56:23 2013
New Revision: 1444168

URL: http://svn.apache.org/r1444168
Log:
COCOON-2330 Release separate source and dependencies packages 

Added:
    cocoon/branches/BRANCH_2_1_X/legal/LICENSE.txt   (with props)
    cocoon/branches/BRANCH_2_1_X/legal/NOTICE.txt   (with props)
Modified:
    cocoon/branches/BRANCH_2_1_X/CREDITS.txt
    cocoon/branches/BRANCH_2_1_X/LICENSE.txt
    cocoon/branches/BRANCH_2_1_X/NOTICE.txt

Modified: cocoon/branches/BRANCH_2_1_X/CREDITS.txt
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/CREDITS.txt?rev=1444168&r1=1444167&r2=1444168&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/CREDITS.txt (original)
+++ cocoon/branches/BRANCH_2_1_X/CREDITS.txt Fri Feb  8 17:56:23 2013
@@ -45,58 +45,6 @@ The initial code of the official Cocoon 
 evolved from the CoWarp donation made by Carsten Ziegeler (cziegeler@osoco.org).
 
 
- Credits of included software
- ----------------------------
-
-This product includes software developed by the Apache Software Foundation 
-(http://www.apache.org/).
-
-This product includes software developed by the XML:DB Initiative 
-(http://www.xmldb.org/).
-
-This product includes software developed by the IronSmith Project 
-(http://www.ironsmith.org/).
-
-This product includes software developed by the jfor Project 
-(http://www.jfor.org).
-
-This product includes software developed by the JDOM Project 
-(http://www.jdom.org/).
-
-This product includes software developed by the OpenORB Community Project 
-(http://sourceforge.net/projects/openorb/).
-
-This product includes software developed by the Chaperon Project
-(http://www.sourceforge.net/projects/chaperon/).
-
-This product includes software developed by the Exolab Project
-(http://www.exolab.org/).
-
-This product includes software developed by ANTLR Project
-(http://www.antlr.org/)
-
-
-Portions are Copyright (c) 2001 Tivano Software GmbH
-(http://www.tivano.de). All Rights Reserved.
-
-Portions are Copyright (c) 1998-2000 World Wide Web Consortium 
-(Massachusetts Institute of Technology, Institut National de Recherche en
-Informatique et en Automatique, Keio University). All Rights Reserved.
-
-Portions are Copyright (c) 2001 Scott Robert Ladd. All rights reserved.
-
-Portions are Copyright (c) 2001, 2002 Thai Open Source Software Center Ltd.
-All rights reserved.
-
-Portions are Copyright (c) Mort Bay Consulting Pty. Ltd. All rights reserved.
-
-Portions are Copyright (c) Hewlett-Packard Company 2002. All rights reserved.
-
-Schematron portions are Copyright (c) 2000,2001 Rick Jelliffe and Academia
-Sinica Computing Center, Taiwan
-
-
-
 
                                                  The Apache Cocoon Community
                                                   http://cocoon.apache.org/

Modified: cocoon/branches/BRANCH_2_1_X/LICENSE.txt
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/LICENSE.txt?rev=1444168&r1=1444167&r2=1444168&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/LICENSE.txt (original)
+++ cocoon/branches/BRANCH_2_1_X/LICENSE.txt Fri Feb  8 17:56:23 2013
@@ -174,28 +174,3 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

Modified: cocoon/branches/BRANCH_2_1_X/NOTICE.txt
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/NOTICE.txt?rev=1444168&r1=1444167&r2=1444168&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/NOTICE.txt (original)
+++ cocoon/branches/BRANCH_2_1_X/NOTICE.txt Fri Feb  8 17:56:23 2013
@@ -1,5 +1,5 @@
 Apache Cocoon
-Copyright 1999-2012 The Apache Software Foundation.
+Copyright 1999-2013 The Apache Software Foundation.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).