diff --git a/discovery/org.eclipse.tm.discovery-feature/feature.xml b/discovery/org.eclipse.tm.discovery-feature/feature.xml
index bbf4ec51ad2..9a48d9d0863 100644
--- a/discovery/org.eclipse.tm.discovery-feature/feature.xml
+++ b/discovery/org.eclipse.tm.discovery-feature/feature.xml
@@ -1,4 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
+     Copyright (c) 2005, 2009 IBM Corporation and others.
+     All rights reserved. This program and the accompanying materials
+     are made available under the terms of the Eclipse Public License v1.0
+     which accompanies this distribution, and is available at
+     http://www.eclipse.org/legal/epl-v10.html
+    
+     Contributors:
+         IBM Corporation - initial API and implementation
+ -->
+
 <feature
       id="org.eclipse.tm.discovery"
       label="%featureName"
diff --git a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/build.properties b/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/build.properties
index 472e1ebb3a4..7ef3fa39c6e 100644
--- a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/build.properties
+++ b/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/build.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials 
 # are made available under the terms of the Eclipse Public License v1.0 
 # which accompanies this distribution, and is available at 
diff --git a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/plugin.properties b/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/plugin.properties
index 802d1936a6c..f4e518d62dc 100644
--- a/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/plugin.properties
+++ b/discovery/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/plugin.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006, 2007 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials 
 # are made available under the terms of the Eclipse Public License v1.0 
 # which accompanies this distribution, and is available at 
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/buildDoc.xml b/discovery/org.eclipse.tm.discovery.doc.isv/buildDoc.xml
index f3eb9749456..42931ef4040 100644
--- a/discovery/org.eclipse.tm.discovery.doc.isv/buildDoc.xml
+++ b/discovery/org.eclipse.tm.discovery.doc.isv/buildDoc.xml
@@ -1,4 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
+     Copyright (c) 2005, 2007 IBM Corporation and others.
+     All rights reserved. This program and the accompanying materials
+     are made available under the terms of the Eclipse Public License v1.0
+     which accompanies this distribution, and is available at
+     http://www.eclipse.org/legal/epl-v10.html
+    
+     Contributors:
+         IBM Corporation - initial API and implementation
+ -->
+
 <project name="TM Service Discovery ISV Doc Build" default="all" basedir=".">
 
 	<property name="javadoc.link.location" value="${basedir}/javadoc.link.location"/>
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/customBuildCallbacks.xml b/discovery/org.eclipse.tm.discovery.doc.isv/customBuildCallbacks.xml
index 7e14739e639..772c7793b95 100644
--- a/discovery/org.eclipse.tm.discovery.doc.isv/customBuildCallbacks.xml
+++ b/discovery/org.eclipse.tm.discovery.doc.isv/customBuildCallbacks.xml
@@ -1,3 +1,13 @@
+<!--
+     Copyright (c) 2005, 2007 IBM Corporation and others.
+     All rights reserved. This program and the accompanying materials
+     are made available under the terms of the Eclipse Public License v1.0
+     which accompanies this distribution, and is available at
+     http://www.eclipse.org/legal/epl-v10.html
+    
+     Contributors:
+         IBM Corporation - initial API and implementation
+ -->
 <!-- ===================================================================== -->
 <!-- Custom targets called from a project's generated build.xml            -->
 <!-- Set customBuildCallbacks=<path/to/this/file> in your build.properties.-->
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/plugin.xml b/discovery/org.eclipse.tm.discovery.doc.isv/plugin.xml
index c98822571e1..853daffd49f 100644
--- a/discovery/org.eclipse.tm.discovery.doc.isv/plugin.xml
+++ b/discovery/org.eclipse.tm.discovery.doc.isv/plugin.xml
@@ -1,4 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
+     Copyright (c) 2005, 2007 IBM Corporation and others.
+     All rights reserved. This program and the accompanying materials
+     are made available under the terms of the Eclipse Public License v1.0
+     which accompanies this distribution, and is available at
+     http://www.eclipse.org/legal/epl-v10.html
+    
+     Contributors:
+         IBM Corporation - initial API and implementation
+ -->
+
 <plugin>
 
    <extension point="org.eclipse.help.toc">
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/toc.xml b/discovery/org.eclipse.tm.discovery.doc.isv/toc.xml
index 9ffe6e7c57d..c52b64f222e 100644
--- a/discovery/org.eclipse.tm.discovery.doc.isv/toc.xml
+++ b/discovery/org.eclipse.tm.discovery.doc.isv/toc.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
+
<!--
+     Copyright (c) 2005, 2007 IBM Corporation and others.
+     All rights reserved. This program and the accompanying materials
+     are made available under the terms of the Eclipse Public License v1.0
+     which accompanies this distribution, and is available at
+     http://www.eclipse.org/legal/epl-v10.html
+    
+     Contributors:
+         IBM Corporation - initial API and implementation
+ -->
 
 <toc label="Service Discovery Developer Guide">
 	
