Copyright fix - automated changes
diff --git a/ant/org.eclipse.ant.tests.core/build.properties b/ant/org.eclipse.ant.tests.core/build.properties
index 2542809..32d7d6e 100644
--- a/ant/org.eclipse.ant.tests.core/build.properties
+++ b/ant/org.eclipse.ant.tests.core/build.properties
@@ -1,3 +1,13 @@
+###############################################################################
+# Copyright (c) 2000, 2003 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials 
+# are made available under the terms of the Common Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/cpl-v10.html
+# 
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 bin.includes = plugin.xml,\
 			   plugin.properties,\
                test.xml,\
diff --git a/ant/org.eclipse.ant.tests.core/plugin.properties b/ant/org.eclipse.ant.tests.core/plugin.properties
index 0c331bc..a815294 100644
--- a/ant/org.eclipse.ant.tests.core/plugin.properties
+++ b/ant/org.eclipse.ant.tests.core/plugin.properties
@@ -1,13 +1,13 @@
-######################################################################
-# Copyright (c) 2000, 2002 IBM Corp. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Common Public License v0.5
+###############################################################################
+# Copyright (c) 2000, 2003 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials 
+# are made available under the terms of the Common Public License v1.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v05.html
-#
+# http://www.eclipse.org/legal/cpl-v10.html
+# 
 # Contributors:
-#    IBM Corporation - Initial implementation
-######################################################################
+#     IBM Corporation - initial API and implementation
+###############################################################################
 
 pluginName=Ant Core Test Plugin
-providerName=Eclipse.org
\ No newline at end of file
+providerName=Eclipse.org
diff --git a/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntFileRunner.java b/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntFileRunner.java
index 684638d..64e8216 100644
--- a/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntFileRunner.java
+++ b/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntFileRunner.java
@@ -1,11 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.ant.tests.core.testplugin;
 
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
 
 import org.eclipse.ant.core.AntRunner;
 import org.eclipse.ant.tests.core.AbstractAntTest;
diff --git a/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntTestChecker.java b/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntTestChecker.java
index 700f95b..24e00fe 100644
--- a/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntTestChecker.java
+++ b/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntTestChecker.java
@@ -1,11 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.ant.tests.core.testplugin;
 
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
 
 import java.util.ArrayList;
 import java.util.Hashtable;
diff --git a/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntTestPlugin.java b/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntTestPlugin.java
index 947b1ea..831c208 100644
--- a/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntTestPlugin.java
+++ b/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntTestPlugin.java
@@ -1,11 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.ant.tests.core.testplugin;
 
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
 
 import java.io.File;
 import java.io.IOException;
@@ -50,4 +54,4 @@
 			return null;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/ProjectHelper.java b/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/ProjectHelper.java
index 6a12bad..0563fda 100644
--- a/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/ProjectHelper.java
+++ b/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/ProjectHelper.java
@@ -1,11 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.ant.tests.core.testplugin;
 
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
 
 import java.io.File;
 import java.io.IOException;
diff --git a/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/inputHandlers/AntTestInputHandler.java b/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/inputHandlers/AntTestInputHandler.java
index c061b00..9441b1f 100644
--- a/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/inputHandlers/AntTestInputHandler.java
+++ b/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/inputHandlers/AntTestInputHandler.java
@@ -1,11 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.ant.tests.core.support.inputHandlers;
 
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.input.DefaultInputHandler;
diff --git a/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/tasks/AntTestTask.java b/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/tasks/AntTestTask.java
index d313bd5..c73c836 100644
--- a/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/tasks/AntTestTask.java
+++ b/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/tasks/AntTestTask.java
@@ -1,11 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.ant.tests.core.support.tasks;
 
-/**********************************************************************
-Copyright (c) 2002 IBM Corp. and others. All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
 
 
 import org.apache.tools.ant.BuildException;
diff --git a/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/testloggers/TestBuildListener.java b/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/testloggers/TestBuildListener.java
index e410806..30d4ddf 100644
--- a/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/testloggers/TestBuildListener.java
+++ b/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/testloggers/TestBuildListener.java
@@ -1,11 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.ant.tests.core.support.testloggers;
 
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
 
 import org.apache.tools.ant.BuildEvent;
 import org.apache.tools.ant.BuildListener;
diff --git a/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/testloggers/TestBuildLogger.java b/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/testloggers/TestBuildLogger.java
index b5fcf7e..d9c1414 100644
--- a/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/testloggers/TestBuildLogger.java
+++ b/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/testloggers/TestBuildLogger.java
@@ -1,11 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.ant.tests.core.support.testloggers;
 
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
 
 import java.io.PrintStream;
 
diff --git a/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/types/AntTestPath.java b/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/types/AntTestPath.java
index d0113f2..408ac4a 100644
--- a/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/types/AntTestPath.java
+++ b/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/types/AntTestPath.java
@@ -1,11 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.ant.tests.core.support.types;
 
-/**********************************************************************
-Copyright (c) 2002 IBM Corp. and others. All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
 
 
 import org.apache.tools.ant.Project;
@@ -27,4 +31,4 @@
 		return message;
 	}
 	
-}
\ No newline at end of file
+}
diff --git a/ant/org.eclipse.ant.tests.core/testresources/AntTestTask.java b/ant/org.eclipse.ant.tests.core/testresources/AntTestTask.java
index dfd0c4d..bc4f602 100644
--- a/ant/org.eclipse.ant.tests.core/testresources/AntTestTask.java
+++ b/ant/org.eclipse.ant.tests.core/testresources/AntTestTask.java
@@ -1,10 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 
- /**********************************************************************
-Copyright (c) 2002 IBM Corp. and others. All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
 
 
 import org.apache.tools.ant.BuildException;
diff --git a/ant/org.eclipse.ant.tests.core/testresources/test.properties b/ant/org.eclipse.ant.tests.core/testresources/test.properties
index 5c496c6..7eacd3a 100644
--- a/ant/org.eclipse.ant.tests.core/testresources/test.properties
+++ b/ant/org.eclipse.ant.tests.core/testresources/test.properties
@@ -1,2 +1,12 @@
+###############################################################################
+# Copyright (c) 2000, 2003 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials 
+# are made available under the terms of the Common Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/cpl-v10.html
+# 
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 AntTests=testing from properties file
 eclipse.is.cool=Yep
diff --git a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/AbstractAntTest.java b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/AbstractAntTest.java
index 9d5847f..1fbd15c 100644
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/AbstractAntTest.java
+++ b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/AbstractAntTest.java
Binary files differ
diff --git a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/AutomatedSuite.java b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/AutomatedSuite.java
index 8b1f1f4..468028d 100644
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/AutomatedSuite.java
+++ b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/AutomatedSuite.java
@@ -1,11 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.ant.tests.core;
 
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
 
 import java.util.Enumeration;
 
diff --git a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/ProjectCreationDecorator.java b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/ProjectCreationDecorator.java
index 3f0a985..b358f49 100644
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/ProjectCreationDecorator.java
+++ b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/ProjectCreationDecorator.java
@@ -1,11 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.ant.tests.core;
 
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
 
 import java.io.File;
 
diff --git a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/FrameworkTests.java b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/FrameworkTests.java
index c66c2ed..1f5df28 100644
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/FrameworkTests.java
+++ b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/FrameworkTests.java
@@ -1,11 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.ant.tests.core.tests;
 
-/**********************************************************************
-Copyright (c) 2002 IBM Corp. and others. All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
 
 import java.net.MalformedURLException;
 import java.net.URL;
diff --git a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/OptionTests.java b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/OptionTests.java
index 97a5a16..da8b572 100644
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/OptionTests.java
+++ b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/OptionTests.java
@@ -1,11 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.ant.tests.core.tests;
 
-/**********************************************************************
-Copyright (c) 2002 IBM Corp. and others. All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
diff --git a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/ProjectTests.java b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/ProjectTests.java
index 62359ee..1b25ce8 100644
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/ProjectTests.java
+++ b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/ProjectTests.java
@@ -1,11 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.ant.tests.core.tests;
 
-/**********************************************************************
-Copyright (c) 2002 IBM Corp. and others. All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
 
 import org.eclipse.ant.tests.core.AbstractAntTest;
 import org.eclipse.ant.tests.core.testplugin.AntTestChecker;
diff --git a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TargetTests.java b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TargetTests.java
index c2c3e5b..291f6be 100644
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TargetTests.java
+++ b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TargetTests.java
Binary files differ
diff --git a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TaskTests.java b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TaskTests.java
index ff2b5e5..e5c1a80 100644
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TaskTests.java
+++ b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TaskTests.java
@@ -1,11 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.ant.tests.core.tests;
 
-/**********************************************************************
-Copyright (c) 2002 IBM Corp. and others. All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
 
 import java.net.MalformedURLException;
 import java.net.URL;
diff --git a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TypeTests.java b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TypeTests.java
index 8bbc02e..e029705 100644
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TypeTests.java
+++ b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TypeTests.java
@@ -1,11 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.ant.tests.core.tests;
 
-/**********************************************************************
-Copyright (c) 2002 IBM Corp. and others. All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
 
 import java.net.MalformedURLException;
 import java.net.URL;
diff --git a/update/org.eclipse.update.core.win32/build.properties b/update/org.eclipse.update.core.win32/build.properties
index e5de40b..0f5d557 100644
--- a/update/org.eclipse.update.core.win32/build.properties
+++ b/update/org.eclipse.update.core.win32/build.properties
@@ -1,3 +1,13 @@
+###############################################################################
+# Copyright (c) 2000, 2003 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials 
+# are made available under the terms of the Common Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/cpl-v10.html
+# 
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 source.updatecorewin32.zip = src/
 bin.includes = fragment.xml,\
                os/,\
diff --git a/update/org.eclipse.update.core/build.properties b/update/org.eclipse.update.core/build.properties
index 9b29104..8ee535c 100644
--- a/update/org.eclipse.update.core/build.properties
+++ b/update/org.eclipse.update.core/build.properties
@@ -1,3 +1,13 @@
+###############################################################################

+# Copyright (c) 2000, 2003 IBM Corporation and others.

+# All rights reserved. This program and the accompanying materials 

+# are made available under the terms of the Common Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/cpl-v10.html

+# 

+# Contributors:

+#     IBM Corporation - initial API and implementation

+###############################################################################

 source.updatecore.jar = src/

 bin.includes = plugin.xml,\

                plugin.properties,\

diff --git a/update/org.eclipse.update.core/plugin.properties b/update/org.eclipse.update.core/plugin.properties
index f35de76..ee432ef 100644
--- a/update/org.eclipse.update.core/plugin.properties
+++ b/update/org.eclipse.update.core/plugin.properties
@@ -1,3 +1,13 @@
+###############################################################################

+# Copyright (c) 2000, 2003 IBM Corporation and others.

+# All rights reserved. This program and the accompanying materials 

+# are made available under the terms of the Common Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/cpl-v10.html

+# 

+# Contributors:

+#     IBM Corporation - initial API and implementation

+###############################################################################

 pluginName= Install/Update Core

 providerName= Eclipse.org

 fragmentNameWin= Install/Update Core for Windows

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IActivity.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IActivity.java
index 9b39ab4..87f43da 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IActivity.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IActivity.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.configuration;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import java.util.Date;
 
@@ -250,4 +256,4 @@
 	 * </p>
 	 */
 	public IInstallConfiguration getInstallConfiguration();
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSite.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSite.java
index 5778579..e38de49 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSite.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSite.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.configuration;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import org.eclipse.core.runtime.*;
 import org.eclipse.update.core.*;
