TUSCANY-2620, TUSCANY-2628 - correct my last change for these JIRA by only including the required license and copyright statement in the files. Also I notice that the copyright is different between the SCA Java Annotations and APIs spec and the SCA JEE spec

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@700902 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 6 insertions, 23 deletions

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 99efccfefd..0085d7e5ee 100644
--- a/branches/sca-java-1.3.2/modules/host-webapp/LICENSE
+++ b/branches/sca-java-1.3.2/modules/host-webapp/LICENSE
@@ -212,7 +212,7 @@ 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:
+The module host-webapp includes files 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
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 f4ffee5e60..c73281e470 100644
--- a/branches/sca-java-1.3.2/modules/host-webapp/NOTICE
+++ b/branches/sca-java-1.3.2/modules/host-webapp/NOTICE
@@ -10,4 +10,3 @@ This product also includes software under the Service Component Architecture spe
 (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 8694da5901..91ee6cb922 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,26 +1,10 @@
 <?xml version = '1.0' encoding = 'ISO-8859-1'?>

 <!--

- * 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,   

+(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.

+

+see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications

  -->

 

 <!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">