diff --git a/discovery/org.eclipse.tm.discovery.engine/plugin.properties b/discovery/org.eclipse.tm.discovery.engine/plugin.properties
index 0644d8150f8..4fdd7ad90bd 100644
--- a/discovery/org.eclipse.tm.discovery.engine/plugin.properties
+++ b/discovery/org.eclipse.tm.discovery.engine/plugin.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006, 2007 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials 
 # are made available under the terms of the Eclipse Public License v1.0 
 # which accompanies this distribution, and is available at 
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.properties b/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.properties
index 7ce562a3d8c..e41ea49bd2f 100644
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.properties
+++ b/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006, 2007 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials 
 # are made available under the terms of the Eclipse Public License v1.0 
 # which accompanies this distribution, and is available at 
diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/plugin.properties b/discovery/org.eclipse.tm.discovery.transport.udp/plugin.properties
index 3ab521f61f5..84ec0537a54 100644
--- a/discovery/org.eclipse.tm.discovery.transport.udp/plugin.properties
+++ b/discovery/org.eclipse.tm.discovery.transport.udp/plugin.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006, 2007 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials 
 # are made available under the terms of the Eclipse Public License v1.0 
 # which accompanies this distribution, and is available at 
diff --git a/discovery/org.eclipse.tm.discovery.view/plugin.properties b/discovery/org.eclipse.tm.discovery.view/plugin.properties
index b87495e0e92..7d435511c42 100644
--- a/discovery/org.eclipse.tm.discovery.view/plugin.properties
+++ b/discovery/org.eclipse.tm.discovery.view/plugin.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006, 2007 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials 
 # are made available under the terms of the Eclipse Public License v1.0 
 # which accompanies this distribution, and is available at 
diff --git a/discovery/org.eclipse.tm.discovery.wizard/plugin.properties b/discovery/org.eclipse.tm.discovery.wizard/plugin.properties
index d3124db746e..695408b45e9 100644
--- a/discovery/org.eclipse.tm.discovery.wizard/plugin.properties
+++ b/discovery/org.eclipse.tm.discovery.wizard/plugin.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006, 2007 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials 
 # are made available under the terms of the Eclipse Public License v1.0 
 # which accompanies this distribution, and is available at 
diff --git a/releng/org.eclipse.tm.releng.master-feature/feature.xml b/releng/org.eclipse.tm.releng.master-feature/feature.xml
index 05ad324a775..9a718bbe636 100644
--- a/releng/org.eclipse.tm.releng.master-feature/feature.xml
+++ b/releng/org.eclipse.tm.releng.master-feature/feature.xml
@@ -1,4 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
+     Copyright (c) 2008, 2009 Wind River Systems, Inc. and others.
+     All rights reserved. This program and the accompanying materials
+     are made available under the terms of the Eclipse Public License v1.0
+     which accompanies this distribution, and is available at
+     http://www.eclipse.org/legal/epl-v10.html
+    
+     Contributors:
+         IBM Corporation - initial API and implementation
+ -->
+
 <feature
       id="org.eclipse.tm.releng.master"
       label="%featureName"
diff --git a/rse/features/org.eclipse.rse.telnet-feature/feature.xml b/rse/features/org.eclipse.rse.telnet-feature/feature.xml
index 8c78a5c20de..daae98e9839 100644
--- a/rse/features/org.eclipse.rse.telnet-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.telnet-feature/feature.xml
@@ -1,4 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
+     Copyright (c) 2005, 2009 IBM Corporation and others.
+     All rights reserved. This program and the accompanying materials
+     are made available under the terms of the Eclipse Public License v1.0
+     which accompanies this distribution, and is available at
+     http://www.eclipse.org/legal/epl-v10.html
+    
+     Contributors:
+         IBM Corporation - initial API and implementation
+ -->
+
 <feature
       id="org.eclipse.rse.telnet"
       label="%featureName"
diff --git a/rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.xml b/rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.xml
index dc1adedb20c..f4676153ed2 100644
--- a/rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.xml
+++ b/rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.xml
@@ -1,4 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
+     Copyright (c) 2005, 2009 IBM Corporation and others.
+     All rights reserved. This program and the accompanying materials
+     are made available under the terms of the Eclipse Public License v1.0
+     which accompanies this distribution, and is available at
+     http://www.eclipse.org/legal/epl-v10.html
+    
+     Contributors:
+         IBM Corporation - initial API and implementation
+ -->
+
 <feature
       id="org.eclipse.rse.telnet.source"
       label="%featureName"
