Various corrects to files headers resulting from the 2.0-M4-RC2 review

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

46 files changed, 334 insertions, 169 deletions

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd
index a6cdfb2be5..f803c354cd 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd
@@ -1,3 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
+     OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
 	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
 	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
diff --git a/java/sca/modules/extensibility/NOTICE b/java/sca/modules/extensibility/NOTICE
index 25bb89c9b2..e158aa1bfd 100644
--- a/java/sca/modules/extensibility/NOTICE
+++ b/java/sca/modules/extensibility/NOTICE
@@ -4,3 +4,7 @@ Copyright (c) 2005 - 2009 The Apache Software Foundation
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
+This product includes software developed at
+the OSGi Alliance (http://www.osgi.org/).
+
+
diff --git a/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/LDAPFilter.java b/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/LDAPFilter.java
index a998ea8506..8d3630baa4 100644
--- a/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/LDAPFilter.java
+++ b/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/LDAPFilter.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) OSGi Alliance (2005, 2009). All Rights Reserved.
+ * 
+ * Licensed 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.
+ */
+
 package org.apache.tuscany.sca.extensibility.impl;
 
 import java.lang.reflect.AccessibleObject;
diff --git a/java/sca/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAGenericApplicationContext.java b/java/sca/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAGenericApplicationContext.java
index c1aaf1570f..6426306f26 100644
--- a/java/sca/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAGenericApplicationContext.java
+++ b/java/sca/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAGenericApplicationContext.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
 package org.apache.tuscany.sca.implementation.spring.runtime.context;
 
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
diff --git a/java/sca/modules/node-impl-osgi/NOTICE b/java/sca/modules/node-impl-osgi/NOTICE
index 25bb89c9b2..6f390de5e6 100644
--- a/java/sca/modules/node-impl-osgi/NOTICE
+++ b/java/sca/modules/node-impl-osgi/NOTICE
@@ -4,3 +4,6 @@ Copyright (c) 2005 - 2009 The Apache Software Foundation
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
+This product includes software developed at
+the OSGi Alliance (http://www.osgi.org/).
+
diff --git a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/EndpointListener.java b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/EndpointListener.java
index 94c08b7632..316cac081b 100644
--- a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/EndpointListener.java
+++ b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/EndpointListener.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) OSGi Alliance (2008, 2009). All Rights Reserved.
+ *
+ * Licensed 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.
+ */
 package org.apache.tuscany.sca.osgi.remoteserviceadmin;
 
 /**
diff --git a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/EndpointPermission.java b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/EndpointPermission.java
index 4aca1ffb9c..74f913583e 100644
--- a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/EndpointPermission.java
+++ b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/EndpointPermission.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) OSGi Alliance (2008, 2009). All Rights Reserved.
+ *
+ * Licensed 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.
+ */
 package org.apache.tuscany.sca.osgi.remoteserviceadmin;
 
 // TODO Hacked from ServiePermission
diff --git a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/ExportRegistration.java b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/ExportRegistration.java
index a2d6f58a3b..0e747293cb 100644
--- a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/ExportRegistration.java
+++ b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/ExportRegistration.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) OSGi Alliance (2008, 2009). All Rights Reserved.
+ *
+ * Licensed 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.
+ */
 package org.apache.tuscany.sca.osgi.remoteserviceadmin;
 
 import org.osgi.framework.ServiceReference;
diff --git a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/ImportRegistration.java b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/ImportRegistration.java
index ae9726e798..0346902383 100644
--- a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/ImportRegistration.java
+++ b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/ImportRegistration.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) OSGi Alliance (2008, 2009). All Rights Reserved.
+ *
+ * Licensed 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.
+ */
 package org.apache.tuscany.sca.osgi.remoteserviceadmin;
 
 import org.osgi.framework.ServiceReference;
diff --git a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteConstants.java b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteConstants.java
index c3f16aecb7..afc3355c38 100644
--- a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteConstants.java
+++ b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteConstants.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) OSGi Alliance (2008, 2009). All Rights Reserved.
+ *
+ * Licensed 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.
+ */
 package org.apache.tuscany.sca.osgi.remoteserviceadmin;
 
 /**
diff --git a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteServiceAdmin.java b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteServiceAdmin.java
index 09ad0635f3..dade67c096 100644
--- a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteServiceAdmin.java
+++ b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteServiceAdmin.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) OSGi Alliance (2008, 2009). All Rights Reserved.
+ *
+ * Licensed 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.
+ */
 package org.apache.tuscany.sca.osgi.remoteserviceadmin;
 
 import java.util.Collection;