@@ -364,4 +370,4 @@
 	 * </p>
 	 */
 	public boolean isEnabled();
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSiteChangedListener.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSiteChangedListener.java
index 813f6d4..e1a6c35 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSiteChangedListener.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IConfiguredSiteChangedListener.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.configuration;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import org.eclipse.update.core.IFeature;
 
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfiguration.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfiguration.java
index a9099cf..3572db5 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfiguration.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfiguration.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.configuration;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import java.io.File;
 import java.util.Date;
@@ -226,4 +232,4 @@
 	 */
 	public long getTimeline();
 
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfigurationChangedListener.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfigurationChangedListener.java
index d4a2e8d..070a874 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfigurationChangedListener.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallConfigurationChangedListener.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.configuration;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 /**
  * Configuration change listener.
@@ -44,4 +50,4 @@
 	 */
 	void installSiteRemoved(IConfiguredSite site);
 
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallDeltaHandler.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallDeltaHandler.java
index 61c5ea8..309a3a6 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallDeltaHandler.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IInstallDeltaHandler.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.configuration;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 /**
  * Install Delta Handler.
@@ -46,4 +52,4 @@
 	 */
 	public void open();
 
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSite.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSite.java
index ce97500..b6a55df 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSite.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSite.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.configuration;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import org.eclipse.core.runtime.*;
 import org.eclipse.update.core.IFeature;
@@ -259,4 +265,4 @@
 	 */
 	public IStatus getFeatureStatus(IFeature feature) throws CoreException ;	
 
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSiteChangedListener.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSiteChangedListener.java
index e51dbc3..9e1162a 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSiteChangedListener.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSiteChangedListener.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.configuration;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 /**
  * Local site change listener. 
@@ -43,4 +49,4 @@
 	 * </p>
 	 */
 	public void installConfigurationRemoved(IInstallConfiguration configuration);
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSystemInfoListener.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSystemInfoListener.java
index 4416ac0..25ab62c 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSystemInfoListener.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ILocalSystemInfoListener.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.configuration;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

  

 

 

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IProblemHandler.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IProblemHandler.java
index 715cf58..361e9e8 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IProblemHandler.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IProblemHandler.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.configuration;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
  
 /**
  * Generic problem handler. Used to report status from specific
@@ -35,4 +41,4 @@
 	 */
 	boolean reportProblem(String problemText);
 
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ISessionDelta.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ISessionDelta.java
index 8a8ef03..cf2db8f 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ISessionDelta.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/ISessionDelta.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.configuration;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import java.util.Date;
 
@@ -141,4 +147,4 @@
 	 * </p>
 	 */
 	public void delete();	
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IVolume.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IVolume.java
index d9572e2..7845aa6 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IVolume.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/IVolume.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.configuration;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import java.io.File;
 
@@ -95,4 +101,4 @@
 	 * </p>
 	 */
 	public File getFile();
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/LocalSystemInfo.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/LocalSystemInfo.java
index ebab3be..5e46792 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/LocalSystemInfo.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/LocalSystemInfo.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.configuration;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

  

 import java.io.File;

 import java.util.ArrayList;

