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

40 files changed, 195 insertions, 743 deletions

diff --git a/branches/sca-java-1.3.2/distribution/src/main/release/bin/NOTICE b/branches/sca-java-1.3.2/distribution/src/main/release/bin/NOTICE
index 8cdb09a554..2682347ca8 100644
--- a/branches/sca-java-1.3.2/distribution/src/main/release/bin/NOTICE
+++ b/branches/sca-java-1.3.2/distribution/src/main/release/bin/NOTICE
@@ -103,6 +103,13 @@ This product includes/uses Jaxen (http://jaxen.codehaus.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
+(C) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+37 Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+38 Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+
+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/distribution/src/main/release/src/NOTICE b/branches/sca-java-1.3.2/distribution/src/main/release/src/NOTICE
index dc47e840a7..5a635d485d 100644
--- a/branches/sca-java-1.3.2/distribution/src/main/release/src/NOTICE
+++ b/branches/sca-java-1.3.2/distribution/src/main/release/src/NOTICE
@@ -39,7 +39,14 @@ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 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
+(C) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+37 Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+38 Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+
+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/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">

diff --git a/branches/sca-java-1.3.2/modules/sca-api/NOTICE b/branches/sca-java-1.3.2/modules/sca-api/NOTICE
index 4e8f7596ea..4fe77f0e58 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/NOTICE
+++ b/branches/sca-java-1.3.2/modules/sca-api/NOTICE
@@ -7,8 +7,7 @@ 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.
-
+(c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+37 Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+38 Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
index 3f66f44ad2..7f6756bcbd 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
index 4937f5a55c..7deea08001 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
index 205b6a0e20..12733a7bd2 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
index c2ed31bcbf..2e3b71fd1c 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
index 0553f664a3..0a0c2afff9 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
index ca600999c1..cdcfa9a791 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
index e89ba09566..8da6bcd1f3 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
index f9c6b1edac..70f5f904a4 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
index 0a3a17108b..dd6b1c3242 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
index 16d0e0368c..556dd4e68e 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
index ba7b5e4502..f7fca41212 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
index 539913613d..0ee613fdcb 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
index f920adffe2..bc73d22c9d 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
index be44de35df..25ade6f091 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
index 6e3c09a060..bc09c8ccdd 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
index 286eba1eae..baacb2f520 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
index 73b750be85..e9fcfee2d3 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
index 3cfab46661..b2f6f17129 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
index c346060da5..f0350f8ff5 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
index ae9301fc7a..d65558653b 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
index 546ccd293f..21bf986705 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
index fab6b48dd3..c65ff5838f 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
index 259715b8f9..d610e21d64 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
index 67d41bfb4c..a8cf28475b 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
index 7c2d1eede9..fc925aa402 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
index 5e74686b94..eaf9e3207c 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
index 6122ec67b5..b22a6a840c 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
index 6f6d3e3258..71af35634d 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
index 1f1fb0d90c..44388bea74 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
index 7a490d2cdb..4d71b3f357 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
index a2b7d5ac5e..53d58b7dc1 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
index 4da5b4a433..3af699de07 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
index 849ceb8b1f..cd88df1128 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
index ca6c40d27c..62f4abdbee 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
+++ b/branches/sca-java-1.3.2/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
@@ -1,25 +1,9 @@
 /*
- * 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., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;