diff --git a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteServiceAdminEvent.java b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteServiceAdminEvent.java
index bdb083b940..d0eda01f6e 100644
--- a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteServiceAdminEvent.java
+++ b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteServiceAdminEvent.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) OSGi Alliance (2008, 2009). All Rights Reserved.
+ *
+ * Licensed 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.
+ */
 package org.apache.tuscany.sca.osgi.remoteserviceadmin;
 
 import org.osgi.framework.Bundle;
diff --git a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteServiceAdminListener.java b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteServiceAdminListener.java
index 28a5958704..40f68a4ba8 100644
--- a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteServiceAdminListener.java
+++ b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/RemoteServiceAdminListener.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) OSGi Alliance (2008, 2009). All Rights Reserved.
+ *
+ * Licensed 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.
+ */
 package org.apache.tuscany.sca.osgi.remoteserviceadmin;
 
 /**
diff --git a/java/sca/modules/sca-api/LICENSE b/java/sca/modules/sca-api/LICENSE
index 617c69079b..de4b130f35 100644
--- a/java/sca/modules/sca-api/LICENSE
+++ b/java/sca/modules/sca-api/LICENSE
@@ -201,43 +201,4 @@
    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/java/sca/modules/sca-api/NOTICE b/java/sca/modules/sca-api/NOTICE
index 12fdd031e7..6f390de5e6 100644
--- a/java/sca/modules/sca-api/NOTICE
+++ b/java/sca/modules/sca-api/NOTICE
@@ -4,10 +4,6 @@ Copyright (c) 2005 - 2009 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,
-37 Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
-38 Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+This product includes software developed at
+the OSGi Alliance (http://www.osgi.org/).
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ComponentContext.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ComponentContext.java
index 5ba145ce49..740003fc12 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ComponentContext.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ComponentContext.java
@@ -1,9 +1,6 @@
 /*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.
  */
 package org.oasisopen.sca;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java
index 44045a404d..261b9baaf1 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java
@@ -1,9 +1,20 @@
 /*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 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
  * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ *   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.    
  */
 package org.oasisopen.sca;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/RequestContext.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/RequestContext.java
index e77934d44d..d12648a795 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/RequestContext.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/RequestContext.java
@@ -1,9 +1,6 @@
 /*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.
  */
 package org.oasisopen.sca;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceReference.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceReference.java
index 05c39cb04b..d89ed54d10 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceReference.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceReference.java
@@ -1,9 +1,6 @@
 /*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.
  */
 package org.oasisopen.sca;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceRuntimeException.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceRuntimeException.java
index d11c1904c5..70c429dcc2 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceRuntimeException.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceRuntimeException.java
@@ -1,9 +1,6 @@
 /*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.
  */
 package org.oasisopen.sca;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceUnavailableException.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceUnavailableException.java
index 5d8e4af6ff..39cd6b1cac 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceUnavailableException.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceUnavailableException.java
@@ -1,9 +1,6 @@
 /*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.
  */
 package org.oasisopen.sca;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AllowsPassByReference.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AllowsPassByReference.java
index e005da2414..d394a64f91 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AllowsPassByReference.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AllowsPassByReference.java
@@ -1,9 +1,6 @@
 /*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.
  */
 package org.oasisopen.sca.annotation;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authentication.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authentication.java
index cfc0af0318..483fe2f293 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authentication.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authentication.java
@@ -1,9 +1,6 @@
 /*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.
  */
 package org.oasisopen.sca.annotation;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Callback.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Callback.java
index b8d71dac05..03598e10d0 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Callback.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Callback.java
@@ -1,9 +1,6 @@
 /*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.
  */
 package org.oasisopen.sca.annotation;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ComponentName.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ComponentName.java
index 8fc3cd4013..7debe2ba89 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ComponentName.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ComponentName.java
@@ -1,9 +1,6 @@
 /*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.
  */
 package org.oasisopen.sca.annotation;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Confidentiality.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Confidentiality.java
index 5c594bc7d3..5481a988b6 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Confidentiality.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Confidentiality.java
@@ -1,9 +1,6 @@
 /*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.
  */
 package org.oasisopen.sca.annotation;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Constructor.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Constructor.java
index a5728e51d4..c1c99de683 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Constructor.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Constructor.java
@@ -1,9 +1,6 @@
 /*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.
  */
 package org.oasisopen.sca.annotation;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Context.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Context.java
index e7f7aef069..fce0334792 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Context.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Context.java
@@ -1,9 +1,6 @@
 /*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.
  */
 package org.oasisopen.sca.annotation;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Destroy.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Destroy.java
index 2ad6fdc892..f9c6505648 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Destroy.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Destroy.java
@@ -1,9 +1,6 @@
 /*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.
  */
 package org.oasisopen.sca.annotation;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EagerInit.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EagerInit.java