@@ -274,13 +280,13 @@
 		Volume[] vol = new Volume[0];

 		if (mountPoints!=null){

 			vol = new Volume[mountPoints.length];

-			for (int i = 0; i < mountPoints.length; i++) {
+			for (int i = 0; i < mountPoints.length; i++) {

 				File root = new File(mountPoints[i]);

 				String label = getLabel(root);

 				int type = getType(root);

 				long size = getFreeSpace(root);

 				vol[i] = new Volume(root,label,type,size);

-				vol[i].markReadOnly();
+				vol[i].markReadOnly();

 			}

 		} else {

 			UpdateCore.warn("Unable to find mount points");

@@ -292,9 +298,9 @@
 				roots = root.listFiles();

 			}

 			vol = new Volume[roots.length];			

-			for (int i = 0; i < roots.length; i++) {
+			for (int i = 0; i < roots.length; i++) {

 				vol[i] = new Volume(roots[i],null,LocalSystemInfo.VOLUME_UNKNOWN,LocalSystemInfo.SIZE_UNKNOWN);

-				vol[i].markReadOnly();
+				vol[i].markReadOnly();

 			}			

 		}

 		return vol;

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ArchiveReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ArchiveReference.java
index 2f8f0bd..9941659 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ArchiveReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/ArchiveReference.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import org.eclipse.update.core.model.ArchiveReferenceModel;

 

@@ -41,4 +47,4 @@
 		//$NON-NLS-1$

 		return result;

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseFeatureFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseFeatureFactory.java
index 0ee0fa2..30a2b44 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseFeatureFactory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseFeatureFactory.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import java.net.URL;

 

@@ -121,4 +127,4 @@
 	public URLEntryModel createURLEntryModel() {

 		return new URLEntry();

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseInstallHandler.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseInstallHandler.java
index 490dec7..de33a53 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseInstallHandler.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseInstallHandler.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import org.eclipse.core.runtime.CoreException;
 
@@ -236,4 +242,4 @@
 	 */
 	public void uninstallCompleted(boolean success) throws CoreException {
 	}
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseSiteFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseSiteFactory.java
index eb20743..92b3b47 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseSiteFactory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseSiteFactory.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

  

 import java.io.IOException;

 import java.io.InputStream;

@@ -137,4 +143,4 @@
 		return response.getInputStream();

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Category.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Category.java
index 4ef4dfd..0abbcb6 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Category.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/Category.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import org.eclipse.update.core.model.CategoryModel;

 

@@ -38,4 +44,4 @@
 	public IURLEntry getDescription() {

 		return (IURLEntry) getDescriptionModel();

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ContentReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ContentReference.java
index dc19469..73d461a 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ContentReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/ContentReference.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import java.io.*;

 import java.net.URL;

@@ -257,4 +263,4 @@
 		this.tempLocal = tempLocal;

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureContentProvider.java
index a5aee38..bbeffa1 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureContentProvider.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureContentProvider.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import java.io.*;

 import java.net.URL;

@@ -439,4 +445,4 @@
 

 		return result;

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureReference.java
index b75b988..1e7c7fc 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureReference.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -281,4 +287,4 @@
 		return "true".equalsIgnoreCase(super.getPatch());
 	}
 
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IArchiveReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IArchiveReference.java
index b1e7f2b..cd8c482 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IArchiveReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IArchiveReference.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import java.net.URL;
 
@@ -38,4 +44,4 @@
 	 * @since 2.0 
 	 */
 	public URL getURL();
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ICategory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ICategory.java
index 841e571..331ec20 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ICategory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/ICategory.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 

 import org.eclipse.core.runtime.IAdaptable;

 

@@ -49,4 +55,4 @@
 	 * @since 2.0 

 	 */

 	public IURLEntry getDescription();

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IContentConsumer.java
index 7d49ba7..6ed3a76 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IContentConsumer.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IContentConsumer.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IProgressMonitor;

@@ -43,4 +49,4 @@
 	 */

 	public void close() throws CoreException;

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentConsumer.java
index 2cfa5b8..1efa2d1 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentConsumer.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentConsumer.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IProgressMonitor;

@@ -151,4 +157,4 @@
 	 * @since 2.0

 	 */

 	public IFeatureContentConsumer[] getChildren();

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentProvider.java
index a2ad313..6823d18 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentProvider.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureContentProvider.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import java.net.URL;

 

@@ -255,4 +261,4 @@
 	 * @since 2.0

 	 */

 	public void setFeature(IFeature feature);

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureFactory.java
index 6433735..055080a 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureFactory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureFactory.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import java.net.URL;

 

@@ -57,4 +63,4 @@
 	 * @since 2.1 

 	 */

 	public IFeature createFeature(URL url, ISite site, IProgressMonitor monitor) throws CoreException;	

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureReference.java
index 33235a4..5d35aac 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IFeatureReference.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import java.net.URL;

 

@@ -107,4 +113,4 @@
 	public boolean isPatch();

 	

 	

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IImport.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IImport.java
index dbe55c5..f0d8076 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IImport.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IImport.java
@@ -1,9 +1,15 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

 

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import org.eclipse.core.runtime.IAdaptable;

 

@@ -79,4 +85,4 @@
 	 * reference, false otherwise.

 	 */

 	public boolean isPatch();

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IIncludedFeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IIncludedFeatureReference.java
index 7f72847..0b64639 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IIncludedFeatureReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IIncludedFeatureReference.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.core;
 
 import org.eclipse.core.runtime.CoreException;
@@ -5,10 +15,6 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.update.configuration.IConfiguredSite;
 
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 
 /**
@@ -113,4 +119,4 @@
 
 	public int getSearchLocation();
 
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandler.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandler.java
index 15a018d..a3d82c6 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandler.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandler.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import org.eclipse.core.runtime.CoreException;
 
@@ -229,4 +235,4 @@
 	 * @since 2.0
 	 */
 	public void uninstallCompleted(boolean success) throws CoreException;
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandlerEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandlerEntry.java
index 784e5a6..fab0148 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandlerEntry.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IInstallHandlerEntry.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import java.net.URL;
 
@@ -61,4 +67,4 @@
 	 */
 	public String getHandlerName();
 
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/INonPluginEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/INonPluginEntry.java
index ab025e0..88be77c 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/INonPluginEntry.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/INonPluginEntry.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import org.eclipse.core.runtime.IAdaptable;

 

@@ -53,4 +59,4 @@
 	 * @since 2.0 

 	 */

 	public long getInstallSize();

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IPlatformEnvironment.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IPlatformEnvironment.java
index c704663..f911374 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IPlatformEnvironment.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IPlatformEnvironment.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import org.eclipse.core.runtime.IAdaptable;
 
@@ -90,4 +96,4 @@
 	public String getNL();
 
 
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IPluginEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IPluginEntry.java
index 8c24582..b2d605e 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IPluginEntry.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IPluginEntry.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import org.eclipse.core.runtime.IAdaptable;

 

@@ -71,4 +77,4 @@
 	 */

 	public void setVersionedIdentifier(VersionedIdentifier identifier);

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISite.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISite.java
index 44aedab..e46afb7 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISite.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISite.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 import java.net.URL;

 

 import org.eclipse.core.runtime.*;

@@ -315,4 +321,4 @@
 	IFeature createFeature(String type, URL url,IProgressMonitor monitor) throws CoreException;

 

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteContentProvider.java
index c5621f2..54c4c95 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteContentProvider.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteContentProvider.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

  

 import java.net.URL;

 

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactory.java
index 87d2c93..32e3177 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactory.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import java.net.URL;

 

@@ -41,4 +47,4 @@
 	 */

 	public ISite createSite(URL url)

 		throws CoreException, InvalidSiteTypeException;

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactoryExtension.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactoryExtension.java
index a9eab2a..343e252 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactoryExtension.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFactoryExtension.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import java.net.URL;
 
@@ -44,4 +50,4 @@
 	 */
 	public ISite createSite(URL url, IProgressMonitor monitor)
 		throws CoreException, InvalidSiteTypeException;
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFeatureReference.java
index 0bbd4b7..a624e63 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFeatureReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/ISiteFeatureReference.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import org.eclipse.core.runtime.IAdaptable;
 
@@ -35,4 +41,4 @@
 	 */
 	public void addCategory(ICategory category);
 
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IURLEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IURLEntry.java
index 130ecc9..9d04f9b 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IURLEntry.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IURLEntry.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import java.net.URL;

 

@@ -51,4 +57,4 @@
 	 * @since 2.0 

 	 */

 	public int getType();	

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IUpdateConstants.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IUpdateConstants.java
index 3e2c821..dce3bcc 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IUpdateConstants.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IUpdateConstants.java
@@ -1,9 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.core;
 
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
  
 /**
  * Manages a list of static constants.
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationListener.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationListener.java
index 1f8390c..a42a4c7 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationListener.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationListener.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
  
 /**
  * Verification listener. This interface abstract the user interaction
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationResult.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationResult.java
index 04f44dc..0512a1f 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationResult.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerificationResult.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 /**
  * Verification result. An object implementing this interface represents
@@ -147,4 +153,4 @@
 	 * @since 2.0
 	 */
 	public boolean alreadySeen();
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerifier.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerifier.java
index d9494be..98cd183 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerifier.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IVerifier.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import org.eclipse.core.runtime.CoreException;
 
@@ -60,4 +66,4 @@
 	 * @since 2.0
 	 */
 	public IVerifier getParent();
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Import.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Import.java
index 6f4055f..9a9ebbe 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Import.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/Import.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 import org.eclipse.update.core.model.ImportModel;

 import org.eclipse.update.internal.core.UpdateCore;

 import org.eclipse.update.internal.core.UpdateManagerUtils;

@@ -74,4 +80,4 @@
 		return isFeatureImport()?KIND_FEATURE:KIND_PLUGIN;

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IncludedFeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IncludedFeatureReference.java
index 0e93b28..1068b08 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IncludedFeatureReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IncludedFeatureReference.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.core;
 
 import org.eclipse.core.runtime.CoreException;
@@ -6,10 +16,6 @@
 import org.eclipse.update.core.model.IncludedFeatureReferenceModel;
 import org.eclipse.update.internal.core.UpdateCore;
 
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 /**
  * This is a utility class representing the options of a nested feature.
@@ -197,4 +203,4 @@
 	public IFeature getFeature(IProgressMonitor monitor) throws CoreException {
 		return getFeature(false,null,monitor);
 	}	
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallHandlerEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallHandlerEntry.java
index 72b4f80..a3b9a61 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallHandlerEntry.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallHandlerEntry.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import org.eclipse.update.core.model.InstallHandlerEntryModel;
 
@@ -27,4 +33,4 @@
 	public InstallHandlerEntry() {
 		super();
 	}
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallMonitor.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallMonitor.java
index 1fa11e6..4f68328 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallMonitor.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/InstallMonitor.java
@@ -1,248 +1,254 @@
-package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
-
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.update.internal.core.Policy;
-
-/**
- * Install progress monitor
- * Delegating wrapper for IProgressMonitor used for installation handling.
- * 
- * @since 2.0
- */
-public class InstallMonitor implements IProgressMonitor {
-
-	private IProgressMonitor monitor;
-	private Stack tasks;
-
-	private String taskString;
-	private String subTaskString;
-	private boolean showDetails;
-	private long totalCopyCount;
-
-	private class MonitorState {
-
-		private String taskString;
-		private String subTaskString;
-		private boolean showDetails;
-		private long totalCopyCount;
-
-		private MonitorState(
-			String taskString,
-			String subTaskString,
-			boolean showDetails,
-			long totalCopyCount) {
-			this.taskString = taskString;
-			this.subTaskString = subTaskString;
-			this.showDetails = showDetails;
-			this.totalCopyCount = totalCopyCount;
-		}
-
-		private String getTaskString() {
-			return this.taskString;
-		}
-
-		private String getSubTaskString() {
-			return this.subTaskString;
-		}
-
-		private boolean getShowDetails() {
-			return this.showDetails;
-		}
-
-		private long getTotalCopyCount() {
-			return this.totalCopyCount;
-		}
-	}
-	
-	private InstallMonitor() {
-	}
-
-	/**
-	 * Install monitor constructor
-	 * 
-	 * @param monitor base install monitor
-	 * @since 2.0
-	 */
-	public InstallMonitor(IProgressMonitor monitor) {
-		this.monitor = monitor;
-		this.tasks = new Stack();
-		this.taskString = ""; //$NON-NLS-1$
-		this.subTaskString = ""; //$NON-NLS-1$
-		this.showDetails = false;
-		this.totalCopyCount = 0;
-	}
-
-	/**
-	 * Begin new monitor task.
-	 * 
-	 * @see IProgressMonitor#beginTask(String, int)
-	 * @since 2.0
-	 */
-	public void beginTask(String name, int totalWork) {
-		taskString = name;
-		monitor.beginTask(name, totalWork);
-	}
-
-	/**
-	 * Indicate completion of monitor activity.
-	 * 
-	 * @see IProgressMonitor#done()
-	 * @since 2.0
-	 */
-	public void done() {
-		monitor.done();
-	}
-
-	/**
-	 * Indicate monitor progress.
-	 * 
-	 * @see IProgressMonitor#internalWorked(double)
-	 * @since 2.0
-	 */
-	public void internalWorked(double work) {
-		monitor.internalWorked(work);
-	}
-
-	/**
-	 * Check is use indicated that the operation be cancelled.
-	 * 
-	 * @see IProgressMonitor#isCanceled()
-	 * @since 2.0
-	 */
-	public boolean isCanceled() {
-		return monitor.isCanceled();
-	}
-
-	/**
-	 * Set the cancellation state.
-	 * 
-	 * @see IProgressMonitor#setCanceled(boolean)
-	 * @since 2.0
-	 */
-	public void setCanceled(boolean value) {
-		monitor.setCanceled(value);
-	}
-
-	/**
-	 * Set task name.
-	 * 
-	 * @see IProgressMonitor#setTaskName(String)
-	 * @since 2.0
-	 */
-	public void setTaskName(String name) {
-		this.taskString = name;
-		this.subTaskString = ""; //$NON-NLS-1$
-		this.showDetails = false;
-		this.totalCopyCount = 0;
-		monitor.subTask(""); //$NON-NLS-1$
-		monitor.setTaskName(name);
-	}
-
-	/**
-	 * Set subtask name.
-	 * 
-	 * @see IProgressMonitor#subTask(String)
-	 * @since 2.0
-	 */
-	public void subTask(String name) {
-		this.subTaskString = name;
-		this.showDetails = false;
-		this.totalCopyCount = 0;
-		monitor.subTask(name);
-	}
-
-	/**
-	 * Indicate monitor progress.
-	 * 
-	 * @see IProgressMonitor#worked(int)
-	 * @since 2.0
-	 */
-	public void worked(int work) {
-		monitor.worked(work);
-	}
-
-	/**
-	 * Save the current monitor state.
-	 * The states are saved on a push-down stack. Prior states
-	 * can be restored by calling restorState()
-	 * 
-	 * @see #restoreState()
-	 * @since 2.0
-	 */
-	public void saveState() {
-		tasks.push(
-			new MonitorState(taskString, subTaskString, showDetails, totalCopyCount));
-	}
-
-	/**
-	 * Restore the monitor state.
-	 * 
-	 * @see #saveState()
-	 * @since 2.0
-	 */
-	public void restoreState() {
-		if (tasks.size() > 0) {
-			MonitorState state = (MonitorState) tasks.pop();
-			setTaskName(state.getTaskString());
-			subTask(state.getSubTaskString());
-			this.showDetails = state.getShowDetails();
-			this.totalCopyCount = state.getTotalCopyCount();
-		}
-	}
-
-	/**
-	 * Indicate whether the monitor subtask message should include
-	 * copy progress counts.
-	 * 
-	 * @see #setCopyCount(long)
-	 * @see #setTotalCount(long)
-	 * @param setting <code>true</code> to show the copy count,
-	 * <code>false</code> otherwise
-	 * @since 2.0
-	 */
-	public void showCopyDetails(boolean setting) {
-		this.showDetails = setting;
-	}
-
-	/**
-	 * Sets the total number of bytes to copy.
-	 * 
-	 * @see #showCopyDetails(boolean)
-	 * @see #setCopyCount(long)
-	 * @param count total number of bytes to copy.
-	 * @since 2.0
-	 */
-	public void setTotalCount(long count) {
-		this.totalCopyCount = count;
-	}
-
-	/**
-	 * Sets the number of bytes already copied.
-	 * 
-	 * @see #showCopyDetails(boolean)
-	 * @see #setTotalCount(long)
-	 * @param count number of bytes already copied.
-	 * @since 2.0
-	 */
-	public void setCopyCount(long count) {
-		if (showDetails && count > 0) {
-			long countK = count / 1024;
-			long totalK = totalCopyCount / 1024;
-			String msg =
-				(totalK <= 0)
-					? Policy.bind("InstallMonitor.DownloadSize", Long.toString(countK))
-					: Policy.bind(
-						"InstallMonitor.DownloadSizeLong",
-						Long.toString(countK),
-						Long.toString(totalK));
-			//$NON-NLS-1$ //$NON-NLS-2$
-			monitor.subTask(subTaskString + msg);
-		}
-	}
-}
\ No newline at end of file
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.update.core;

+

+import java.util.Stack;

+

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.update.internal.core.Policy;

+

+/**

+ * Install progress monitor

+ * Delegating wrapper for IProgressMonitor used for installation handling.

+ * 

+ * @since 2.0

+ */

+public class InstallMonitor implements IProgressMonitor {

+

+	private IProgressMonitor monitor;

+	private Stack tasks;

+

+	private String taskString;

+	private String subTaskString;

+	private boolean showDetails;

+	private long totalCopyCount;

+

+	private class MonitorState {

+

+		private String taskString;

+		private String subTaskString;

+		private boolean showDetails;

+		private long totalCopyCount;

+

+		private MonitorState(

+			String taskString,

+			String subTaskString,

+			boolean showDetails,

+			long totalCopyCount) {

+			this.taskString = taskString;

+			this.subTaskString = subTaskString;

+			this.showDetails = showDetails;

+			this.totalCopyCount = totalCopyCount;

+		}

+

+		private String getTaskString() {

+			return this.taskString;

+		}

+

+		private String getSubTaskString() {

+			return this.subTaskString;

+		}

+

+		private boolean getShowDetails() {

+			return this.showDetails;

+		}

+

+		private long getTotalCopyCount() {

+			return this.totalCopyCount;

+		}

+	}

+	

+	private InstallMonitor() {

+	}

+

+	/**

+	 * Install monitor constructor

+	 * 

+	 * @param monitor base install monitor

+	 * @since 2.0

+	 */

+	public InstallMonitor(IProgressMonitor monitor) {

+		this.monitor = monitor;

+		this.tasks = new Stack();

+		this.taskString = ""; //$NON-NLS-1$

+		this.subTaskString = ""; //$NON-NLS-1$

+		this.showDetails = false;

+		this.totalCopyCount = 0;

+	}

+

+	/**

+	 * Begin new monitor task.

+	 * 

+	 * @see IProgressMonitor#beginTask(String, int)

+	 * @since 2.0

+	 */

+	public void beginTask(String name, int totalWork) {

+		taskString = name;

+		monitor.beginTask(name, totalWork);

+	}

+

+	/**

+	 * Indicate completion of monitor activity.

+	 * 

+	 * @see IProgressMonitor#done()

+	 * @since 2.0

+	 */

+	public void done() {

+		monitor.done();

+	}

+

+	/**

+	 * Indicate monitor progress.

+	 * 

+	 * @see IProgressMonitor#internalWorked(double)

+	 * @since 2.0

+	 */

+	public void internalWorked(double work) {

+		monitor.internalWorked(work);

+	}

+

+	/**

+	 * Check is use indicated that the operation be cancelled.

+	 * 

+	 * @see IProgressMonitor#isCanceled()

+	 * @since 2.0

+	 */

+	public boolean isCanceled() {

+		return monitor.isCanceled();

+	}

+

+	/**

+	 * Set the cancellation state.

+	 * 

+	 * @see IProgressMonitor#setCanceled(boolean)

+	 * @since 2.0

+	 */

+	public void setCanceled(boolean value) {

+		monitor.setCanceled(value);

+	}

+

+	/**

+	 * Set task name.

+	 * 

+	 * @see IProgressMonitor#setTaskName(String)

+	 * @since 2.0

+	 */

+	public void setTaskName(String name) {

+		this.taskString = name;

+		this.subTaskString = ""; //$NON-NLS-1$

+		this.showDetails = false;

+		this.totalCopyCount = 0;

+		monitor.subTask(""); //$NON-NLS-1$

+		monitor.setTaskName(name);

+	}

+

+	/**

+	 * Set subtask name.

+	 * 

+	 * @see IProgressMonitor#subTask(String)

+	 * @since 2.0

+	 */

+	public void subTask(String name) {

+		this.subTaskString = name;

+		this.showDetails = false;

+		this.totalCopyCount = 0;

+		monitor.subTask(name);

+	}

+

+	/**

+	 * Indicate monitor progress.

+	 * 

+	 * @see IProgressMonitor#worked(int)

+	 * @since 2.0

+	 */

+	public void worked(int work) {

+		monitor.worked(work);

+	}

+

+	/**

+	 * Save the current monitor state.

+	 * The states are saved on a push-down stack. Prior states

+	 * can be restored by calling restorState()

+	 * 

+	 * @see #restoreState()

+	 * @since 2.0

+	 */

+	public void saveState() {

+		tasks.push(

+			new MonitorState(taskString, subTaskString, showDetails, totalCopyCount));

+	}

+

+	/**

+	 * Restore the monitor state.

+	 * 

+	 * @see #saveState()

+	 * @since 2.0

+	 */

+	public void restoreState() {

+		if (tasks.size() > 0) {

+			MonitorState state = (MonitorState) tasks.pop();

+			setTaskName(state.getTaskString());

+			subTask(state.getSubTaskString());

+			this.showDetails = state.getShowDetails();

+			this.totalCopyCount = state.getTotalCopyCount();

+		}

+	}

+

+	/**

+	 * Indicate whether the monitor subtask message should include

+	 * copy progress counts.

+	 * 

+	 * @see #setCopyCount(long)

+	 * @see #setTotalCount(long)

+	 * @param setting <code>true</code> to show the copy count,

+	 * <code>false</code> otherwise

+	 * @since 2.0

+	 */

+	public void showCopyDetails(boolean setting) {

+		this.showDetails = setting;

+	}

+

+	/**

+	 * Sets the total number of bytes to copy.

+	 * 

+	 * @see #showCopyDetails(boolean)

+	 * @see #setCopyCount(long)

+	 * @param count total number of bytes to copy.

+	 * @since 2.0

+	 */

+	public void setTotalCount(long count) {

+		this.totalCopyCount = count;

+	}

+

+	/**

+	 * Sets the number of bytes already copied.

+	 * 

+	 * @see #showCopyDetails(boolean)

+	 * @see #setTotalCount(long)

+	 * @param count number of bytes already copied.

+	 * @since 2.0

+	 */

+	public void setCopyCount(long count) {

+		if (showDetails && count > 0) {

+			long countK = count / 1024;

+			long totalK = totalCopyCount / 1024;

+			String msg =

+				(totalK <= 0)

+					? Policy.bind("InstallMonitor.DownloadSize", Long.toString(countK))

+					: Policy.bind(

+						"InstallMonitor.DownloadSizeLong",

+						Long.toString(countK),

+						Long.toString(totalK));

+			//$NON-NLS-1$ //$NON-NLS-2$

+			monitor.subTask(subTaskString + msg);

+		}

+	}

+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/JarContentReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/JarContentReference.java
index 8b50727..23bb769 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/JarContentReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/JarContentReference.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import java.io.*;

 import java.net.URL;

@@ -356,4 +362,4 @@
 			}

 		}

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/JarEntryContentReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/JarEntryContentReference.java
index 5a6d6fe..f6c594f 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/JarEntryContentReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/JarEntryContentReference.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import java.io.*;

 import java.net.URL;

@@ -103,4 +109,4 @@
 		else

 			return getClass().getName() + "@" + hashCode(); //$NON-NLS-1$

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/NonPluginEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/NonPluginEntry.java
index 30c4731..9132f8e 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/NonPluginEntry.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/NonPluginEntry.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import org.eclipse.update.core.model.NonPluginEntryModel;

 

@@ -25,4 +31,4 @@
 	public NonPluginEntry() {

 		super();

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/PluginEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/PluginEntry.java
index 9abd408..ad83841 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/PluginEntry.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/PluginEntry.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import org.eclipse.update.core.model.PluginEntryModel;

 import org.eclipse.update.internal.core.UpdateCore;

@@ -79,4 +85,4 @@
 		return getVersionedIdentifier().equals(e.getVersionedIdentifier());

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Site.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Site.java
index 68a0d80..834fbae 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Site.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/Site.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import java.net.URL;

 import java.util.*;

@@ -513,4 +519,4 @@
 	}

 

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteContentProvider.java
index 55723b6..aae7363 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteContentProvider.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteContentProvider.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

  

 import java.net.MalformedURLException;

 import java.net.URL;

@@ -75,4 +81,4 @@
 	public void setSite(ISite site) {

 		this.site = site;

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReference.java
index 2a18a4c..de3feff 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReference.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import java.util.ArrayList;
 import java.util.List;
@@ -79,4 +85,4 @@
 		this.addCategoryName(category.getName());
 	}
 
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReferenceModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReferenceModel.java
index 3d249e3..700f244 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReferenceModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReferenceModel.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.core;
 
 import java.util.*;
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/URLEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/URLEntry.java
index 2c0e883..c105b5b 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/URLEntry.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/URLEntry.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import org.eclipse.update.core.model.URLEntryModel;

 import org.eclipse.update.internal.core.Policy;

@@ -44,4 +50,4 @@
 		//$NON-NLS-1$

 		return result;

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Utilities.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Utilities.java
index e8d042e..2a047a8 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Utilities.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/Utilities.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import java.io.*;
 import java.text.DateFormat;
@@ -344,4 +350,4 @@
 			bufferPool = new Stack();
 		bufferPool.push(buf);
 	}
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Verifier.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Verifier.java
index a0ed256..913f6a5 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Verifier.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/Verifier.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
  
 import org.eclipse.core.runtime.CoreException;
 
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/VersionedIdentifier.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/VersionedIdentifier.java
index 153c3a7..bedf91c 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/VersionedIdentifier.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/VersionedIdentifier.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import org.eclipse.core.runtime.PluginVersionIdentifier;

 import org.eclipse.update.internal.core.Policy;