diff --git a/rse/features/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/build.properties b/rse/features/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/build.properties
index 6f847084449..368ee86fb5f 100644
--- a/rse/features/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/build.properties
+++ b/rse/features/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/build.properties
@@ -1,11 +1,11 @@
 ###############################################################################
-# Copyright (c) 2000, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
+#  Copyright (c) 2000, 2009 IBM Corporation and others.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
 #     IBM Corporation - initial API and implementation
 #     Martin Oberhuber (Wind River) - Use eclipse32.png feature image
 ###############################################################################
diff --git a/rse/features/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/plugin.properties b/rse/features/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/plugin.properties
index b06a538dd81..1f96ba7cd8b 100644
--- a/rse/features/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/plugin.properties
+++ b/rse/features/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/plugin.properties
@@ -1,11 +1,11 @@
 ###############################################################################
-# Copyright (c) 2000, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
+#  Copyright (c) 2000, 2009 IBM Corporation and others.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 pluginName=RSE Telnet Service Source
diff --git a/rse/features/org.eclipse.rse.terminals-feature/feature.xml b/rse/features/org.eclipse.rse.terminals-feature/feature.xml
index 229f0c80b5b..96ad85dc9e8 100644
--- a/rse/features/org.eclipse.rse.terminals-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.terminals-feature/feature.xml
@@ -1,4 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
+     Copyright (c) 2005, 2009 IBM Corporation and others.
+     All rights reserved. This program and the accompanying materials
+     are made available under the terms of the Eclipse Public License v1.0
+     which accompanies this distribution, and is available at
+     http://www.eclipse.org/legal/epl-v10.html
+    
+     Contributors:
+         IBM Corporation - initial API and implementation
+ -->
+
 <feature
       id="org.eclipse.rse.terminals"
       label="%featureName"
diff --git a/rse/features/org.eclipse.rse.useractions-feature/feature.xml b/rse/features/org.eclipse.rse.useractions-feature/feature.xml
index 5e2689be1d7..0a8fa03f26c 100644
--- a/rse/features/org.eclipse.rse.useractions-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.useractions-feature/feature.xml
@@ -1,4 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
+     Copyright (c) 2005, 2009 IBM Corporation and others.
+     All rights reserved. This program and the accompanying materials
+     are made available under the terms of the Eclipse Public License v1.0
+     which accompanies this distribution, and is available at
+     http://www.eclipse.org/legal/epl-v10.html
+    
+     Contributors:
+         IBM Corporation - initial API and implementation
+ -->
+
 <feature
       id="org.eclipse.rse.useractions"
       label="%featureName"
diff --git a/rse/features/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/build.properties b/rse/features/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/build.properties
index 667b3960647..135359553cc 100644
--- a/rse/features/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/build.properties
+++ b/rse/features/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/build.properties
@@ -1,13 +1,13 @@
 ###############################################################################
-# Copyright (c) 2000, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
+#  Copyright (c) 2000, 2009 IBM Corporation and others.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
 #     IBM Corporation - initial API and implementation
-# Martin Oberhuber (Wind River) - Adapted from rse.dstore-feature
+#  Martin Oberhuber (Wind River) - Adapted from rse.dstore-feature
 ###############################################################################
 bin.includes = about.html, about.ini, about.mappings, about.properties, dsdp32.png, plugin.properties, plugin.xml, src/, META-INF/
 sourcePlugin = true
diff --git a/rse/features/org.eclipse.rse.useractions.wrapper-feature/feature.xml b/rse/features/org.eclipse.rse.useractions.wrapper-feature/feature.xml
index 6c18e8fb205..ce95ab8f901 100644
--- a/rse/features/org.eclipse.rse.useractions.wrapper-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.useractions.wrapper-feature/feature.xml
@@ -1,4 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
+     Copyright (c) 2005, 2008 IBM Corporation and others.
+     All rights reserved. This program and the accompanying materials
+     are made available under the terms of the Eclipse Public License v1.0
+     which accompanies this distribution, and is available at
+     http://www.eclipse.org/legal/epl-v10.html
+    
+     Contributors:
+         IBM Corporation - initial API and implementation
+ -->
+
 <feature
       id="org.eclipse.rse.useractions.wrapper"
       label="%featureName"
