update license to EPL

asm/src/org/aspectj/asm/AsmManager.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2003 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: 
  *     Mik Kersten     initial implementation 

asm/src/org/aspectj/asm/HierarchyWalker.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2003 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: 
  *     Mik Kersten     initial implementation 

asm/src/org/aspectj/asm/IElementHandleProvider.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2003 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: 
  *     Mik Kersten     initial implementation 

asm/src/org/aspectj/asm/IHierarchy.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2003 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: 
  *     Mik Kersten     initial implementation 

asm/src/org/aspectj/asm/IHierarchyListener.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2003 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: 
  *     Mik Kersten     initial implementation 

asm/src/org/aspectj/asm/IProgramElement.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2003 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: 
  *     Mik Kersten     initial implementation 

asm/src/org/aspectj/asm/IRelationship.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2003 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: 
  *     Mik Kersten     initial implementation 

asm/src/org/aspectj/asm/IRelationshipMap.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2003 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: 
  *     Mik Kersten     initial implementation 

asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2003 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: 
  *     Mik Kersten     initial implementation 

asm/src/org/aspectj/asm/internal/FullPathHandleProvider.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2003 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: 
  *     Mik Kersten     initial implementation 

asm/src/org/aspectj/asm/internal/OptimizedFullPathHandleProvider.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2003 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: 
  *     Mik Kersten     initial implementation 

asm/src/org/aspectj/asm/internal/ProgramElement.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2003 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: 
  *     Mik Kersten     initial implementation 

asm/src/org/aspectj/asm/internal/Relationship.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2003 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: 
  *     Mik Kersten     initial implementation 

asm/src/org/aspectj/asm/internal/RelationshipMap.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2003 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: 
  *     Mik Kersten     initial implementation 

asm/testsrc/AsmModuleTests.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

aspectj5rt/java5-src/org/aspectj/lang/annotation/AdviceName.java

@@ -1,9 +1,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
+ * 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:
  *   Adrian Colyer									initial implementation

bcel-builder/src/org/aspectj/apache/bcel/classfile/AnnotationDefault.java

@@ -3,9 +3,9 @@
  * 
  * 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 

bcel-builder/src/org/aspectj/apache/bcel/classfile/EnclosingMethod.java

@@ -3,9 +3,9 @@
  * 
  * 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 

bcel-builder/src/org/aspectj/apache/bcel/classfile/LocalVariableTypeTable.java

@@ -3,9 +3,9 @@
  * 
  * 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 

bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/Annotation.java

@@ -3,9 +3,9 @@
  * 
  * 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 

bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/AnnotationElementValue.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 {date}

bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/ArrayElementValue.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 {date}

bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/ClassElementValue.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 {date}

bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/ElementNameValuePair.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 {date}

bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/ElementValue.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 {date}

bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/EnumElementValue.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 {date}

bcel-builder/src/org/aspectj/apache/bcel/classfile/annotation/SimpleElementValue.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 {date}

bcel-builder/src/org/aspectj/apache/bcel/generic/LineNumberTag.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2002 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 

bcel-builder/src/org/aspectj/apache/bcel/generic/LocalVariableTag.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2002 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 

bcel-builder/src/org/aspectj/apache/bcel/generic/Tag.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2002 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 

bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/AnnotationElementValueGen.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 {date}

bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/AnnotationGen.java

@@ -3,9 +3,9 @@
  * 
  * 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 

bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/ArrayElementValueGen.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 {date}

bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/ClassElementValueGen.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 {date}

bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/ElementNameValuePairGen.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 

bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/ElementValueGen.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 {date}

bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/EnumElementValueGen.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 {date}

bcel-builder/src/org/aspectj/apache/bcel/generic/annotation/SimpleElementValueGen.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 {date}

bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/AllTests.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 {date}

bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/AnnotationAccessFlagTest.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 

bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/AnnotationDefaultAttributeTest.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 

bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/AnnotationGenTest.java

