TUSCANY-2628 Change some ASL2 licenses to OSOA licenses to cover material that comes from the OSOA specs

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

39 files changed, 764 insertions, 546 deletions

diff --git a/branches/sca-java-1.3.2/distribution/src/main/release/CHANGES b/branches/sca-java-1.3.2/distribution/src/main/release/CHANGES
index ca92d6e287..763ab8421b 100644
--- a/branches/sca-java-1.3.2/distribution/src/main/release/CHANGES
+++ b/branches/sca-java-1.3.2/distribution/src/main/release/CHANGES
@@ -2,6 +2,8 @@ Changes With Apache Tuscany SCA 1.3.2 October 2008
 ==================================================

 

 Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

+  * TUSCANY-2628 Fix some other file license headers that should refer to the OSOA license

+  * TUSCANY-2620 Fix license header for sca.tld

   * TUSCANY-2618 Add required attribute elements to sca.tld

   * TUSCANY-2615 Fix NPE in databinding and a nested exception test in vtests

   * TUSCANY-2614 Fix missing headers reported by RAT during release

diff --git a/branches/sca-java-1.3.2/distribution/src/main/release/bin/LICENSE b/branches/sca-java-1.3.2/distribution/src/main/release/bin/LICENSE
index 29230ea3ec..cc6777527c 100644
--- a/branches/sca-java-1.3.2/distribution/src/main/release/bin/LICENSE
+++ b/branches/sca-java-1.3.2/distribution/src/main/release/bin/LICENSE
@@ -2426,7 +2426,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ================================================================================
 
-The module host-webapp includes the file sca.tld under the following license:
+The tuscany-host-webapp and tuscany-sca-api jars include 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/distribution/src/main/release/src/LICENSE b/branches/sca-java-1.3.2/distribution/src/main/release/src/LICENSE
index f9a25b40bc..05bfe735c8 100644
--- a/branches/sca-java-1.3.2/distribution/src/main/release/src/LICENSE
+++ b/branches/sca-java-1.3.2/distribution/src/main/release/src/LICENSE
@@ -398,7 +398,7 @@ times remain with copyright holders.
 
 =================================================================================================================
 
-The module host-webapp includes the file sca.tld under the following license:
+The modules host-webapp and sca-api include 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/sca-api/LICENSE b/branches/sca-java-1.3.2/modules/sca-api/LICENSE
index 8aa906c321..c533022613 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/LICENSE
+++ b/branches/sca-java-1.3.2/modules/sca-api/LICENSE
@@ -201,5 +201,43 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+===============================================================================
+
+Apache Tuscany SCA for Java Subcomponents
+=========================================: 
+
+The Tuscany SCA for Java release includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+===============================================================================
+The module sca-api includes a number of 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
+that you include the following on ALL copies of the Service Component Architecture Specification, or
+portions thereof, that you make:
+
+1. A link or URL to the Service Component Architecture Specification at this location:
+· http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+
+2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+
+BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+necessary to implement the Service Component Architecture Specification.
+THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+publicity pertaining to the Service Component Architecture Specification or its contents without specific,
+
 
 
diff --git a/branches/sca-java-1.3.2/modules/sca-api/NOTICE b/branches/sca-java-1.3.2/modules/sca-api/NOTICE
index fdfa0e9faa..4e8f7596ea 100644
--- a/branches/sca-java-1.3.2/modules/sca-api/NOTICE
+++ b/branches/sca-java-1.3.2/modules/sca-api/NOTICE
@@ -4,3 +4,11 @@ Copyright (c) 2005 - 2008 The Apache Software Foundation
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
+This product also includes software under the Service Component Architecture specification license
+(see the LICENSE file contained in this distribution) with the following copyright
+
+(c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA
+Technologies, Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens
+AG., Software AG., Sun Microsystems, Inc., Sybase Inc., TIBCO Software Inc., 2005, 2008. All rights reserved.
+
+
diff --git a/branches/sca-java-1.3.2/modules/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 c32d229a76..3f66f44ad2 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 616d4c6338..4937f5a55c 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 64423a4aa2..205b6a0e20 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 63e3907cff..c2ed31bcbf 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 7c067a3a43..0553f664a3 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 900d5eecc1..ca600999c1 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 8790aac4fb..e89ba09566 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 1c6b436afa..f9c6b1edac 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 d3543799ed..0a3a17108b 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 bab9713026..16d0e0368c 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 1d1ecdbc13..ba7b5e4502 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 a9fc36f769..539913613d 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 477053670a..f920adffe2 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 f54e421c81..be44de35df 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 86d2d6560d..6e3c09a060 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 37f767c1f4..286eba1eae 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 1484d4ac77..73b750be85 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 13ca9a2931..3cfab46661 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 f16bf44808..c346060da5 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 7d3da46ea9..ae9301fc7a 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 b9483bc9a8..546ccd293f 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 9e6942651b..fab6b48dd3 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 32654fea17..259715b8f9 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 1a9288934c..67d41bfb4c 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 0769a94fbb..7c2d1eede9 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 fbc7398da4..5e74686b94 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 57247cd8a3..6122ec67b5 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 864a69b19a..6f6d3e3258 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 a0abe16068..1f1fb0d90c 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 768429cd91..7a490d2cdb 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 1021f6e37f..a2b7d5ac5e 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 aa439cabab..4da5b4a433 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 6fded2dec8..849ceb8b1f 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 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 1e475cd4c8..ca6c40d27c 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,20 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * Permission to copy, display and distribute the Service Component Architecture Specification and/or
+ * portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided
+ * that you include the following on ALL copies of the Service Component Architecture Specification, or
+ * portions thereof, that you make:
+ * 1. A link or URL to the Service Component Architecture Specification at this location:
+ *    http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * 2. The full text of the copyright notice as shown in the Service Component Architecture Specification.
+ * BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave,
+ * SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a
+ * royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem
+ * necessary to implement the Service Component Architecture Specification.
+ * THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE
+ * AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+ * REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS,
+ * INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+ * THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL
+ * OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
+ * DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
+ * The name and trademarks of the Authors may NOT be used in any manner, including advertising or
+ * publicity pertaining to the Service Component Architecture Specification or its contents without specific,   
  */
 package org.osoa.sca.annotations;