diff --git a/rse/features/org.eclipse.rse.wince.wrapper-feature/feature.xml b/rse/features/org.eclipse.rse.wince.wrapper-feature/feature.xml
index 3eba5538d20..cb842fa832e 100644
--- a/rse/features/org.eclipse.rse.wince.wrapper-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.wince.wrapper-feature/feature.xml
@@ -1,4 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
+     Copyright (c) 2005, 2008 IBM Corporation and others.
+     All rights reserved. This program and the accompanying materials
+     are made available under the terms of the Eclipse Public License v1.0
+     which accompanies this distribution, and is available at
+     http://www.eclipse.org/legal/epl-v10.html
+    
+     Contributors:
+         IBM Corporation - initial API and implementation
+ -->
+
 <feature
       id="org.eclipse.rse.wince.wrapper"
       label="%featureName"
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/plugin.properties b/rse/plugins/org.eclipse.rse.subsystems.shells.core/plugin.properties
index 6c474fd720e..4ac02e9b7c1 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/plugin.properties
@@ -1,11 +1,11 @@
 ###############################################################################
-# Copyright (c) 2000, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
+#  Copyright (c) 2000, 2009 IBM Corporation and others.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteOutput.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteOutput.java
index be464d44b88..2b4abd601f1 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteOutput.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteOutput.java
@@ -1,18 +1,18 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
+ *  Copyright (c) 2002, 2009 IBM Corporation and others.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
  * 
- * Contributors:
- * {Name} (company) - description of contribution.
+ *  Initial Contributors:
+ *  The following IBM employees contributed to the Remote System Explorer
+ *  component that contains this file: David McKnight, Kushal Munir, 
+ *  Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
+ *  Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
+ * 
+ *  Contributors:
+ *  {Name} (company) - description of contribution.
  *******************************************************************************/
 
 package org.eclipse.rse.subsystems.shells.core.model;
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteCmdSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteCmdSubSystem.java
index 4a02a6ac36a..74b80bc89d4 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteCmdSubSystem.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteCmdSubSystem.java
@@ -1,20 +1,21 @@
-/********************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
+/*******************************************************************************
+ *  Copyright (c) 2002, 2008 IBM Corporation and others.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
  * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
+ *  Initial Contributors:
+ *  The following IBM employees contributed to the Remote System Explorer
+ *  component that contains this file: David McKnight, Kushal Munir, 
+ *  Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
+ *  Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
  * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
- * David McKnight  (IBM)  - [208813] removing deprecated APIs
- * David McKnight  (IBM)  - [247533] [apidoc] IRemoteCmdSubSystem#runCommand() Javadocs do not match implementation
- ********************************************************************************/
+ *  Contributors:
+ *  Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
+ *  David McKnight  (IBM)  - [208813] removing deprecated APIs
+ *  David McKnight  (IBM)  - [247533] [apidoc] IRemoteCmdSubSystem#runCommand() Javadocs do not match implementation
+ *******************************************************************************/
 
 package org.eclipse.rse.subsystems.shells.core.subsystems;
 
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/plugin.properties b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/plugin.properties
index 68dd1b40015..699cda8fcc5 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/plugin.properties
@@ -1,18 +1,18 @@
 ###############################################################################
-# Copyright (c) 2006, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Initial Contributors:
-# The following IBM employees contributed to the Remote System Explorer
-# component that contains this file: David McKnight, Kushal Munir, 
-# Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
-# Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
+#  Copyright (c) 2006, 2009 IBM Corporation and others.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
 # 
-# Contributors:
-# {Name} (company) - description of contribution.
+#  Initial Contributors:
+#  The following IBM employees contributed to the Remote System Explorer
+#  component that contains this file: David McKnight, Kushal Munir, 
+#  Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
+#  Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
+# 
+#  Contributors:
+#  {Name} (company) - description of contribution.
 ###############################################################################
 
 # NLS_MESSAGEFORMAT_NONE
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.local/plugin.properties b/rse/plugins/org.eclipse.rse.subsystems.shells.local/plugin.properties
index 4200d8735f0..13aa9c66f05 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.local/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.local/plugin.properties
@@ -1,18 +1,18 @@
 ###############################################################################
-# Copyright (c) 2006, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Initial Contributors:
-# The following IBM employees contributed to the Remote System Explorer
-# component that contains this file: David McKnight, Kushal Munir, 
-# Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
-# Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
+#  Copyright (c) 2006, 2009 IBM Corporation and others.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
 # 
-# Contributors:
-# {Name} (company) - description of contribution.
+#  Initial Contributors:
+#  The following IBM employees contributed to the Remote System Explorer
+#  component that contains this file: David McKnight, Kushal Munir, 
+#  Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
+#  Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
+# 
+#  Contributors:
+#  {Name} (company) - description of contribution.
 ###############################################################################
 
 # NLS_MESSAGEFORMAT_NONE
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/SshShellSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/SshShellSubSystemConfiguration.java
index e966cb732b8..fdeea23490b 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/SshShellSubSystemConfiguration.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/SshShellSubSystemConfiguration.java
@@ -1,19 +1,19 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
+ *  Copyright (c) 2006, 2009 IBM Corporation and others.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
  * 