@@ -110,4 +116,4 @@
 		return toString().hashCode();

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ArchiveReferenceModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ArchiveReferenceModel.java
index 21d27ba..8883f25 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ArchiveReferenceModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ArchiveReferenceModel.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core.model;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import java.net.MalformedURLException;

 import java.net.URL;

@@ -104,4 +110,4 @@
 		// resolve local elements

 		url = resolveURL(base, bundleURL, urlString);

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/CategoryModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/CategoryModel.java
index 0115c19..b8d1666 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/CategoryModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/CategoryModel.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.core.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -210,4 +216,4 @@
 	protected String getPropertyName() {
 		return Site.SITE_FILE;
 	}	
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ContentEntryModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ContentEntryModel.java
index d4fc7f0..72ebd43 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ContentEntryModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ContentEntryModel.java
@@ -1,9 +1,15 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core.model;

 

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 /**

  * Content entry model object.

@@ -187,4 +193,4 @@
 		assertIsWriteable();

 		this.nl = nl;

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultFeatureParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultFeatureParser.java
index 94a71ee..a54f614 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultFeatureParser.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultFeatureParser.java
@@ -1,9 +1,15 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core.model;

 

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import java.io.IOException;

 import java.io.InputStream;

@@ -1257,4 +1263,4 @@
 		super.ignorableWhitespace(arg0, arg1, arg2);

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultSiteParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultSiteParser.java
index 645eb84..5280fd0 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultSiteParser.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultSiteParser.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core.model;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import java.io.*;

 import java.util.Iterator;

@@ -704,4 +710,4 @@
 				return Policy.bind("DefaultSiteParser.UnknownState"); //$NON-NLS-1$

 		}

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModelFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModelFactory.java
index a6009c7..673375c 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModelFactory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModelFactory.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core.model;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import java.io.IOException;

 import java.io.InputStream;

@@ -144,4 +150,4 @@
 	public URLEntryModel createURLEntryModel() {

 		return new URLEntryModel();

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureReferenceModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureReferenceModel.java
index 1418795..1ad9f0c 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureReferenceModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureReferenceModel.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core.model;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import java.net.MalformedURLException;

 import java.net.URL;

@@ -415,4 +421,4 @@
 		this.patch = patch;

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ImportModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ImportModel.java
index 41abe11..95dc761 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ImportModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ImportModel.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core.model;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 /**

  * Plug-in dependency model object.

@@ -263,4 +269,4 @@
 		this.nl = nl;

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/IncludedFeatureReferenceModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/IncludedFeatureReferenceModel.java
index 161af30..0a4cf51 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/IncludedFeatureReferenceModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/IncludedFeatureReferenceModel.java
@@ -1,11 +1,17 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.core.model;
 
 import org.eclipse.update.core.*;
 
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 /**
  * Included Feature reference model object.
@@ -211,4 +217,4 @@
 		this.nl = nl;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallAbortedException.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallAbortedException.java
index 6a20374..5e962bc 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallAbortedException.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallAbortedException.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.core.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import org.eclipse.core.runtime.*;
 
@@ -22,4 +28,4 @@
 	public InstallAbortedException(String msg,Exception e) {
 		super(new Status(IStatus.INFO,"org.eclipse.update.core",IStatus.OK,msg,e));
 	}
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallHandlerEntryModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallHandlerEntryModel.java
index 31970bb..a629caf 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallHandlerEntryModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InstallHandlerEntryModel.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.core.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -128,4 +134,4 @@
 		// resolve local elements
 		url = resolveURL(base,bundleURL, urlString);
 	}
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InvalidSiteTypeException.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InvalidSiteTypeException.java
index ff6ad01..bd6f965 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InvalidSiteTypeException.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/InvalidSiteTypeException.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core.model;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 /**

  * Exception thrown when the type of the site discovered in the site manifest

@@ -35,4 +41,4 @@
 	public String getNewType() {

 		return newSiteType;

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ModelObject.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ModelObject.java
index a229fdf..56db859 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ModelObject.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ModelObject.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core.model;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import java.lang.reflect.Array;

 import java.net.*;

@@ -371,4 +377,4 @@
 		return Feature.FEATURE_FILE;

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/NonPluginEntryModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/NonPluginEntryModel.java
index bdcfd0d..970c903 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/NonPluginEntryModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/NonPluginEntryModel.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core.model;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 /**

  * Non-plug-in entry model object.

@@ -48,4 +54,4 @@
 		assertIsWriteable();

 		this.id = id;

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/PluginEntryModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/PluginEntryModel.java
index eac5ab3..9a903ae 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/PluginEntryModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/PluginEntryModel.java
@@ -1,9 +1,15 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core.model;

 

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 /**

  * Plug-in entry model object.

@@ -126,4 +132,4 @@
 		return msg;

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModel.java
index a525d69..9eb3c9f 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModel.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.core.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -354,4 +360,4 @@
 		return Site.SITE_FILE;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModelFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModelFactory.java
index 911da56..9f2d4b8 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModelFactory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/SiteModelFactory.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core.model;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import java.io.IOException;

 import java.io.InputStream;

@@ -143,4 +149,4 @@
 	public CategoryModel createSiteCategoryModel() {

 		return new CategoryModel();

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/URLEntryModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/URLEntryModel.java
index ba9dd8b..8fe29b7 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/URLEntryModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/URLEntryModel.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.core.model;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */ 

 

 import java.net.MalformedURLException;

 import java.net.URL;

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Assert.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Assert.java
index 022e9a8..9377b0f 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Assert.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Assert.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

  

 /**

  * <code>Assert</code> is useful for for embedding runtime sanity checks

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/BaseSiteLocalFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/BaseSiteLocalFactory.java
index 2b636e2..ac39623 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/BaseSiteLocalFactory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/BaseSiteLocalFactory.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 import org.eclipse.update.core.model.SiteModel;

 import org.eclipse.update.internal.model.*;

 /**

@@ -46,4 +52,4 @@
 		((ConfigurationPolicy) policyModel).setConfiguredSiteModel(configSite);

 		return configSite;

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationActivity.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationActivity.java
index 4d4f9c6..f5acc1d 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationActivity.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationActivity.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 import java.io.PrintWriter;

 import org.eclipse.update.configuration.IActivity;

 import org.eclipse.update.configuration.IInstallConfiguration;

@@ -62,4 +68,4 @@
 	public IInstallConfiguration getInstallConfiguration() {

 		return (IInstallConfiguration) getInstallConfigurationModel();

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationPolicy.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationPolicy.java
index 54e0bc6..6c922b1 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationPolicy.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationPolicy.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 import java.io.File;

 import java.net.URL;

 import java.util.*;

@@ -502,4 +508,4 @@
 

 		return resultEntry;

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java
index 9bdf4c4..62c1211 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java
@@ -1,9 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.core;
 
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import java.io.*;
 import java.net.MalformedURLException;
@@ -1206,4 +1212,4 @@
 		return (parents.length == 0);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConnectionThreadManager.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConnectionThreadManager.java
index 0cfef48..f0b6531 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConnectionThreadManager.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConnectionThreadManager.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 /*
  * Created on Feb 19, 2003
  *
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ContentConsumer.java
index 3cf4259..f506813 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ContentConsumer.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ContentConsumer.java
@@ -1,9 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.core;
 
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import org.eclipse.update.core.IContentConsumer;
 
@@ -15,4 +21,4 @@
 
 public abstract class ContentConsumer implements IContentConsumer {
 
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/DefaultInstallHandler.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/DefaultInstallHandler.java
index 8a5bfc6..15b9ce9 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/DefaultInstallHandler.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/DefaultInstallHandler.java
@@ -1,9 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.core;
 
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import java.io.IOException;
 import java.util.jar.JarEntry;
@@ -140,4 +146,4 @@
 
 		return;
 	}
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ErrorRecoveryLog.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ErrorRecoveryLog.java
index dad2f8d..464a77f 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ErrorRecoveryLog.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ErrorRecoveryLog.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.core;
 
 import java.io.*;
@@ -13,10 +23,6 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.update.core.Utilities;
 
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 /**
  * singleton pattern.
@@ -537,4 +543,4 @@
 	 	}
 	 	return multi;
 	 }	    
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureContentConsumer.java
index 8863c9b..aeb6f7a 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureContentConsumer.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureContentConsumer.java
@@ -1,9 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.core;
 
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import org.eclipse.update.core.IFeatureContentConsumer;
 import org.eclipse.update.core.model.ModelObject;
@@ -17,4 +23,4 @@
 public abstract class FeatureContentConsumer extends ModelObject
 	implements IFeatureContentConsumer {
 
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableContentConsumer.java
index f3695dc..3f1c600 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableContentConsumer.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableContentConsumer.java
@@ -1,9 +1,15 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.internal.core;

 

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

  

 import java.util.*;

 

@@ -172,4 +178,4 @@
 

 		return (IFeatureContentConsumer[]) children.toArray(arrayTypeFor(children));

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableContentProvider.java
index 167ed99..ee87c43 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableContentProvider.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableContentProvider.java
@@ -1,9 +1,15 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.internal.core;

 

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import java.io.File;

 import java.io.IOException;

@@ -265,4 +271,4 @@
 		

 		return result;

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableFactory.java
index 6742f2c..f0f9656 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableFactory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableFactory.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 import java.io.*;

 import java.io.File;

 import java.io.InputStream;

@@ -115,4 +121,4 @@
 		return url;

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedContentProvider.java
index a17969f..bbb4459 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedContentProvider.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedContentProvider.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 import java.io.*;

 import java.net.URL;

 import java.util.*;

@@ -273,4 +279,4 @@
 

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedFactory.java
index f41892b..bbcaea8 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedFactory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedFactory.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 import java.io.IOException;

 import java.io.InputStream;

 import java.net.MalformedURLException;

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureTypeFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureTypeFactory.java
index f0263c3..2b6cdcd 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureTypeFactory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureTypeFactory.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 import java.util.HashMap;

 import java.util.Map;

 

@@ -82,4 +88,4 @@
 			factories = new HashMap();

 		return factories;

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FileResponse.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FileResponse.java
index 21e69cc..8444a68 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FileResponse.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FileResponse.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 import java.io.InputStream;
 
 //import org.eclipse.update.internal.core.net.http.IContext;
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/HttpResponse.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/HttpResponse.java
index 0dd40ea..2cf917a 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/HttpResponse.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/HttpResponse.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.core;
 
 import java.io.*;
@@ -6,10 +16,6 @@
 import org.eclipse.core.runtime.*;
 import org.eclipse.core.runtime.IProgressMonitor;
 
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 public class HttpResponse extends Response {
 	private static final long POLLING_INTERVAL = 200;
 
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ISiteContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ISiteContentConsumer.java
index a336f4b..e734360 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ISiteContentConsumer.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ISiteContentConsumer.java
@@ -1,9 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.core;
 
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
  
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/IStatusCodes.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/IStatusCodes.java
index 1fe2f2c..6582d7b 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/IStatusCodes.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/IStatusCodes.java
@@ -1,13 +1,13 @@
-/**********************************************************************
- * Copyright (c) 2000,2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
+ * http://www.eclipse.org/legal/cpl-v10.html
  * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.core;
 
 /**
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/IWritable.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/IWritable.java
index 3efcdd7..8f8901e 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/IWritable.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/IWritable.java
@@ -1,3 +1,13 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.internal.core;

 

 import java.io.PrintWriter;

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallConfiguration.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallConfiguration.java
index 1f8593f..b760d1d 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallConfiguration.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallConfiguration.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 import java.io.*;

 import java.net.MalformedURLException;

 import java.net.URL;

@@ -802,4 +808,4 @@
 		}

 		return url;

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallHandlerProxy.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallHandlerProxy.java
index 63cf3a8..f126eec 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallHandlerProxy.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallHandlerProxy.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -517,4 +523,4 @@
 		String pfx = (feature==null) ? "" : feature.getVersionedIdentifier().toString();
 		System.out.println("InstallHandler["+pfx+"]: " + s);
 	}
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InternalSiteManager.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InternalSiteManager.java
index 26f730f..bff46aa 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InternalSiteManager.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InternalSiteManager.java
@@ -1,9 +1,15 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.internal.core;

 

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 

 import java.io.File;

 import java.lang.reflect.Array;

@@ -437,4 +443,4 @@
 		return value.longValue();

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ListenersList.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ListenersList.java
index 138c84e..e46abb3 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ListenersList.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ListenersList.java
@@ -1,9 +1,15 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.internal.core;

 

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 

 /**

  * This class is used to maintain a list of listeners, and

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/NonPluginEntryContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/NonPluginEntryContentConsumer.java
index 264cb2e..68b1de5 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/NonPluginEntryContentConsumer.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/NonPluginEntryContentConsumer.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IProgressMonitor;

 import org.eclipse.update.core.ContentReference;

@@ -48,4 +54,4 @@
 		}

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/PluginEntryContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/PluginEntryContentConsumer.java
index dec4c57..d0b5fec 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/PluginEntryContentConsumer.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/PluginEntryContentConsumer.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IProgressMonitor;

 import org.eclipse.update.core.ContentReference;

@@ -48,4 +54,4 @@
 		}

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Policy.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Policy.java
index 104786e..c84053e 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Policy.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Policy.java
@@ -1,9 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.core;
 
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import java.text.MessageFormat;
 import java.util.MissingResourceException;
@@ -88,4 +94,4 @@
 			return monitor;
 		return new SubProgressMonitor(monitor, ticks);
 	}
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Response.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Response.java
index 2df60e3..cb7a7bd 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Response.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Response.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.core;
 
 import java.io.*;
@@ -5,10 +15,6 @@
 
 import org.eclipse.core.runtime.*;
 
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 public class Response {
 	
 	protected URL url;
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SessionDelta.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SessionDelta.java
index 327e9ab..312dbf9 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SessionDelta.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SessionDelta.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 import java.io.File;
 import java.util.*;
 
@@ -314,4 +320,4 @@
 				UpdateCore.warn("Unable to retrieve children of patch " + patchToEnable, e);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteContentConsumer.java
index 54bf317..9213991 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteContentConsumer.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteContentConsumer.java
@@ -1,9 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.core;
 
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */ 
 
 import org.eclipse.update.core.ISite;
 
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFile.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFile.java
index d77956c..9dcd6dc 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFile.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFile.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 import java.io.IOException;

 import java.util.*;

 