@@ -1,8 +1,8 @@
 /*******************************************************************************
  * Copyright (c) 2004 IBM All rights reserved. This program and the accompanying
- * materials are made available under the terms of the Common Public License
+ * materials are made available under the terms of the Eclipse Public License
  * v1.0 which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Contributors: Andy Clement - initial implementation
  ******************************************************************************/

bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/BcelTestCase.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 {date}

bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/ElementValueGenTest.java

@@ -1,8 +1,8 @@
 /*******************************************************************************
  * Copyright (c) 2004 IBM All rights reserved. This program and the accompanying
- * materials are made available under the terms of the Common Public License
+ * materials are made available under the terms of the Eclipse Public License
  * v1.0 which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Contributors: Andy Clement - initial implementation
  ******************************************************************************/

bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/EnclosingMethodAttributeTest.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 

bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/EnumAccessFlagTest.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 

bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/FieldAnnotationsTest.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 

bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/GeneratingAnnotatedClassesTest.java

@@ -1,8 +1,8 @@
 /*******************************************************************************
  * Copyright (c) 2004 IBM All rights reserved. This program and the accompanying
- * materials are made available under the terms of the Common Public License
+ * materials are made available under the terms of the Eclipse Public License
  * v1.0 which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Contributors: Andy Clement - initial implementation
  ******************************************************************************/

bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/GenericSignatureParserTest.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 

bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/GenericSignatureParsingTest.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: 
  *     Andy Clement (IBM)     initial implementation 

bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/GenericsErasureTesting.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: 
  *     Andy Clement (IBM)     initial implementation 

bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/LocalVariableTypeTableTest.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 

bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/MethodAnnotationsTest.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 

bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/ParameterAnnotationsTest.java

@@ -1,8 +1,8 @@
 /*******************************************************************************
  * Copyright (c) 2004 IBM All rights reserved. This program and the accompanying
- * materials are made available under the terms of the Common Public License
+ * materials are made available under the terms of the Eclipse Public License
  * v1.0 which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Contributors: Andy Clement - initial implementation
  ******************************************************************************/

bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/RuntimeVisibleAnnotationAttributeTest.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 

bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/RuntimeVisibleParameterAnnotationAttributeTest.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 

bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/TypeAnnotationsTest.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 

bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/UtilTests.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 

bcel-builder/testsrc/org/aspectj/apache/bcel/classfile/tests/VarargsTest.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2004 IBM
  * 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 

bridge/src/org/aspectj/bridge/AbortException.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

bridge/src/org/aspectj/bridge/CountingMessageHandler.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

bridge/src/org/aspectj/bridge/ICommand.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

bridge/src/org/aspectj/bridge/IMessage.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

bridge/src/org/aspectj/bridge/IMessageHandler.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

bridge/src/org/aspectj/bridge/IMessageHolder.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

bridge/src/org/aspectj/bridge/IProgressListener.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2003 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: 
  *     Xerox/PARC     initial implementation 

bridge/src/org/aspectj/bridge/ISourceLocation.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

bridge/src/org/aspectj/bridge/Message.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

bridge/src/org/aspectj/bridge/MessageHandler.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

bridge/src/org/aspectj/bridge/MessageUtil.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

bridge/src/org/aspectj/bridge/MessageWriter.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

bridge/src/org/aspectj/bridge/ReflectionFactory.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

bridge/src/org/aspectj/bridge/SourceLocation.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

bridge/src/org/aspectj/bridge/Version.java

@@ -3,9 +3,9 @@
  *               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:
  *     Xerox/PARC     initial implementation

bridge/src/org/aspectj/bridge/WeaveMessage.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 IBM     initial implementation 30-May-2004

bridge/testsrc/BridgeModuleTests.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

bridge/testsrc/org/aspectj/bridge/BridgeTests.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

bridge/testsrc/org/aspectj/bridge/CountingMessageHandlerTest.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

bridge/testsrc/org/aspectj/bridge/MessageTest.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

bridge/testsrc/org/aspectj/bridge/VersionTest.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

build/src/$installer$/org/aspectj/Main.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

build/src/org/aspectj/internal/tools/ant/taskdefs/AJInstaller.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