- * Contributors:
- * Martin Oberhuber (Wind River) - Adapted template for ssh service.
- * Anna Dushistova  (MontaVista) - [259414][api] refactor the "SSH Shell" to use the generic Terminal->IHostShell converter
+ *  Initial Contributors:
+ *  The following IBM employees contributed to the Remote System Explorer
+ *  component that contains this file: David McKnight, Kushal Munir, 
+ *  Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
+ *  Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
+ * 
+ *  Contributors:
+ *  Martin Oberhuber (Wind River) - Adapted template for ssh service.
+ *  Anna Dushistova  (MontaVista) - [259414][api] refactor the "SSH Shell" to use the generic Terminal->IHostShell converter
  *******************************************************************************/
 
 package org.eclipse.rse.subsystems.shells.ssh;
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/src/org/eclipse/rse/subsystems/shells/telnet/TelnetShellSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/src/org/eclipse/rse/subsystems/shells/telnet/TelnetShellSubSystemConfiguration.java
index ecf3515e36e..1d0889b8d07 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/src/org/eclipse/rse/subsystems/shells/telnet/TelnetShellSubSystemConfiguration.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/src/org/eclipse/rse/subsystems/shells/telnet/TelnetShellSubSystemConfiguration.java
@@ -1,20 +1,20 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
+ *  Copyright (c) 2006, 2008 IBM Corporation and others.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
  * 
- * Contributors:
- * Martin Oberhuber (Wind River) - Adapted template for ssh service.
- * Sheldon D'souza  (Celunite)   - Adapted template for telnet service
- * Anna Dushistova  (MontaVista) - [240523] [rseterminals] Provide a generic adapter factory that adapts any ITerminalService to an IShellService
+ *  Initial Contributors:
+ *  The following IBM employees contributed to the Remote System Explorer
+ *  component that contains this file: David McKnight, Kushal Munir, 
+ *  Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
+ *  Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
+ * 
+ *  Contributors:
+ *  Martin Oberhuber (Wind River) - Adapted template for ssh service.
+ *  Sheldon D'souza  (Celunite)   - Adapted template for telnet service
+ *  Anna Dushistova  (MontaVista) - [240523] [rseterminals] Provide a generic adapter factory that adapts any ITerminalService to an IShellService
  *******************************************************************************/
 package org.eclipse.rse.subsystems.shells.telnet;
 
diff --git a/rse/plugins/org.eclipse.rse.terminals.ui/build.properties b/rse/plugins/org.eclipse.rse.terminals.ui/build.properties
index a25e49d16f8..46130628812 100644
--- a/rse/plugins/org.eclipse.rse.terminals.ui/build.properties
+++ b/rse/plugins/org.eclipse.rse.terminals.ui/build.properties
@@ -1,11 +1,11 @@
 ###############################################################################
-# Copyright (c) 2005, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
+#  Copyright (c) 2005, 2009 IBM Corporation and others.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 source.. = src/
diff --git a/rse/plugins/org.eclipse.rse.ui.capabilities/plugin.xml b/rse/plugins/org.eclipse.rse.ui.capabilities/plugin.xml
index a611d077db2..622c60b62d6 100644
--- a/rse/plugins/org.eclipse.rse.ui.capabilities/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.ui.capabilities/plugin.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
+<?eclipse version="3.2"?>
<!--
+     Copyright (c) 2009 Wind River Systems, Inc. and others.
+     All rights reserved. This program and the accompanying materials
+     are made available under the terms of the Eclipse Public License v1.0
+     which accompanies this distribution, and is available at
+     http://www.eclipse.org/legal/epl-v10.html
+    
+     Contributors:
+         IBM Corporation - initial API and implementation
+ -->
+
 <plugin>
 
 	<extension
diff --git a/rse/plugins/org.eclipse.rse.useractions/build.properties b/rse/plugins/org.eclipse.rse.useractions/build.properties
index 33d074a72be..04ac30eddea 100644
--- a/rse/plugins/org.eclipse.rse.useractions/build.properties
+++ b/rse/plugins/org.eclipse.rse.useractions/build.properties
@@ -1,13 +1,13 @@
 ###############################################################################
-# Copyright (c) 2002, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#  Copyright (c) 2002, 2009 IBM Corporation and others.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
 # 
-# Contributors:
+#  Contributors:
 #     IBM Corporation - initial API and implementation
-# Martin Oberhuber (Wind River) - Add branding for useractions feature
+#  Martin Oberhuber (Wind River) - Add branding for useractions feature
 ###############################################################################
 source.. = src/
 output.. = bin/
diff --git a/rse/plugins/org.eclipse.rse.useractions/plugin.xml b/rse/plugins/org.eclipse.rse.useractions/plugin.xml
index 496e7f73486..272a8a84a99 100644
--- a/rse/plugins/org.eclipse.rse.useractions/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.useractions/plugin.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
+<?eclipse version="3.0"?>
<!--
+     Copyright (c) 2005, 2008 IBM Corporation and others.
+     All rights reserved. This program and the accompanying materials
+     are made available under the terms of the Eclipse Public License v1.0
+     which accompanies this distribution, and is available at
+     http://www.eclipse.org/legal/epl-v10.html
+    
+     Contributors:
+         IBM Corporation - initial API and implementation
+ -->
+
 <plugin>
 
    
diff --git a/rse/tests/org.eclipse.rse.tests-feature/feature.xml b/rse/tests/org.eclipse.rse.tests-feature/feature.xml
index 2031fba0a3f..c79f9473ac1 100644
--- a/rse/tests/org.eclipse.rse.tests-feature/feature.xml
+++ b/rse/tests/org.eclipse.rse.tests-feature/feature.xml
@@ -1,4 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
+     Copyright (c) 2005, 2009 IBM Corporation and others.
+     All rights reserved. This program and the accompanying materials
+     are made available under the terms of the Eclipse Public License v1.0
+     which accompanies this distribution, and is available at
+     http://www.eclipse.org/legal/epl-v10.html
+    
+     Contributors:
+         IBM Corporation - initial API and implementation
+ -->
+
 <feature
       id="org.eclipse.rse.tests"
       label="%featureName"
diff --git a/rse/tests/org.eclipse.rse.tests.framework.examples/plugin.xml b/rse/tests/org.eclipse.rse.tests.framework.examples/plugin.xml
index 9dc4684dc6e..d37eff098a7 100755
--- a/rse/tests/org.eclipse.rse.tests.framework.examples/plugin.xml
+++ b/rse/tests/org.eclipse.rse.tests.framework.examples/plugin.xml
@@ -1,44 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-     <extension point="org.eclipse.rse.tests.framework.suites">
-      <suite type="standard" name="Failure Suite">
-          <arg name="class" value="org.eclipse.rse.tests.framework.examples.FailureSuite"/>
-      </suite>
-      <suite type="standard" name="Success Suite">
-          <arg name="class" value="org.eclipse.rse.tests.framework.examples.SuccessSuite"/>
-      </suite>
-      <suite type="standard" name="Error Suite">
-          <arg name="class" value="org.eclipse.rse.tests.framework.examples.ErrorSuite"/>
-      </suite>
-      <suite type="standard" name="Mixed Suite">
-          <arg name="class" value="org.eclipse.rse.tests.framework.examples.MixedSuite"/>
-      </suite>
-      <suite type="generated" name="Mixed Suite (all)">
-          <arg name="class" value="org.eclipse.rse.tests.framework.examples.MixedSuiteProvider"/>
-      </suite>
-      <suite type="generated" name="Mixed Suite (success)">
-          <arg name="class" value="org.eclipse.rse.tests.framework.examples.MixedSuiteProvider"/>
-          <arg name="argument" value="success"/>
-      </suite>
-      <suite type="generated" name="Mixed Suite (failure)">
-          <arg name="class" value="org.eclipse.rse.tests.framework.examples.MixedSuiteProvider"/>
-          <arg name="argument" value="failure"/>
-      </suite>
-      <suite type="generated" name="Mixed Suite (error)">
-          <arg name="class" value="org.eclipse.rse.tests.framework.examples.MixedSuiteProvider"/>
-          <arg name="argument" value="error"/>
-      </suite>
-      <suite type="standard" name="Annotating Suite">
-          <arg name="class" value="org.eclipse.rse.tests.framework.examples.AnnotatingSuite"/>
-      </suite>
-      <!--
-      <suite type="scripted" name="Test Script">
-          <arg name="folder" value="scripts/test01"/>
-          <arg name="script" value = "script7.txt"/>
-      </suite>    
-      -->
-   </extension>
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
<!--
+     Copyright (c) 2005, 2006 IBM Corporation and others.
+     All rights reserved. This program and the accompanying materials
+     are made available under the terms of the Eclipse Public License v1.0
+     which accompanies this distribution, and is available at
+     http://www.eclipse.org/legal/epl-v10.html
+    
+     Contributors:
+         IBM Corporation - initial API and implementation
+ -->
+
+<plugin>
+
+     <extension point="org.eclipse.rse.tests.framework.suites">
+      <suite type="standard" name="Failure Suite">
+          <arg name="class" value="org.eclipse.rse.tests.framework.examples.FailureSuite"/>
+      </suite>
+      <suite type="standard" name="Success Suite">
+          <arg name="class" value="org.eclipse.rse.tests.framework.examples.SuccessSuite"/>
+      </suite>
+      <suite type="standard" name="Error Suite">
+          <arg name="class" value="org.eclipse.rse.tests.framework.examples.ErrorSuite"/>
+      </suite>
+      <suite type="standard" name="Mixed Suite">
+          <arg name="class" value="org.eclipse.rse.tests.framework.examples.MixedSuite"/>
+      </suite>
+      <suite type="generated" name="Mixed Suite (all)">
+          <arg name="class" value="org.eclipse.rse.tests.framework.examples.MixedSuiteProvider"/>
+      </suite>
+      <suite type="generated" name="Mixed Suite (success)">
+          <arg name="class" value="org.eclipse.rse.tests.framework.examples.MixedSuiteProvider"/>
+          <arg name="argument" value="success"/>
+      </suite>
+      <suite type="generated" name="Mixed Suite (failure)">
+          <arg name="class" value="org.eclipse.rse.tests.framework.examples.MixedSuiteProvider"/>
+          <arg name="argument" value="failure"/>
+      </suite>
+      <suite type="generated" name="Mixed Suite (error)">
+          <arg name="class" value="org.eclipse.rse.tests.framework.examples.MixedSuiteProvider"/>
+          <arg name="argument" value="error"/>
+      </suite>
+      <suite type="standard" name="Annotating Suite">
+          <arg name="class" value="org.eclipse.rse.tests.framework.examples.AnnotatingSuite"/>
+      </suite>
+      <!--
+      <suite type="scripted" name="Test Script">
+          <arg name="folder" value="scripts/test01"/>
+          <arg name="script" value = "script7.txt"/>
+      </suite>    
+      -->
+   </extension>
+
+</plugin>
diff --git a/rse/tests/org.eclipse.rse.tests.framework/plugin.xml b/rse/tests/org.eclipse.rse.tests.framework/plugin.xml
index 3662b892ace..54ab3fa56c3 100644
--- a/rse/tests/org.eclipse.rse.tests.framework/plugin.xml
+++ b/rse/tests/org.eclipse.rse.tests.framework/plugin.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
+<?eclipse version="3.0"?>
<!--
+     Copyright (c) 2005, 2007 IBM Corporation and others.
+     All rights reserved. This program and the accompanying materials
+     are made available under the terms of the Eclipse Public License v1.0
+     which accompanies this distribution, and is available at
+     http://www.eclipse.org/legal/epl-v10.html
+    
+     Contributors:
+         IBM Corporation - initial API and implementation
+ -->
+
 <plugin>
 
      <extension-point id="suites" name="%ExtensionPoint.suites.name" schema="schema/suites.exsd"/>
diff --git a/rse/tests/org.eclipse.rse.tests.framework/toc.xml b/rse/tests/org.eclipse.rse.tests.framework/toc.xml
index 039ce868a9c..6fabae5f1b6 100644
--- a/rse/tests/org.eclipse.rse.tests.framework/toc.xml
+++ b/rse/tests/org.eclipse.rse.tests.framework/toc.xml
@@ -1,9 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="RSE Test Framework">
-	<topic label="Purpose" href="html/purpose.html"/> 
-	<topic label="Using The Test Suite View" href="html/view.html"/> 
-	<topic label="Plugging in" href="html/plugging.html"/> 
-	<topic label="Future Items" href="html/futures.html"/> 
-</toc>
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
<!--
+     Copyright (c) 2005, 2007 IBM Corporation and others.
+     All rights reserved. This program and the accompanying materials
+     are made available under the terms of the Eclipse Public License v1.0
+     which accompanies this distribution, and is available at
+     http://www.eclipse.org/legal/epl-v10.html
+    
+     Contributors:
+         IBM Corporation - initial API and implementation
+ -->
+
+<toc label="RSE Test Framework">
+	<topic label="Purpose" href="html/purpose.html"/> 
+	<topic label="Using The Test Suite View" href="html/view.html"/> 
+	<topic label="Plugging in" href="html/plugging.html"/> 
+	<topic label="Future Items" href="html/futures.html"/> 
+</toc>
diff --git a/rse/tests/org.eclipse.rse.tests/build.properties b/rse/tests/org.eclipse.rse.tests/build.properties
index d780a385f69..8b2f10cce52 100644
--- a/rse/tests/org.eclipse.rse.tests/build.properties
+++ b/rse/tests/org.eclipse.rse.tests/build.properties
@@ -1,13 +1,13 @@
 ###############################################################################
-# Copyright (c) 2001, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-# Martin Oberhuber (Wind River) - fix ant build and make consistent
+#  Copyright (c) 2001, 2009 IBM Corporation and others.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
+#  IBM Corporation - initial API and implementation
+#  Martin Oberhuber (Wind River) - fix ant build and make consistent
 ###############################################################################
 source.rsetests.jar = src/
 output.rsetests.jar = bin/
