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

1 files changed, 29 insertions, 11 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/sca-api/LICENSE b/sca-java-1.x/branches/sca-java-1.6.1/modules/sca-api/LICENSE
index 617c69079b..af46767486 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/sca-api/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/sca-api/LICENSE
@@ -201,18 +201,30 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
-===============================================================================
 
-Apache Tuscany SCA for Java Subcomponents
-=========================================: 
+================================================================================
 
-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.
+APACHE TUSCANY SCA SUBCOMPONENTS:
 
-===============================================================================
-The module sca-api includes a number of files under the following license:
+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.
+
+================================================================================
+
+This module sca-api includes files under the following copyrights and license:
+
+Copyright Notices
+
+(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.
+
+(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.
+
+License
 
 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
@@ -220,7 +232,7 @@ that you include the following on ALL copies of the Service Component Architectu
 portions thereof, that you make:
 
 1. A link or URL to the Service Component Architecture Specification at this location:
-  http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+· 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.
 
@@ -228,16 +240,22 @@ BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Re
 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.
 
-
+================================================================================