@@ -425,4 +431,4 @@
 		}

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentConsumer.java
index 55c8543..34c3464 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentConsumer.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentConsumer.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 import java.io.*;

 import java.net.MalformedURLException;

 import java.net.URL;

@@ -288,4 +294,4 @@
 		contentConsumers.add(cons);

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentProvider.java
index dd76b16..51db025 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentProvider.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentProvider.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 import java.net.URL;

 

 import org.eclipse.core.runtime.CoreException;

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileFactory.java
index e3dbaef..d74cf6c 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileFactory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileFactory.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 import java.io.*;

 import java.net.MalformedURLException;

 import java.net.URL;

@@ -347,4 +353,4 @@
 		return (super.canParseSiteType(type) || SiteFileContentProvider.SITE_TYPE.equalsIgnoreCase(type));

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileNonPluginContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileNonPluginContentConsumer.java
index 289f37f..4efea42 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileNonPluginContentConsumer.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileNonPluginContentConsumer.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 import java.io.*;

 

 import org.eclipse.core.runtime.*;

@@ -66,4 +72,4 @@
 		closed = true;

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFilePluginContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFilePluginContentConsumer.java
index a5d1c2a..1f54f54 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFilePluginContentConsumer.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFilePluginContentConsumer.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 import java.io.*;

 import java.net.MalformedURLException;

 import java.net.URL;

@@ -172,4 +178,4 @@
 		closed = true;

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteLocal.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteLocal.java
index ad286c6..7b99e8a 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteLocal.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteLocal.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved. 

- */

 import java.io.*;

 import java.net.*;

 import java.util.*;

@@ -759,4 +765,4 @@
 		trimHistoryToCapacity();

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteReconciler.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteReconciler.java
index 00b0dbb..9c5052a 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteReconciler.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteReconciler.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved. 
- */
 import java.io.*;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -1223,4 +1229,4 @@
 		}
 	}	
 	
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteStatusAnalyzer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteStatusAnalyzer.java
index ce326e5..ea23522 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteStatusAnalyzer.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteStatusAnalyzer.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved. 
- */
 import java.util.ArrayList;
 import java.util.List;
 
@@ -392,4 +398,4 @@
 		}
 		return null;
 	}
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteTypeFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteTypeFactory.java
index 3098126..8fc3a43 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteTypeFactory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteTypeFactory.java
@@ -1,3 +1,13 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.internal.core;

 

 import java.util.HashMap;

@@ -6,10 +16,6 @@
 import org.eclipse.core.runtime.*;

 import org.eclipse.update.core.ISiteFactory;

 import org.eclipse.update.core.Utilities;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 

 /**

  * 

@@ -88,4 +94,4 @@
 		this.factories = factories;

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLContentProvider.java
index 8b4fa9b..819c606 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLContentProvider.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLContentProvider.java
Binary files differ
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLFactory.java
index 78aa8f7..1fdf4b4 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLFactory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLFactory.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 import java.io.IOException;

 import java.io.InputStream;

 import java.net.*;

@@ -85,4 +91,4 @@
 		return (super.canParseSiteType(type) || SiteURLContentProvider.SITE_TYPE.equalsIgnoreCase(type));

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/TargetFeature.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/TargetFeature.java
index 5fa732e..0133ab3 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/TargetFeature.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/TargetFeature.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.update.core.*;
 
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/URLEncoder.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/URLEncoder.java
index f51db93..098c4b2 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/URLEncoder.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/URLEncoder.java
@@ -1,135 +1,141 @@
-package org.eclipse.update.internal.core;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.io.UnsupportedEncodingException;
-
-import java.net.URL;
-import java.net.MalformedURLException;
-
-import java.util.StringTokenizer;
-
-/**
- * Encodes a <code>URL</code> into an <code>ASCII</code> readable
- * <code>URL</code> that is safe for transport. Encoded
- * <code>URL</code>s can be decoded using the <code>URLDecoder</code>.
- *
- * @see URLDecoder
- */
-public final class URLEncoder {
-	/**
-	 * Prevents instances from being created.
-	 */
-	private URLEncoder() {
-	}
-	/**
-	 * Encodes the given file and reference parts of a <code>URL</code> into
-	 * an <code>ASCII</code> readable <code>String</code> that is safe for
-	 * transport. Returns the result.
-	 *
-	 * @return the result of encoding the given file and reference parts of
-	 *         a <code>URL</code> into an <code>ASCII</code> readable
-	 *         <code>String</code> that is safe for transport
-	 */
-	public static String encode(String file, String query, String ref) {
-		StringBuffer buf = new StringBuffer();
-		StringTokenizer tokenizer = new StringTokenizer(file, "/", true); //$NON-NLS-1$
-
-		while (tokenizer.hasMoreTokens()) {
-			String token = tokenizer.nextToken();
-			if (token.equals("/")) { //$NON-NLS-1$
-				buf.append(token);
-			} else {
-				buf.append(encodeSegment(token));
-			}
-		}
-
-		if (query != null){
-			buf.append('?');
-			buf.append(query);
-		}
-
-		if (ref != null) {
-			buf.append('#');
-			buf.append(encodeSegment(ref));
-		}
-
-		return buf.toString();
-	}
-	/**
-	 * Encodes the given <code>URL</code> into an <code>ASCII</code>
-	 * readable <code>URL</code> that is safe for transport. Returns the
-	 * result.
-	 *
-	 * @return the result of encoding the given <code>URL</code> into an
-	 *         <code>ASCII</code> readable <code>URL</code> that is safe for
-	 *         transport
-	 */
-	public static URL encode(URL url) throws MalformedURLException {
-		// encode the path not the file as the URL may contain a query
-		String file = url.getPath();
-		String query = url.getQuery();
-		String ref = url.getRef();
-
-		URL result =  new URL(url.getProtocol(), url.getHost(), url.getPort(), encode(file, query, ref));
-		return result;
-	}
-	private static String encodeSegment(String segment) {
-		
-		// if we find a '%' in the string, consider the URL to be already encoded
-		if (segment.indexOf('%')!=-1) return segment;
-		
-		StringBuffer result = new StringBuffer(segment.length());
-
-		for (int i = 0; i < segment.length(); ++i) {
-			char c = segment.charAt(i);
-			if (mustEncode(c)) {
-				byte[] bytes = null;
-				try {
-					bytes = new Character(c).toString().getBytes("UTF8"); //$NON-NLS-1$
-				} catch (UnsupportedEncodingException e) {
-					Assert.isTrue(false, e.getMessage());
-				}
-				for (int j = 0; j < bytes.length; ++j) {
-					result.append('%');
-					result.append(Integer.toHexString((bytes[j] >> 4) & 0x0F));
-					result.append(Integer.toHexString(bytes[j] & 0x0F));
-				}
-			} else {
-				result.append(c);
-			}
-		}
-
-		return result.toString();
-	}
-	private static boolean mustEncode(char c) {
-		if (c >= 'a' && c <= 'z') {
-			return false;
-		}
-
-		if (c >= 'A' && c <= 'Z') {
-			return false;
-		}
-
-		if (c >= '0' && c <= '9') {
-			return false;
-		}
-
-		if (c >= '\'' && c <= '.') {
-			return false;
-		}
-
-		if (c == '!' || c == '$' || c == '_') {
-			return false;
-		}
-
-		// needed otherwise file:///c:/file/ becomes file:///C%3a/file/
-		if (c ==':'){
-			return false;
-		}
-		return true;
-	}
-}
\ No newline at end of file
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.update.internal.core;

+

+

+import java.io.UnsupportedEncodingException;

+

+import java.net.URL;

+import java.net.MalformedURLException;

+

+import java.util.StringTokenizer;

+

+/**

+ * Encodes a <code>URL</code> into an <code>ASCII</code> readable

+ * <code>URL</code> that is safe for transport. Encoded

+ * <code>URL</code>s can be decoded using the <code>URLDecoder</code>.

+ *

+ * @see URLDecoder

+ */

+public final class URLEncoder {

+	/**

+	 * Prevents instances from being created.

+	 */

+	private URLEncoder() {

+	}

+	/**

+	 * Encodes the given file and reference parts of a <code>URL</code> into

+	 * an <code>ASCII</code> readable <code>String</code> that is safe for

+	 * transport. Returns the result.

+	 *

+	 * @return the result of encoding the given file and reference parts of

+	 *         a <code>URL</code> into an <code>ASCII</code> readable

+	 *         <code>String</code> that is safe for transport

+	 */

+	public static String encode(String file, String query, String ref) {

+		StringBuffer buf = new StringBuffer();

+		StringTokenizer tokenizer = new StringTokenizer(file, "/", true); //$NON-NLS-1$

+

+		while (tokenizer.hasMoreTokens()) {

+			String token = tokenizer.nextToken();

+			if (token.equals("/")) { //$NON-NLS-1$

+				buf.append(token);

+			} else {

+				buf.append(encodeSegment(token));

+			}

+		}

+

+		if (query != null){

+			buf.append('?');

+			buf.append(query);

+		}

+

+		if (ref != null) {

+			buf.append('#');

+			buf.append(encodeSegment(ref));

+		}

+

+		return buf.toString();

+	}

+	/**

+	 * Encodes the given <code>URL</code> into an <code>ASCII</code>

+	 * readable <code>URL</code> that is safe for transport. Returns the

+	 * result.

+	 *

+	 * @return the result of encoding the given <code>URL</code> into an

+	 *         <code>ASCII</code> readable <code>URL</code> that is safe for

+	 *         transport

+	 */

+	public static URL encode(URL url) throws MalformedURLException {

+		// encode the path not the file as the URL may contain a query

+		String file = url.getPath();

+		String query = url.getQuery();

+		String ref = url.getRef();

+

+		URL result =  new URL(url.getProtocol(), url.getHost(), url.getPort(), encode(file, query, ref));

+		return result;

+	}

+	private static String encodeSegment(String segment) {

+		

+		// if we find a '%' in the string, consider the URL to be already encoded

+		if (segment.indexOf('%')!=-1) return segment;

+		

+		StringBuffer result = new StringBuffer(segment.length());

+

+		for (int i = 0; i < segment.length(); ++i) {

+			char c = segment.charAt(i);

+			if (mustEncode(c)) {

+				byte[] bytes = null;

+				try {

+					bytes = new Character(c).toString().getBytes("UTF8"); //$NON-NLS-1$

+				} catch (UnsupportedEncodingException e) {

+					Assert.isTrue(false, e.getMessage());

+				}

+				for (int j = 0; j < bytes.length; ++j) {

+					result.append('%');

+					result.append(Integer.toHexString((bytes[j] >> 4) & 0x0F));

+					result.append(Integer.toHexString(bytes[j] & 0x0F));

+				}

+			} else {

+				result.append(c);

+			}

+		}

+

+		return result.toString();

+	}

+	private static boolean mustEncode(char c) {

+		if (c >= 'a' && c <= 'z') {

+			return false;

+		}

+

+		if (c >= 'A' && c <= 'Z') {

+			return false;

+		}

+

+		if (c >= '0' && c <= '9') {

+			return false;

+		}

+

+		if (c >= '\'' && c <= '.') {

+			return false;

+		}

+

+		if (c == '!' || c == '$' || c == '_') {

+			return false;

+		}

+

+		// needed otherwise file:///c:/file/ becomes file:///C%3a/file/

+		if (c ==':'){

+			return false;

+		}

+		return true;

+	}

+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/URLKey.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/URLKey.java
index b79dc0f..bf76bc6 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/URLKey.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/URLKey.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
  
 import java.net.URL;
 
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateCore.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateCore.java
index edfff44..4d00719 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateCore.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateCore.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import java.io.File;
 import java.io.IOException;
@@ -302,4 +308,4 @@
 		return false;
 	}
 	
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerLogWriter.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerLogWriter.java
index ee6a72f..ee238fe 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerLogWriter.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerLogWriter.java
@@ -1,13 +1,13 @@
 /*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
+ * http://www.eclipse.org/legal/cpl-v10.html
  * 
  * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.core;
 
 import java.io.*;
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerReconciler.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerReconciler.java
index 62ca5b4..e86b61e 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerReconciler.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerReconciler.java
@@ -1,9 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.core;
 
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
 
 import java.io.*;
 import java.net.URL;
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerUtils.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerUtils.java
index 852babc..3c21e12 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerUtils.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerUtils.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 import java.io.*;

 import java.net.*;

 import java.util.*;

@@ -735,4 +741,4 @@
 		writer.init(file,encoding);

 		return writer;

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Volume.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Volume.java
index d559452..e3c5c86 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Volume.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Volume.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.core;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 import java.io.File;
 
 import org.eclipse.update.configuration.IVolume;
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/messages.properties b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/messages.properties
index 98e8239..610cad7 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/messages.properties
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/messages.properties
@@ -1,3 +1,13 @@
+###############################################################################
+# Copyright (c) 2000, 2003 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials 
+# are made available under the terms of the Common Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/cpl-v10.html
+# 
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
 # Install Update Core Properties File
 # 
 
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationActivityModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationActivityModel.java
index 7ef374d..03c5562 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationActivityModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationActivityModel.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
  
 import java.util.Date;
 
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationPolicyModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationPolicyModel.java
index 5c4b227..703fed1 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationPolicyModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationPolicyModel.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
 import java.net.URL;
 import java.util.*;
 
@@ -228,4 +234,4 @@
 
 
 	
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfiguredSiteModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfiguredSiteModel.java
index 4aaa21c..91efc49 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfiguredSiteModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfiguredSiteModel.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.update.core.model.ModelObject;
@@ -173,4 +179,4 @@
 		enable=value;
 	}
 	
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/DefaultPluginParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/DefaultPluginParser.java
index 2fab950..ab960c3 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/DefaultPluginParser.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/DefaultPluginParser.java
@@ -1,9 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.model;
 
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -89,4 +95,4 @@
 		version = attributes.getValue("version"); //$NON-NLS-1$
 		throw new ParseCompleteException(""); //$NON-NLS-1$
 	}
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallChangeParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallChangeParser.java
index 12a2834..9241b67 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallChangeParser.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallChangeParser.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 import java.io.*;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -202,4 +208,4 @@
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationModel.java
index 7ec1885..c2b603d 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationModel.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 import java.io.*;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -277,4 +283,4 @@
 		} catch (MalformedURLException e){}
 		
 	}
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationParser.java
index a9eafcd..7dde0ff 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationParser.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationParser.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.*;
@@ -288,4 +294,4 @@
 		}
 
 	}
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalModel.java
index 6ecb0a4..1ac87ea 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalModel.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.*;
@@ -225,4 +231,4 @@
 		return SiteLocalModel.SITE_LOCAL_FILE;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalParser.java
index 5fdfb26..74bf5f5 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalParser.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalParser.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.model;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.*;
@@ -201,4 +207,4 @@
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/CertificatePair.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/CertificatePair.java
index f81b249..1ba8c45 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/CertificatePair.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/CertificatePair.java
@@ -1,9 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 
 package org.eclipse.update.internal.security;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
  
  import java.security.cert.Certificate;
  
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerificationResult.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerificationResult.java
index 6571346..eac2eed 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerificationResult.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerificationResult.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.security;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import java.security.Principal;
 import java.security.cert.*;
@@ -331,4 +337,4 @@
 		return this.alreadySeen = seen;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerifier.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerifier.java
index ba6c533..578b7e4 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerifier.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerifier.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.security;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import java.io.*;
 import java.security.*;
@@ -426,4 +432,4 @@
 		initialize();
 	}
 
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeyStores.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeyStores.java
index 9a3974d..1b0afb7 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeyStores.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeyStores.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.security;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
 
 import java.io.*;
 import java.net.MalformedURLException;
@@ -203,4 +209,4 @@
 	private void log(Exception e){
 		UpdateCore.warn("Cannot retrieve a KeyStore",e);
 	}
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeystoreHandle.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeystoreHandle.java
index 117c554..684477e 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeystoreHandle.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeystoreHandle.java
@@ -1,12 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.internal.security;
 
 import java.net.URL;
 
 
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */
  
 /**
  * Manages a handle to a keystore
diff --git a/update/org.eclipse.update.tests.core/build.properties b/update/org.eclipse.update.tests.core/build.properties
index a403b4b..2861d65 100644
--- a/update/org.eclipse.update.tests.core/build.properties
+++ b/update/org.eclipse.update.tests.core/build.properties
@@ -1,2 +1,12 @@
+###############################################################################

+# Copyright (c) 2000, 2003 IBM Corporation and others.

+# All rights reserved. This program and the accompanying materials 

+# are made available under the terms of the Common Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/cpl-v10.html

+# 

+# Contributors:

+#     IBM Corporation - initial API and implementation

+###############################################################################

 source.updatetests.jar=src/

 bin.includes=*.jar,about.html,test.xml,plugin.xml,data/,webserver/
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/parsertests/site.properties b/update/org.eclipse.update.tests.core/data/parsertests/site.properties
index 211986b..8e1ced4 100644
--- a/update/org.eclipse.update.tests.core/data/parsertests/site.properties
+++ b/update/org.eclipse.update.tests.core/data/parsertests/site.properties
@@ -1,2 +1,12 @@
+###############################################################################

+# Copyright (c) 2000, 2003 IBM Corporation and others.

+# All rights reserved. This program and the accompanying materials 

+# are made available under the terms of the Common Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/cpl-v10.html

+# 

+# Contributors:

+#     IBM Corporation - initial API and implementation

+###############################################################################

 drivers=Required Drivers

 security=Security Fixes
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/resources.properties b/update/org.eclipse.update.tests.core/data/resources.properties
index 63efcee..1a3ab90 100644
--- a/update/org.eclipse.update.tests.core/data/resources.properties
+++ b/update/org.eclipse.update.tests.core/data/resources.properties
@@ -1,3 +1,13 @@
+###############################################################################

+# Copyright (c) 2000, 2003 IBM Corporation and others.

+# All rights reserved. This program and the accompanying materials 

+# are made available under the terms of the Common Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/cpl-v10.html

+# 

+# Contributors:

+#     IBM Corporation - initial API and implementation

+###############################################################################

 HTTP_PATH_1=/org.eclipse.update.tests.core.updatetests/UpdateManager2/

 HTTP_PATH_2=/org.eclipse.update.tests.core.updatetests/UpdateManager/

 HTTP_PATH_3=/org.eclipse.update.tests.core.updatetests/Site with space/
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/plugin.properties b/update/org.eclipse.update.tests.core/plugin.properties
index 9746c6d..1caa664 100644
--- a/update/org.eclipse.update.tests.core/plugin.properties
+++ b/update/org.eclipse.update.tests.core/plugin.properties
@@ -1,3 +1,13 @@
+###############################################################################

+# Copyright (c) 2000, 2003 IBM Corporation and others.

+# All rights reserved. This program and the accompanying materials 

+# are made available under the terms of the Common Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/cpl-v10.html

+# 

+# Contributors:

+#     IBM Corporation - initial API and implementation

+###############################################################################

 

 name = Install/Update Core Tests

 provider-name = Eclipse.org
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/AllTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/AllTests.java
index bd4a9bc..cc441bd 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/AllTests.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/AllTests.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 

 import junit.framework.Test;

 import junit.framework.TestSuite;

@@ -40,4 +46,4 @@
 		suite.addTest(AllModelTests.suite());		

 		return suite;

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateManagerTestCase.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateManagerTestCase.java
index a4de4bb..6462a1b 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateManagerTestCase.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateManagerTestCase.java
@@ -1,9 +1,15 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests;

 

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 

 import java.io.File;

 import java.io.IOException;

@@ -150,4 +156,4 @@
 			UpdateManagerUtils.removeFromFileSystem(file);

 		}

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateTestsPlugin.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateTestsPlugin.java
index 475dbb0..5beceeb 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateTestsPlugin.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateTestsPlugin.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 import org.eclipse.core.runtime.*;

 import org.eclipse.help.internal.appserver.WebappManager;

 import org.eclipse.update.internal.core.UpdateCore;

@@ -80,4 +86,4 @@
 		}

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/AllAPITests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/AllAPITests.java
index ae5abae..ab96b39 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/AllAPITests.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/AllAPITests.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.api;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 import junit.framework.Test;

 import junit.framework.TestSuite;

 

@@ -37,4 +43,4 @@
 		suite.addTest(new TestSuite(TestFeatureContentProvider_FileFilterAPI.class));

 		return suite;

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/MyURLEntry.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/MyURLEntry.java
index 3b6de73..5944db4 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/MyURLEntry.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/MyURLEntry.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.api;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 import java.net.MalformedURLException;

 import java.net.URL;

 

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultExecutableFeatureAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultExecutableFeatureAPI.java
index e3ca5a2..6c8b84f 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultExecutableFeatureAPI.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultExecutableFeatureAPI.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.api;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 import java.net.MalformedURLException;

 import java.net.URL;

 

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultPackageFeatureAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultPackageFeatureAPI.java
index 214f28d..95d0157 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultPackageFeatureAPI.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultPackageFeatureAPI.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.api;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 import java.net.MalformedURLException;

 import java.net.URL;

 

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestFeatureContentProvider_FileFilterAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestFeatureContentProvider_FileFilterAPI.java
index 46e02f1..011305a 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestFeatureContentProvider_FileFilterAPI.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestFeatureContentProvider_FileFilterAPI.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.tests.api;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
 import org.eclipse.update.core.FeatureContentProvider;
 import org.eclipse.update.internal.core.FeatureExecutableContentProvider;
 import org.eclipse.update.tests.UpdateManagerTestCase;
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestLocalSiteAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestLocalSiteAPI.java
index 0045f27..2ea68ec 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestLocalSiteAPI.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestLocalSiteAPI.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.api;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 import java.net.URL;

 

 import org.eclipse.update.core.*;

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestNestedFeatureAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestNestedFeatureAPI.java
index aa3b6c3..5db09e4 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestNestedFeatureAPI.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestNestedFeatureAPI.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.tests.api;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
 import java.net.MalformedURLException;
 import java.net.URL;
 
@@ -144,4 +150,4 @@
 		}
 	*/
 
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestPluginContainerAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestPluginContainerAPI.java
index 97a697c..0bd1fef 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestPluginContainerAPI.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestPluginContainerAPI.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.api;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 import java.net.MalformedURLException;

 import java.net.URL;

 

@@ -68,4 +74,4 @@
 

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestSiteAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestSiteAPI.java
index b37a9be..6d7cdfa 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestSiteAPI.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestSiteAPI.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.api;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 import java.io.File;

 import java.net.URL;

 

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestSiteManagerAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestSiteManagerAPI.java
index 0a41260..75fd89e 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestSiteManagerAPI.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestSiteManagerAPI.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.api;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 import java.io.File;

 import java.net.URL;

 

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestUpdateManagerUtilsAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestUpdateManagerUtilsAPI.java
index e847cbf..d82488e 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestUpdateManagerUtilsAPI.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestUpdateManagerUtilsAPI.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.api;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 import java.net.URL;

 

 import org.eclipse.update.internal.core.UpdateManagerUtils;

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/AllConfigurationsTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/AllConfigurationsTests.java
index e24d856..7e4e003 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/AllConfigurationsTests.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/AllConfigurationsTests.java
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/TestBackward.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/TestBackward.java
index 38cb04b..fd00cdc 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/TestBackward.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/TestBackward.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.configurations;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 import java.io.File;

 import java.net.URL;

 

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/TestRevert.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/TestRevert.java
index 53656c6..8bafde3 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/TestRevert.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/TestRevert.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.configurations;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 import java.io.File;

 import java.net.URL;

 

@@ -94,8 +100,8 @@
 		

 		//

 		IFeatureReference[] configFeatures = newConfigSite.getConfiguredFeatures();