build/src/org/aspectj/internal/tools/ant/taskdefs/AJPush.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

build/src/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.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: 
  *     Xerox/PARC     initial implementation 

build/src/org/aspectj/internal/tools/ant/taskdefs/BuildModule.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

build/src/org/aspectj/internal/tools/ant/taskdefs/Checklics.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: 
  *     Xerox/PARC     initial implementation 
@@ -70,7 +70,7 @@ public class Checklics extends MatchingTask {
 		final String LIC_APL =
 			"Apache Software Foundation (http://www.apache.org/)";
 		final String LIC_MPL = "http://aspectj.org/MPL/";
-        final String LIC_CPL = "Common Public License";
+        final String LIC_CPL = "Eclipse Public License";
         final String LIC_ECPL = " Public License";
 		License APL = new License(APACHE_TAG, LIC_APL, APACHE);
 		License MPL = new License(MPL_TAG, LIC_MPL, XEROX);
@@ -553,9 +553,9 @@ class HeaderInfo {
     void writeRest(PrintWriter writer) {
         writer.println(" * All rights reserved. ");
         writer.println(" * This program and the accompanying materials are made available ");
-        writer.println(" * under the terms of the Common Public License v1.0 ");
+        writer.println(" * under the terms of the Eclipse Public License v1.0 ");
         writer.println(" * which accompanies this distribution and is available at ");
-        writer.println(" * http://www.eclipse.org/legal/cpl-v10.html ");
+        writer.println(" * http://www.eclipse.org/legal/epl-v10.html ");
         writer.println(" *  ");
         writer.println(" * Contributors: ");
         writer.println(" *     Xerox/PARC     initial implementation ");
@@ -579,9 +579,9 @@ class HeaderInfo {
  *               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:
  *     Xerox/PARC     initial implementation

build/src/org/aspectj/internal/tools/ant/taskdefs/ConditionalTask.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

build/src/org/aspectj/internal/tools/ant/taskdefs/CopyAndInlineStylesheet.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

build/src/org/aspectj/internal/tools/ant/taskdefs/StripNonBodyHtml.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

build/src/org/aspectj/internal/tools/ant/taskdefs/TestBuildModule.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

build/src/org/aspectj/internal/tools/ant/taskdefs/VersionUptodate.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: 
  *     Xerox/PARC     initial implementation 

build/src/org/aspectj/internal/tools/build/BuildSpec.java

@@ -4,9 +4,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: 
  *     Xerox/PARC     initial implementation 

build/src/org/aspectj/internal/tools/build/Builder.java

@@ -3,9 +3,9 @@
  *               2003 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 

build/src/org/aspectj/internal/tools/build/Messager.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

build/src/org/aspectj/internal/tools/build/Module.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

build/src/org/aspectj/internal/tools/build/Modules.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation 

build/src/org/aspectj/internal/tools/build/ProductModule.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: 
  *     Xerox/PARC     initial implementation 

build/src/org/aspectj/internal/tools/build/SampleGatherer.java

@@ -2,9 +2,9 @@
  * Copyright (c) 2003 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: 
  *     Wes Isberg     initial implementation 
@@ -443,8 +443,8 @@ class SamplesRenderer {
     public static final String COPYRIGHT = 
         "<p><small>Copyright 2003 Contributors. All Rights Reserved. "
         + "This sample code is made available under the Common Public "
        + "License version 1.0 available at "
-        + "<a href=\"http://www.eclipse.org/legal/cpl-v10.html\">"
-        + "http://www.eclipse.org/legal/cpl-v10.html</a>."
+        + "<a href=\"http://www.eclipse.org/legal/epl-v10.html\">"
+        + "http://www.eclipse.org/legal/epl-v10.html</a>."
         + "Contributors are listed in this document as authors. "
         + "Permission to republish portions of this sample code "
         + "is hereby granted if the publication acknowledges "

build/src/org/aspectj/internal/tools/build/Util.java

@@ -3,9 +3,9 @@
  *               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: 
  *     Xerox/PARC     initial implementation