From 81137dd2153f6f2ab0a8bc48b4f9b2f866a97996 Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 26 Sep 2008 16:58:36 +0000
Subject: TUSCANY-2620 change sca.tld to OSOA spec license

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@699410 13f79535-47bb-0310-9956-ffa450edef68
---
 .../sca-java-1.3.2/modules/host-webapp/LICENSE     | 38 +++++++++++++++++++++-
 branches/sca-java-1.3.2/modules/host-webapp/NOTICE |  7 ++++
 .../src/main/resources/META-INF/sca.tld            | 37 ++++++++++++---------
 3 files changed, 65 insertions(+), 17 deletions(-)

(limited to 'branches/sca-java-1.3.2/modules/host-webapp')

diff --git a/branches/sca-java-1.3.2/modules/host-webapp/LICENSE b/branches/sca-java-1.3.2/modules/host-webapp/LICENSE
index 8aa906c321..99efccfefd 100644
--- a/branches/sca-java-1.3.2/modules/host-webapp/LICENSE
+++ b/branches/sca-java-1.3.2/modules/host-webapp/LICENSE
@@ -201,5 +201,41 @@
    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.
+
+===============================================================================
+The module host-webapp includes the file sca.tld under the following 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
+that you include the following on ALL copies of the Service Component Architecture Specification, or
+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
+
+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,
 
diff --git a/branches/sca-java-1.3.2/modules/host-webapp/NOTICE b/branches/sca-java-1.3.2/modules/host-webapp/NOTICE
index fdfa0e9faa..f4ffee5e60 100644
--- a/branches/sca-java-1.3.2/modules/host-webapp/NOTICE
+++ b/branches/sca-java-1.3.2/modules/host-webapp/NOTICE
@@ -4,3 +4,10 @@ Copyright (c) 2005 - 2008 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 Service Component Architecture specification license
+(see the LICENSE file contained in this distribution) with the following copyright
+
+(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.
+
diff --git a/branches/sca-java-1.3.2/modules/host-webapp/src/main/resources/META-INF/sca.tld b/branches/sca-java-1.3.2/modules/host-webapp/src/main/resources/META-INF/sca.tld
index 089cdc1607..8694da5901 100644
--- a/branches/sca-java-1.3.2/modules/host-webapp/src/main/resources/META-INF/sca.tld
+++ b/branches/sca-java-1.3.2/modules/host-webapp/src/main/resources/META-INF/sca.tld
@@ -1,21 +1,26 @@
 <?xml version = '1.0' encoding = 'ISO-8859-1'?>
 <!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.    
+ * 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:
+ * 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,   
  -->
 
 <!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd">
-- 
cgit v1.2.3