geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tki...@apache.org
Subject svn commit: r669541 - in /geronimo/devtools/eclipse-plugin/trunk: COPYRIGHT LICENSE.txt NOTICE.txt
Date Thu, 19 Jun 2008 16:32:29 GMT
Author: tkirby
Date: Thu Jun 19 09:32:29 2008
New Revision: 669541

URL: http://svn.apache.org/viewvc?rev=669541&view=rev
Log:
cleanup COPYRIGHT, NOTICE and LICENSE files:
move IBM copyright from COPYRIGHT into NOTICE, and remove the COPYRIGHT file, to comply with
standards.
use license text from server in the plugin, with formatting change of Bouncy Castle LICENSE.
Add indication of the parts of the code to which each license applies.

Removed:
    geronimo/devtools/eclipse-plugin/trunk/COPYRIGHT
Modified:
    geronimo/devtools/eclipse-plugin/trunk/LICENSE.txt
    geronimo/devtools/eclipse-plugin/trunk/NOTICE.txt

Modified: geronimo/devtools/eclipse-plugin/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/LICENSE.txt?rev=669541&r1=669540&r2=669541&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/LICENSE.txt (original)
+++ geronimo/devtools/eclipse-plugin/trunk/LICENSE.txt Thu Jun 19 09:32:29 2008
@@ -201,27 +201,41 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+#########################################################################
+## ADDITIONAL SOURCE LICENSES                                          ##
+#########################################################################
+
+The ASN1 codec implementation in the geronimo-crypto module was
+developed by the Bouncy Castle project. (http://www.bouncycastle.org/).
+Use of the source code, thus licensed, and the resultant binary are 
+subject to the terms and conditions of the following license.
+
 =========================================================================
-==  Bouncy Castle License                                              ==
+==  Bouncy Castle License (ASN1 codec in geronimo-util)                ==
 =========================================================================
 
 The Bouncy Castle License
 
-Copyright (c) 2000-2005 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+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.
 
-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.
 

Modified: geronimo/devtools/eclipse-plugin/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/NOTICE.txt?rev=669541&r1=669540&r2=669541&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/NOTICE.txt (original)
+++ geronimo/devtools/eclipse-plugin/trunk/NOTICE.txt Thu Jun 19 09:32:29 2008
@@ -6,12 +6,32 @@
 Apache Geronimo Eclipse Plugin
 Copyright 2003-2007 The Apache Software Foundation
 
+For the server adapter code (in plugins/org.apache.geronimo.st.*):
+
 Portions of the Eclipse Geronimo Server Adapter were originally 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".
 
+The following copyright notice(s) were affixed to portions of this code
+with which this file is now or was at one time distributed
+and are placed here unaltered.
+
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - Initial API and implementation
+ *******************************************************************************/
+
+For the geronimo-util jar in org.apache.geronimo.runtime.v20,
+and the geronimo-crypto jar in org.apache.geronimo.runtime.v21:
+
 =========================================================================
 ==  Bouncy Castle Notice                                               ==
 =========================================================================



Mime
View raw message