update license to EPL

56 files changed, 112 insertions, 112 deletions

diff --git a/weaver/testsrc/org/aspectj/weaver/AbstractWorldTestCase.java b/weaver/testsrc/org/aspectj/weaver/AbstractWorldTestCase.java
index 8a8ff8302..eeaed03b6 100644
--- a/weaver/testsrc/org/aspectj/weaver/AbstractWorldTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/AbstractWorldTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/BcweaverTests.java b/weaver/testsrc/org/aspectj/weaver/BcweaverTests.java
index 1c59bd841..1d3f65ea7 100644
--- a/weaver/testsrc/org/aspectj/weaver/BcweaverTests.java
+++ b/weaver/testsrc/org/aspectj/weaver/BcweaverTests.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/DumpTestCase.java b/weaver/testsrc/org/aspectj/weaver/DumpTestCase.java
index d3e187ce0..affd39c2c 100644
--- a/weaver/testsrc/org/aspectj/weaver/DumpTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/DumpTestCase.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004 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
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Contributors:
  *     Matthew Webster 
diff --git a/weaver/testsrc/org/aspectj/weaver/LocaleTest.java b/weaver/testsrc/org/aspectj/weaver/LocaleTest.java
index 058b71b62..e69a4df93 100644
--- a/weaver/testsrc/org/aspectj/weaver/LocaleTest.java
+++ b/weaver/testsrc/org/aspectj/weaver/LocaleTest.java
@@ -1,9 +1,9 @@
 /* Copyright (c) 2002 Contributors.
  * 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/MemberTestCase.java b/weaver/testsrc/org/aspectj/weaver/MemberTestCase.java
index ba1cd5f86..4a9336abd 100644
--- a/weaver/testsrc/org/aspectj/weaver/MemberTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/MemberTestCase.java
@@ -3,9 +3,9 @@
  *                      2005 contributors
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation
diff --git a/weaver/testsrc/org/aspectj/weaver/TestShadow.java b/weaver/testsrc/org/aspectj/weaver/TestShadow.java
index 682faa2ea..761281a48 100644
--- a/weaver/testsrc/org/aspectj/weaver/TestShadow.java
+++ b/weaver/testsrc/org/aspectj/weaver/TestShadow.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/TypeXTestCase.java b/weaver/testsrc/org/aspectj/weaver/TypeXTestCase.java
index 0d2e64b1b..5505c092a 100644
--- a/weaver/testsrc/org/aspectj/weaver/TypeXTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/TypeXTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/WeaverMessagesTestCase.java b/weaver/testsrc/org/aspectj/weaver/WeaverMessagesTestCase.java
index 8e4392c4c..59fb884ca 100644
--- a/weaver/testsrc/org/aspectj/weaver/WeaverMessagesTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/WeaverMessagesTestCase.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004 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
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/AfterReturningWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/AfterReturningWeaveTestCase.java
index 469422e44..8ccafe4de 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/AfterReturningWeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/AfterReturningWeaveTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/AfterThrowingWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/AfterThrowingWeaveTestCase.java
index 197da87e6..9a822b78e 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/AfterThrowingWeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/AfterThrowingWeaveTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/AfterWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/AfterWeaveTestCase.java
index 0a310c8f8..a51c69b9a 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/AfterWeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/AfterWeaveTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/ArgsWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/ArgsWeaveTestCase.java
index abb5e8bc2..3148cbdaf 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/ArgsWeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/ArgsWeaveTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/AroundArgsWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/AroundArgsWeaveTestCase.java
index 9c0bf0011..4088755b5 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/AroundArgsWeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/AroundArgsWeaveTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/AroundWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/AroundWeaveTestCase.java
index 2e892277d..5f8412c25 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/AroundWeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/AroundWeaveTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/BcelTests.java b/weaver/testsrc/org/aspectj/weaver/bcel/BcelTests.java
index 8fca5d6e6..f7f0eee33 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/BcelTests.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/BcelTests.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/BeforeWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/BeforeWeaveTestCase.java
index d566c77ea..a43689777 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/BeforeWeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/BeforeWeaveTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/CheckerTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/CheckerTestCase.java
index 0a6d0e1b4..b503e9593 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/CheckerTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/CheckerTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/FieldSetTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/FieldSetTestCase.java
index 3e1e9795b..c81827229 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/FieldSetTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/FieldSetTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/HierarchyDependsTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/HierarchyDependsTestCase.java
index 4c0dff632..062f3dbef 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/HierarchyDependsTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/HierarchyDependsTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/IdWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/IdWeaveTestCase.java
index 075ad8c20..218233c37 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/IdWeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/IdWeaveTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/MegaZipTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/MegaZipTestCase.java
index fed1ab4cd..d21ab6b78 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/MegaZipTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/MegaZipTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/MoveInstructionsWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/MoveInstructionsWeaveTestCase.java
index c5ee5a59c..2ece47f23 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/MoveInstructionsWeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/MoveInstructionsWeaveTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/NonstaticWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/NonstaticWeaveTestCase.java
index 3559f8f5f..ecf7b6526 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/NonstaticWeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/NonstaticWeaveTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/PatternWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/PatternWeaveTestCase.java
index 5509c32b0..6bdc4e142 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/PatternWeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/PatternWeaveTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/PointcutResidueTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/PointcutResidueTestCase.java
index 3bec378af..65238450b 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/PointcutResidueTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/PointcutResidueTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/TjpWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/TjpWeaveTestCase.java
index bcb543c77..3d6f540d8 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/TjpWeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/TjpWeaveTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/TraceJarWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/TraceJarWeaveTestCase.java
index ac6a43a51..e63496990 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/TraceJarWeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/TraceJarWeaveTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/UtilityTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/UtilityTestCase.java
index b458643e3..328472767 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/UtilityTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/UtilityTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/WeaveOrderTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/WeaveOrderTestCase.java
index 89c1b2e29..f22805f11 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/WeaveOrderTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/WeaveOrderTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java
index 73447d95a..0ebc08b67 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/WorldTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/WorldTestCase.java
index 6b6656634..253768b58 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/WorldTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/WorldTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/ZipTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/ZipTestCase.java
index 8b03c28c0..3f63a1f22 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/ZipTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/ZipTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/AndOrNotTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/AndOrNotTestCase.java
index 55f5dbf1e..74969929c 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/AndOrNotTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/AndOrNotTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/AnnotationPatternMatchingTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/AnnotationPatternMatchingTestCase.java
index 892bbe638..b22d306c3 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/AnnotationPatternMatchingTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/AnnotationPatternMatchingTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM Corporation.
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *    Andy Clement     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/AnnotationPatternTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/AnnotationPatternTestCase.java
index 3551775f4..1ff60c342 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/AnnotationPatternTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/AnnotationPatternTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM Corporation.
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * ******************************************************************/
 package org.aspectj.weaver.patterns;
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/ArgsTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/ArgsTestCase.java
index c4ad2902a..5b0a09b0e 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/ArgsTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/ArgsTestCase.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004 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
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/BindingTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/BindingTestCase.java
index 455663699..7901a5574 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/BindingTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/BindingTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/ConcretizationTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/ConcretizationTestCase.java
index 63c25464f..53373b4b5 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/ConcretizationTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/ConcretizationTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/DeclareErrorOrWarningTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/DeclareErrorOrWarningTestCase.java
index fb06efa5e..c72db9b2a 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/DeclareErrorOrWarningTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/DeclareErrorOrWarningTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/ModifiersPatternTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/ModifiersPatternTestCase.java
index 4adf2e88c..91e183092 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/ModifiersPatternTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/ModifiersPatternTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/NamePatternParserTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/NamePatternParserTestCase.java
index cd646b122..dd4212b29 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/NamePatternParserTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/NamePatternParserTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/NamePatternTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/NamePatternTestCase.java
index e3baf278d..ada1545ed 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/NamePatternTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/NamePatternTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java
index a018e338c..08584fd00 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/PatternsTests.java b/weaver/testsrc/org/aspectj/weaver/patterns/PatternsTests.java
index 171fc4044..e304a2ea0 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/PatternsTests.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/PatternsTests.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/PointcutRewriterTest.java b/weaver/testsrc/org/aspectj/weaver/patterns/PointcutRewriterTest.java
index 3684e9d86..20c6a4064 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/PointcutRewriterTest.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/PointcutRewriterTest.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM Corporation.
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * ******************************************************************/
 package org.aspectj.weaver.patterns;
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/SignaturePatternTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/SignaturePatternTestCase.java
index 40d345316..336d86f62 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/SignaturePatternTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/SignaturePatternTestCase.java
@@ -3,9 +3,9 @@
  *               2005 Contributors
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/TestScope.java b/weaver/testsrc/org/aspectj/weaver/patterns/TestScope.java
index d0d6b9b37..89f8f7129 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/TestScope.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/TestScope.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java
index a3c42c94e..618949689 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java
@@ -3,9 +3,9 @@
  *               2005 Contributors
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/TypePatternListTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/TypePatternListTestCase.java
index 09ec21fe5..4b1f2c737 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/TypePatternListTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/TypePatternListTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/TypePatternTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/TypePatternTestCase.java
index 6925b084e..1d0c9262a 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/TypePatternTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/TypePatternTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/WildTypePatternResolutionTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/WildTypePatternResolutionTestCase.java
index 7f25ac1ac..de3fa0222 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/WildTypePatternResolutionTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/WildTypePatternResolutionTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2005 Contributors
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     Adrian Colyer     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/WithinTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/WithinTestCase.java
index 63f3318d2..d2063b73b 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/WithinTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/WithinTestCase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
  *     PARC     initial implementation 