-		for (int i = 0; i < configFeatures.length; i++) {
-			System.out.println(configFeatures[i]);
+		for (int i = 0; i < configFeatures.length; i++) {

+			System.out.println(configFeatures[i]);

 		}		

 		assertTrue("Wrong number of configured features old:"+oldNumber+" new:"+newNumber,oldNumber==newNumber);

 		

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/AllPlatformConfigurationTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/AllPlatformConfigurationTests.java
index a0168e4..fc1fef9 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/AllPlatformConfigurationTests.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/AllPlatformConfigurationTests.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.core.boot;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 

 import junit.framework.Test;

 import junit.framework.TestSuite;

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/PlatformConfigurationTestCase.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/PlatformConfigurationTestCase.java
index 3f05e32..c9fa01e 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/PlatformConfigurationTestCase.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/PlatformConfigurationTestCase.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.core.boot;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 

 import java.io.File;

 import java.util.Date;

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/TestPlatCfgAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/TestPlatCfgAPI.java
index b33f3bd..ab03278 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/TestPlatCfgAPI.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/TestPlatCfgAPI.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.core.boot;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 

 import java.io.IOException;

 import java.net.MalformedURLException;

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/TestPlatCfgDefault.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/TestPlatCfgDefault.java
index ff01fe0..e303fb0 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/TestPlatCfgDefault.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/TestPlatCfgDefault.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.core.boot;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 

 import org.eclipse.core.boot.BootLoader;

 import org.eclipse.core.boot.IPlatformConfiguration;

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/implementation/SiteFTP.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/implementation/SiteFTP.java
index b89d4ea..9f70081 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/implementation/SiteFTP.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/implementation/SiteFTP.java
@@ -1,3 +1,13 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.implementation;

 

 import java.io.InputStream;

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/implementation/SiteFTPFactory.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/implementation/SiteFTPFactory.java
index d2da9d8..03cb986 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/implementation/SiteFTPFactory.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/implementation/SiteFTPFactory.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.implementation;

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

 import java.io.IOException;

 import java.io.InputStream;

 import java.net.MalformedURLException;

@@ -54,4 +60,4 @@
 		return "org.eclipse.update.tests.core.ftp".equalsIgnoreCase(type);

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/AllModelTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/AllModelTests.java
index 0627066..dad8de5 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/AllModelTests.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/AllModelTests.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.model;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 import junit.framework.Test;

 import junit.framework.TestSuite;

 

@@ -31,4 +37,4 @@
 

 		return suite;

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/FeatureMain.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/FeatureMain.java
index 2117f78..4ec15e7 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/FeatureMain.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/FeatureMain.java
@@ -1,3 +1,13 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.model;

 

 import java.io.*;

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/SiteMain.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/SiteMain.java
index 373f2a3..890837d 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/SiteMain.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/SiteMain.java
@@ -1,3 +1,13 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.model;

 

 import java.io.*;

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/test.properties b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/test.properties
index d4d3b20..4201818 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/test.properties
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/test.properties
@@ -1,3 +1,13 @@
+###############################################################################

+# Copyright (c) 2000, 2003 IBM Corporation and others.

+# All rights reserved. This program and the accompanying materials 

+# are made available under the terms of the Common Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/cpl-v10.html

+# 

+# Contributors:

+#     IBM Corporation - initial API and implementation

+###############################################################################

 s1 = String 1

 s2 = String 2

 url1 = relative/index.html

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nativeTests/TestLocalSystemInfo.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nativeTests/TestLocalSystemInfo.java
index 4726c47..ffcccbd 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nativeTests/TestLocalSystemInfo.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nativeTests/TestLocalSystemInfo.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.tests.nativeTests;
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved. 
- */
 import java.io.File;
 
 import org.eclipse.update.configuration.IVolume;
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nestedfeatures/AllNestedTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nestedfeatures/AllNestedTests.java
index 5de9755..dc233c0 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nestedfeatures/AllNestedTests.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nestedfeatures/AllNestedTests.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.tests.nestedfeatures;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
 import org.eclipse.update.tests.UpdateManagerTestCase;
 import junit.framework.*;
 
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nestedfeatures/TestInstall.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nestedfeatures/TestInstall.java
index 883f905..6325657 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nestedfeatures/TestInstall.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nestedfeatures/TestInstall.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.tests.nestedfeatures;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
 import java.io.File;
 import java.net.URL;
 
@@ -285,4 +291,4 @@
 					.getURL()
 					.getFile()));
 	}
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/AllParserTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/AllParserTests.java
index e1dfbe8..4cc01a9 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/AllParserTests.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/AllParserTests.java
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestCategories.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestCategories.java
index b39d017..a150186 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestCategories.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestCategories.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.parser;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 import java.net.URL;

 

 import org.eclipse.update.core.*;

@@ -53,4 +59,4 @@
 		assertEquals("Required Drivers", categories[0].getLabel());

 

 	}

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestFeatureParse.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestFeatureParse.java
index 7f69caa..48d30ab 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestFeatureParse.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestFeatureParse.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.parser;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 

 import java.net.URL;

 

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestSiteParse.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestSiteParse.java
index 7f96e4d..bc00473 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestSiteParse.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestSiteParse.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.parser;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 

 import java.io.File;

 import java.net.URL;

@@ -279,4 +285,4 @@
 		assertEquals("Invalid versioned identifier", models[0].getFeatureIdentifier(), "org.eclipse.test.feature");

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/reconciliation/AllReconciliationTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/reconciliation/AllReconciliationTests.java
index bd99394..8b9d17a 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/reconciliation/AllReconciliationTests.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/reconciliation/AllReconciliationTests.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.tests.reconciliation;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
@@ -31,4 +37,4 @@
 
 		return suite;
 	}
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/reconciliation/TestSiteReconciliation.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/reconciliation/TestSiteReconciliation.java
index 7f4b496..59dcf9c 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/reconciliation/TestSiteReconciliation.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/reconciliation/TestSiteReconciliation.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.tests.reconciliation;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
 import java.io.File;
 import java.net.URL;
 
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/AllRegularInstallTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/AllRegularInstallTests.java
index d56dd55..d857b55 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/AllRegularInstallTests.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/AllRegularInstallTests.java
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/MultipleTestLocalSite.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/MultipleTestLocalSite.java
index 23f9a6e..f0325b2 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/MultipleTestLocalSite.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/MultipleTestLocalSite.java
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestDataEntryInstall.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestDataEntryInstall.java
index 27958b0..44357af 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestDataEntryInstall.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestDataEntryInstall.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.regularInstall;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 import java.io.File;

 import java.net.URL;

 

@@ -91,4 +97,4 @@
 

 	}	

 	

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestExecutableInstall.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestExecutableInstall.java
index 7557bf6..fa865d9 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestExecutableInstall.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestExecutableInstall.java
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestExecutablePackagedInstall.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestExecutablePackagedInstall.java
index 3d258fd..4a73836 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestExecutablePackagedInstall.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestExecutablePackagedInstall.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.regularInstall;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 import java.io.File;

 import java.net.URL;

 

@@ -138,4 +144,4 @@
 

 	}

 	

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestGetFeature.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestGetFeature.java
index 121e1b5..b3d4356 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestGetFeature.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestGetFeature.java
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstall.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstall.java
index caf9c22..7e367e2 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstall.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstall.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.regularInstall;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 import java.io.File;

 import java.net.MalformedURLException;

 import java.net.URL;

@@ -308,4 +314,4 @@
 		return pluginID + PACKAGED_FEATURE_TYPE;

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstallURLSIteXML.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstallURLSIteXML.java
index a14bd6f..6a1f85b 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstallURLSIteXML.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstallURLSIteXML.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.regularInstall;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 import java.io.File;

 import java.net.MalformedURLException;

 import java.net.URL;

@@ -321,4 +327,4 @@
 		return pluginID + PACKAGED_FEATURE_TYPE;

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestLocalSite.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestLocalSite.java
index 95d2082..8c9e2c2 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestLocalSite.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestLocalSite.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.regularInstall;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved. 

- */

 import java.io.File;

 import java.net.URL;

 

@@ -293,12 +299,12 @@
 		IFeatureReference[] refs = configSite2.getConfiguredFeatures();

 		boolean found = false;

 		IFeature feature2 = null;

-		for (int i = 0; i < refs.length; i++) {
+		for (int i = 0; i < refs.length; i++) {

 			IFeature feature3 = refs[i].getFeature();			

 			if ("org.test1.ident1_1.0.0".equals(feature3.getVersionedIdentifier().toString())){

 				feature2 = feature3;

 				found = true;

-			}		
+			}		

 		}

 

 		//String configuredFeature = feature2.getLabel();

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestSpaceInInstall.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestSpaceInInstall.java
index d05be72..4f2e196 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestSpaceInInstall.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestSpaceInInstall.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.regularInstall;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 import java.io.File;

 import java.net.URL;

 

@@ -131,4 +137,4 @@
 	}

 		

 		

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularRemove/AllRegularRemoveTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularRemove/AllRegularRemoveTests.java
index 04bc913..937ec75 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularRemove/AllRegularRemoveTests.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularRemove/AllRegularRemoveTests.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.regularRemove;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 

 import org.eclipse.update.tests.UpdateManagerTestCase;

 import junit.framework.*;

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularRemove/TestRemove.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularRemove/TestRemove.java
index 8d46849..c7d1e69 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularRemove/TestRemove.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularRemove/TestRemove.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.regularRemove;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 import java.io.File;

 import java.net.MalformedURLException;

 

@@ -82,4 +88,4 @@
 

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/sitevalidation/AllSiteValidationTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/sitevalidation/AllSiteValidationTests.java
index dc172bc..7d063a9 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/sitevalidation/AllSiteValidationTests.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/sitevalidation/AllSiteValidationTests.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.tests.sitevalidation;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
 
 import org.eclipse.update.tests.UpdateManagerTestCase;
 import junit.framework.*;
@@ -21,4 +27,4 @@
 
 		return suite;
 	}
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/sitevalidation/TestSiteValidation.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/sitevalidation/TestSiteValidation.java
index 9490ff6..6b18163 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/sitevalidation/TestSiteValidation.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/sitevalidation/TestSiteValidation.java
@@ -1,8 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.update.tests.sitevalidation;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
 import java.io.File;
 import java.net.URL;
 
@@ -152,4 +158,4 @@
 			fail("Wrong validation:"+status.getMessage());
 		}
 	}	
-}
\ No newline at end of file
+}
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/AllTypesTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/AllTypesTests.java
index acdad72..970648d 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/AllTypesTests.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/AllTypesTests.java
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/TestFeatureType.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/TestFeatureType.java
index 57bbecf..5613b19 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/TestFeatureType.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/TestFeatureType.java
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/TestSiteType.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/TestSiteType.java
index 8f0942c..50da435 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/TestSiteType.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/TestSiteType.java
@@ -1,8 +1,14 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2003 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials 

+ * are made available under the terms of the Common Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/cpl-v10.html

+ * 

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

 package org.eclipse.update.tests.types;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

 

 import java.io.File;

 import java.net.URL;

@@ -71,4 +77,4 @@
 		}

 	}

 

-}
\ No newline at end of file
+}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/uivalues/AllCoreUITests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/uivalues/AllCoreUITests.java
index 60669b4..a18ab16 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/uivalues/AllCoreUITests.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/uivalues/AllCoreUITests.java
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/uivalues/TestUILabel.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/uivalues/TestUILabel.java
index 74db585..54dc0d8 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/uivalues/TestUILabel.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/uivalues/TestUILabel.java
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/site.properties b/update/org.eclipse.update.tests.core/webserver/UpdateManager2/site.properties
index 211986b..8e1ced4 100644
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/site.properties
+++ b/update/org.eclipse.update.tests.core/webserver/UpdateManager2/site.properties
@@ -1,2 +1,12 @@
+###############################################################################

+# Copyright (c) 2000, 2003 IBM Corporation and others.

+# All rights reserved. This program and the accompanying materials 

+# are made available under the terms of the Common Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/cpl-v10.html

+# 

+# Contributors:

+#     IBM Corporation - initial API and implementation

+###############################################################################

 drivers=Required Drivers

 security=Security Fixes
\ No newline at end of file