diff --git a/rse/tests/org.eclipse.rse.tests/plugin.properties b/rse/tests/org.eclipse.rse.tests/plugin.properties
index 2bfc5323a69..feef8bc925f 100644
--- a/rse/tests/org.eclipse.rse.tests/plugin.properties
+++ b/rse/tests/org.eclipse.rse.tests/plugin.properties
@@ -1,13 +1,13 @@
 ###############################################################################
-# Copyright (c) 2001, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
+#  Copyright (c) 2001, 2009 IBM Corporation and others.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+# 
+#  Contributors:
 #     IBM Corporation - initial API and implementation
-# Martin Oberhuber (Wind River) - fix ant build for "Assert", make consistent
+#  Martin Oberhuber (Wind River) - fix ant build for "Assert", make consistent
 ###############################################################################
 pluginName=RSE Unit Tests
 providerName=Eclipse.org - DSDP
diff --git a/rse/tests/org.eclipse.rse.tests/plugin.xml b/rse/tests/org.eclipse.rse.tests/plugin.xml
index 19056624a25..aeae0ce338d 100644
--- a/rse/tests/org.eclipse.rse.tests/plugin.xml
+++ b/rse/tests/org.eclipse.rse.tests/plugin.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
+<?eclipse version="3.0"?>
<!--
+     Copyright (c) 2005, 2008 IBM Corporation and others.
+     All rights reserved. This program and the accompanying materials
+     are made available under the terms of the Eclipse Public License v1.0
+     which accompanies this distribution, and is available at
+     http://www.eclipse.org/legal/epl-v10.html
+    
+     Contributors:
+         IBM Corporation - initial API and implementation
+ -->
+
 <plugin>
    <extension point="org.eclipse.rse.tests.framework.suites">
       <suite type="org.eclipse.rse.tests.RSECombinedTestSuite" name="RSE Combined Test Suite"/>
diff --git a/rse/tests/org.eclipse.rse.tests/test.xml b/rse/tests/org.eclipse.rse.tests/test.xml
index 3c90e7e1985..c1abdb9c366 100644
--- a/rse/tests/org.eclipse.rse.tests/test.xml
+++ b/rse/tests/org.eclipse.rse.tests/test.xml
@@ -1,4 +1,14 @@
 <?xml version="1.0"?>
+
<!--
+     Copyright (c) 2005, 2008 IBM Corporation and others.
+     All rights reserved. This program and the accompanying materials
+     are made available under the terms of the Eclipse Public License v1.0
+     which accompanies this distribution, and is available at
+     http://www.eclipse.org/legal/epl-v10.html
+    
+     Contributors:
+         IBM Corporation - initial API and implementation
+ -->
 
 <!--
 Run post build tests. 
diff --git a/wince/org.eclipse.rse.wince-feature/feature.xml b/wince/org.eclipse.rse.wince-feature/feature.xml
index bcb2b39ff6a..13ce8c9ec57 100644
--- a/wince/org.eclipse.rse.wince-feature/feature.xml
+++ b/wince/org.eclipse.rse.wince-feature/feature.xml
@@ -1,4 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
+     Copyright (c) 2005, 2009 IBM Corporation and others.
+     All rights reserved. This program and the accompanying materials
+     are made available under the terms of the Eclipse Public License v1.0
+     which accompanies this distribution, and is available at
+     http://www.eclipse.org/legal/epl-v10.html
+    
+     Contributors:
+         IBM Corporation - initial API and implementation
+ -->
+
 <feature
       id="org.eclipse.rse.wince"
       label="%featureName"
diff --git a/wince/org.eclipse.rse.wince-feature/sourceTemplatePlugin/build.properties b/wince/org.eclipse.rse.wince-feature/sourceTemplatePlugin/build.properties
index 79dad32069d..377be2b467b 100644
--- a/wince/org.eclipse.rse.wince-feature/sourceTemplatePlugin/build.properties
+++ b/wince/org.eclipse.rse.wince-feature/sourceTemplatePlugin/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2008 Wind River Systems, Inc. and others.
+# Copyright (c) 2008, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
diff --git a/wince/org.eclipse.rse.wince-feature/sourceTemplatePlugin/plugin.properties b/wince/org.eclipse.rse.wince-feature/sourceTemplatePlugin/plugin.properties
index bdf34dab745..021a98196c6 100644
--- a/wince/org.eclipse.rse.wince-feature/sourceTemplatePlugin/plugin.properties
+++ b/wince/org.eclipse.rse.wince-feature/sourceTemplatePlugin/plugin.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials 
 # are made available under the terms of the Eclipse Public License v1.0 
 # which accompanies this distribution, and is available at