index d53e9e4fc4..a8e415a00b 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EagerInit.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EagerInit.java
@@ -1,9 +1,6 @@
 /*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.
  */
 package org.oasisopen.sca.annotation;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Init.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Init.java
index 3fe9bf585f..b8b38a1088 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Init.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Init.java
@@ -1,9 +1,6 @@
 /*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.
  */
 package org.oasisopen.sca.annotation;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Integrity.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Integrity.java
index 0c196f1ce5..14cd5ec005 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Integrity.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Integrity.java
@@ -1,9 +1,6 @@
 /*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.
  */
 package org.oasisopen.sca.annotation;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Intent.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Intent.java
index c3e9914f23..54a1935859 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Intent.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Intent.java
@@ -1,9 +1,6 @@
 /*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.
  */
 package org.oasisopen.sca.annotation;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/OneWay.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/OneWay.java
index 458d05cc92..700e71990c 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/OneWay.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/OneWay.java
@@ -1,9 +1,6 @@
 /*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.
  */
 package org.oasisopen.sca.annotation;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/PolicySets.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/PolicySets.java
index 150d8dabc8..69f5828045 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/PolicySets.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/PolicySets.java
@@ -1,9 +1,6 @@
 /*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.
  */
 package org.oasisopen.sca.annotation;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Qualifier.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Qualifier.java
index a5fd102859..97204fdf32 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Qualifier.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Qualifier.java
@@ -1,9 +1,6 @@
 /*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.
  */
 package org.oasisopen.sca.annotation;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Reference.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Reference.java
index 9a7154fcf3..8f7d6b2043 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Reference.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Reference.java
@@ -1,9 +1,6 @@
 /*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.
  */
 package org.oasisopen.sca.annotation;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Remotable.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Remotable.java
index 77ff4e26f9..3f7ac2623a 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Remotable.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Remotable.java
@@ -1,9 +1,6 @@
 /*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.
  */
 package org.oasisopen.sca.annotation;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java
index d90eb5512d..08eb0a8935 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java
@@ -1,9 +1,6 @@
 /*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.
  */
 package org.oasisopen.sca.annotation;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Scope.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Scope.java
index b719355c73..8f9a13430e 100644
--- a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Scope.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Scope.java
@@ -1,9 +1,6 @@
 /*
- * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
- * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
- * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
- * 
- * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.
  */
 package org.oasisopen.sca.annotation;
 
diff --git a/java/sca/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientJavaTestService.java b/java/sca/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientJavaTestService.java
index 8b19af7a52..8c84b4f372 100644
--- a/java/sca/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientJavaTestService.java
+++ b/java/sca/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientJavaTestService.java
@@ -1,3 +1,21 @@
+/*
+ * 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.    
+ */
 package helloworldrest;
 
 import org.apache.tuscany.sca.node.Node;
diff --git a/java/sca/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientTestServiceWebapp.java b/java/sca/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientTestServiceWebapp.java
index fb83b26315..31ff956185 100644
--- a/java/sca/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientTestServiceWebapp.java
+++ b/java/sca/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientTestServiceWebapp.java
@@ -1,3 +1,21 @@
+/*
+ * 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.    
+ */
 package helloworldrest;
 
 import java.io.BufferedReader;
diff --git a/java/sca/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldService.java b/java/sca/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldService.java
index fb9d3e2f82..7e33b15efc 100644
--- a/java/sca/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldService.java
+++ b/java/sca/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldService.java
@@ -1,3 +1,21 @@
+/*
+ * 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.    
+ */
 package helloworldrest;
 
 import org.oasisopen.sca.annotation.Remotable;
diff --git a/java/sca/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldServiceImpl.java b/java/sca/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldServiceImpl.java
index cacb88b5e3..d4441c0ab8 100644
--- a/java/sca/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldServiceImpl.java
+++ b/java/sca/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldServiceImpl.java
@@ -1,3 +1,21 @@
+/*
+ * 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.    
+ */
 package helloworldrest;
 
 import javax.ws.rs.Consumes;
diff --git a/java/sca/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties b/java/sca/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
index a23399569a..902842a19e 100644
--- a/java/sca/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
+++ b/java/sca/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
@@ -1,3 +1,19 @@
+#
+#    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.
+#
 
 # Resource strings used by the <stripes:errors> tag when there are no nested tags
 stripes.errors.header=<div style="color:#b72222; font-weight: bold">Please fix the following errors:</div><ol>
diff --git a/java/sca/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties b/java/sca/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties
index 77fa204a15..2741999098 100644
--- a/java/sca/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties
+++ b/java/sca/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties
@@ -1,3 +1,20 @@
+#
+#    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.
+#
+
 # log4j.properties
 
 # Set up a logger to the console