diff --git a/weaver/testsrc/org/aspectj/weaver/tools/PointcutExpressionTest.java b/weaver/testsrc/org/aspectj/weaver/tools/PointcutExpressionTest.java
index e6500c1e7..205423c35 100644
--- a/weaver/testsrc/org/aspectj/weaver/tools/PointcutExpressionTest.java
+++ b/weaver/testsrc/org/aspectj/weaver/tools/PointcutExpressionTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004 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
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/weaver/testsrc/org/aspectj/weaver/tools/PointcutParserTest.java b/weaver/testsrc/org/aspectj/weaver/tools/PointcutParserTest.java
index 6ca152a4b..be245c9c3 100644
--- a/weaver/testsrc/org/aspectj/weaver/tools/PointcutParserTest.java
+++ b/weaver/testsrc/org/aspectj/weaver/tools/PointcutParserTest.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM Corporation.
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * ******************************************************************/
 package org.aspectj.weaver.tools;
diff --git a/weaver/testsrc/org/aspectj/weaver/tools/ToolsTests.java b/weaver/testsrc/org/aspectj/weaver/tools/ToolsTests.java
index f98303ad5..557ec0ad7 100644
--- a/weaver/testsrc/org/aspectj/weaver/tools/ToolsTests.java
+++ b/weaver/testsrc/org/aspectj/weaver/tools/ToolsTests.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM Corporation.
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
+ * under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
+ * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * ******************************************************************/
 package org.aspectj.weaver.tools;
diff --git a/weaver/testsrc/org/aspectj/weaver/tools/TypePatternMatcherTest.java b/weaver/testsrc/org/aspectj/weaver/tools/TypePatternMatcherTest.java
index 019f8725a..523ee4a83 100644
--- a/weaver/testsrc/org/aspectj/weaver/tools/TypePatternMatcherTest.java
+++ b/weaver/testsrc/org/aspectj/weaver/tools/TypePatternMatcherTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004 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
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation