From 4be971f98025e5d7dbf1031eafb1fa400b35a0f2 Mon Sep 17 00:00:00 2001 From: nash Date: Tue, 2 Nov 2010 20:55:15 +0000 Subject: TUSCANY-3764: Fix problems and inconsistencies in LICENSE and NOTICE files git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1030212 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca-java-1.6.1/modules/assembly-xsd/LICENSE | 85 ++++++++++++++-------- .../sca-java-1.6.1/modules/assembly-xsd/NOTICE | 17 ----- 2 files changed, 56 insertions(+), 46 deletions(-) (limited to 'sca-java-1.x/branches/sca-java-1.6.1/modules/assembly-xsd') diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/assembly-xsd/LICENSE b/sca-java-1.x/branches/sca-java-1.6.1/modules/assembly-xsd/LICENSE index 646cd58e09..ab5e82e6c7 100644 --- a/sca-java-1.x/branches/sca-java-1.6.1/modules/assembly-xsd/LICENSE +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/assembly-xsd/LICENSE @@ -202,50 +202,75 @@ limitations under the License. +================================================================================ -=============================================================================== +APACHE TUSCANY SCA SUBCOMPONENTS: -Apache Tuscany SCA for Java Subcomponents -=========================================: +Apache Tuscany SCA for Java includes a number of subcomponents with +separate copyright notices and license terms. Your use of these subcomponents +is subject to the terms and conditions of the following licenses. -The Tuscany SCA for Java release includes a number of subcomponents with -separate copyright notices and license terms. Your use of the source -code for the these subcomponents is subject to the terms and -conditions of the following licenses. +================================================================================ -=============================================================================== +This module assembly-xsd includes XSD files under the following copyrights and license: -This module includes XSD files under the following SCA Collaboration license: +Copyright Notices -License for the Service Component Architecture JavaDoc, Interface Definition files and XSD files. +(C) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, +Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase +Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. -Permission to copy, make derivative works of, and distribute the Service Component Architecture -JavaDoc, Interface Definition Files and XSD files in any medium without fee or royalty as part -of a compliant implementation of the Service Component Architecture Specification is hereby granted. -The Service Components Architecture Specification may be found at the following location: +(C) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA +Technologies, Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens +AG., Software AG., Sun Microsystems, Inc., Sybase Inc., TIBCO Software Inc., 2005, 2008. All rights reserved. - http://www.osoa.org/download/attachments/35/SCA_AssemblyModel_V100.pdf +License -THE SERVICE COMPONENT ARCHITECTURE SPECIFICATION AND THE JAVADOC, INTERFACE DEFINITION FILES AND XSD FILES -ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS -SPECIFICATION OR THE JAVADOC, INTERFACE DEFINITION FILES AND XSD FILES AND THE IMPLEMENTATION OF THEIR CONTENTS, -INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, -NON-INFRINGEMENT OR TITLE. THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, -INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE -SERVICE COMPONENT ARCHITECTURE SPECIFICATION OR THE JAVADOC, INTERFACE DEFINTION FILES OR XSD FILES. +Permission to copy, display and distribute the Service Component Architecture Specification and/or +portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided +that you include the following on ALL copies of the Service Component Architecture Specification, or +portions thereof, that you make: -The name and trademarks of the Authors may NOT be used in any manner, including advertising or -publicity pertaining to the Service Component Architecture Specification or its contents without specific, -written prior permission. Title to copyright in the Service Component Architecture Specification and the -JavaDoc, Interface Definition Files and XSD Files will at all times remain with the Authors. +1. A link or URL to the Service Component Architecture Specification at this location: +· http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + +2. The full text of the copyright notice as shown in the Service Component Architecture Specification. + +BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave, +SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a +royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem +necessary to implement the Service Component Architecture Specification. + +THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE +AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, +REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS, +INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE. + +THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL +OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR +DISTRIBUTION OF THE Service Components Architecture SPECIFICATION. + +The name and trademarks of the Authors may NOT be used in any manner, including advertising or +publicity pertaining to the Service Component Architecture Specification or its contents without specific, +written prior permission. Title to copyright in the Service Component Architecture Specification +will at all times remain with the Authors. No other rights are granted by implication, estoppel or otherwise. -=============================================================================== +================================================================================ + +This module assembly-xsd includes files under the following copyright and license: -This module includes XSD files under the following W3C(r) Software License: +Copyright (c) 2004 World Wide Web Consortium (Massachusetts Institute of Technology, +European Research Consortium for Informatics and Mathematics, Keio University). +All Rights Reserved. This work is distributed under the W3C(r) Software License [1] +in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied +warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -W3C(r) SOFTWARE NOTICE AND LICENSE + [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 + +W3CŪ SOFTWARE NOTICE AND LICENSE http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 This work (and included software, documentation such as READMEs, or other related items) @@ -279,3 +304,5 @@ The name and trademarks of copyright holders may NOT be used in advertising or p pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders. + +================================================================================ diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/assembly-xsd/NOTICE b/sca-java-1.x/branches/sca-java-1.6.1/modules/assembly-xsd/NOTICE index 49ff935a41..ad2ba40961 100644 --- a/sca-java-1.x/branches/sca-java-1.6.1/modules/assembly-xsd/NOTICE +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/assembly-xsd/NOTICE @@ -4,20 +4,3 @@ Copyright (c) 2005 - 2010 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). -This product also includes software under the SCA Collaboration license -(see the LICENSE file contained in this distribution), with the following -copyright: - -(c) Copyright SCA Collaboration 2006, 2007 - -This product also includes software under the W3C(r) Software License -(see the LICENSE file contained in this distribution), with the following -copyright: - -Copyright (c) 2004 World Wide Web Consortium (Massachusetts Institute of Technology, -European Research Consortium for Informatics and Mathematics, Keio University). -All Rights Reserved. This work is distributed under the W3C(r) Software License [1] -in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied -warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 -- cgit v1.2.3