@AJ annotation are runtime visible, fixed all licenses from branch for EPL

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

@@ -1,23 +1,27 @@
 /*******************************************************************************
  * 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
  * Contributors:
- *   Jonas Bonér, Alexandre Vasseur         initial implementation
+ * initial implementation              Alexandre Vasseur
  *******************************************************************************/
 package org.aspectj.lang.annotation;
 
 import java.lang.annotation.Target;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
 /**
  * After finally advice
  *
  * @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a>
  */
+@Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface After {
 

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

@@ -1,23 +1,27 @@
 /*******************************************************************************
  * 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
  * Contributors:
- *   Jonas Bonér, Alexandre Vasseur         initial implementation
+ * initial implementation              Alexandre Vasseur
  *******************************************************************************/
 package org.aspectj.lang.annotation;
 
 import java.lang.annotation.Target;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
 /**
  * After returning advice
  *
  * @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a>
  */
+@Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface AfterReturning {
 

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

@@ -1,23 +1,27 @@
 /*******************************************************************************
  * 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
  * Contributors:
- *   Jonas Bonér, Alexandre Vasseur         initial implementation
+ * initial implementation              Alexandre Vasseur
  *******************************************************************************/
 package org.aspectj.lang.annotation;
 
 import java.lang.annotation.Target;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
 /**
  * After throwing advice
  *
  * @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a>
  */
+@Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface AfterThrowing {
 

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

@@ -1,23 +1,27 @@
 /*******************************************************************************
  * 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
  * Contributors:
- *   Jonas Bonér, Alexandre Vasseur         initial implementation
+ * initial implementation              Alexandre Vasseur
  *******************************************************************************/
 package org.aspectj.lang.annotation;
 
 import java.lang.annotation.Target;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
 /**
  * Around advice
  *
  * @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a>
  */
+@Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface Around {
 

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

@@ -1,23 +1,27 @@
 /*******************************************************************************
  * 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
  * Contributors:
- *   Jonas Bonér, Alexandre Vasseur         initial implementation
+ * initial implementation              Alexandre Vasseur
  *******************************************************************************/
 package org.aspectj.lang.annotation;
 
 import java.lang.annotation.Target;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
 /**
  * Aspect declaration
  *
  * @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a>
  */
+@Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 public @interface Aspect {
 

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

@@ -1,24 +1,27 @@
 /*******************************************************************************
  * 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
  * Contributors:
- *   Jonas Bonér, Alexandre Vasseur         initial implementation
+ * initial implementation              Alexandre Vasseur
  *******************************************************************************/
 package org.aspectj.lang.annotation;
 
 import java.lang.annotation.Target;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
 /**
  * Before advice
  *
  * @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a>
  */
-//FIXME av @AJ annotations RuntimeVisible or RuntimeInvisible? Applies to all annotations in this package
+@Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface Before {
 

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

@@ -1,23 +1,27 @@
 /*******************************************************************************
  * 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
  * Contributors:
- *   Jonas Bonér, Alexandre Vasseur         initial implementation
+ * initial implementation              Alexandre Vasseur
  *******************************************************************************/
 package org.aspectj.lang.annotation;
 
 import java.lang.annotation.Target;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
 /**
  * Aspect precedence declaration
  *
  * @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a>
  */
+@Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 public @interface DeclarePrecedence {
 

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

@@ -1,23 +1,27 @@
 /*******************************************************************************
  * 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
  * Contributors:
- *   Jonas Bonér, Alexandre Vasseur         initial implementation
+ * initial implementation              Alexandre Vasseur
  *******************************************************************************/
 package org.aspectj.lang.annotation;
 
 import java.lang.annotation.Target;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
 /**
  * Pointcut declaration
  *
  * @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a>
  */
+@Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface Pointcut {
 

runtime/build.xml

@@ -13,11 +13,26 @@
     <path id="runtime.src.path">
     </path>
 
-    <target name="compile" depends="init">
+    <target name="compile" depends="init, compile:jdk13, compile:residual">
+        <!-- don't use the Ant macro srccompile that is Java 1.3 level -->
+        <!-- use an indirection level since Java 5 does not accept -source 1.1 anymore -->
+        <!-- under Java 5 we will only ensure source 1.2 -->
+    </target>
+    <target name="compile:jdk13" if="jdk13">
+        <!-- Note: note sure we can trust that. Pbly better if CruiseControl runs with a real 1.1 for this module -->
+        <!-- f.e. use a TreeMap (@since Java 1.2) somewhere, and it still compiles.. -->
+        <mkdir dir="../runtime/bin"/>
+        <javac debug="on" destdir="../runtime/bin" source="1.1" target="1.1">
+            <src path="../runtime/src"/>
+            <classpath refid="runtime.src.path"/>
+        </javac>
+    </target>
+    <target name="compile:residual">
         <srccompile project="runtime" path="runtime.src.path"/>
     </target>
 
     <target name="test:compile" depends="compile">
+        <!-- TODO AV do we want to run them on 1.1 ? -->
         <testcompile project="runtime" path="runtime.test.src.path"/>
     </target>
 

runtime/src/org/aspectj/lang/Aspects.java

@@ -1,12 +1,13 @@
 /*******************************************************************************
- * 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * Copyright (c) 2005 Contributors.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- * initial implementation              Jonas Bonér, Alexandre Vasseur
+ * initial implementation              Alexandre Vasseur
  *******************************************************************************/
 package org.aspectj.lang;
 

runtime/src/org/aspectj/lang/ProceedingJoinPoint.java

@@ -1,12 +1,13 @@
 /*******************************************************************************
- * 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * Copyright (c) 2005 Contributors.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- * initial implementation              Jonas Bonér, Alexandre Vasseur
+ * initial implementation              Alexandre Vasseur
  *******************************************************************************/
 package org.aspectj.lang;
 

tests/java5/ataspectj/ataspectj/AfterXTest.java

@@ -1,9 +1,13 @@
 /*******************************************************************************
- * Copyright (c) Jonas Bonér, Alexandre Vasseur
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * Copyright (c) 2005 Contributors.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * initial implementation              Alexandre Vasseur
  *******************************************************************************/
 package ataspectj;
 

tests/java5/ataspectj/ataspectj/BindingTest.java

@@ -1,9 +1,13 @@
 /*******************************************************************************
- * Copyright (c) Jonas Bonér, Alexandre Vasseur
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * Copyright (c) 2005 Contributors.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * initial implementation              Alexandre Vasseur
  *******************************************************************************/
 package ataspectj;
 

tests/java5/ataspectj/ataspectj/CflowTest.java

@@ -1,9 +1,13 @@
 /*******************************************************************************
- * Copyright (c) Jonas Bonér, Alexandre Vasseur
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * Copyright (c) 2005 Contributors.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * initial implementation              Alexandre Vasseur
  *******************************************************************************/
 package ataspectj;
 

tests/java5/ataspectj/ataspectj/IfPointcutTest.java

@@ -1,9 +1,13 @@
 /*******************************************************************************
- * Copyright (c) Jonas Bonér, Alexandre Vasseur
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * Copyright (c) 2005 Contributors.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * initial implementation              Alexandre Vasseur
  *******************************************************************************/
 package ataspectj;
 

tests/java5/ataspectj/ataspectj/PerClauseTest.java

@@ -1,9 +1,13 @@
 /*******************************************************************************
- * Copyright (c) Jonas Bonér, Alexandre Vasseur
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * Copyright (c) 2005 Contributors.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * initial implementation              Alexandre Vasseur
  *******************************************************************************/
 package ataspectj;
 

tests/java5/ataspectj/ataspectj/PointcutReferenceTest.java

@@ -1,9 +1,13 @@
 /*******************************************************************************
- * Copyright (c) Jonas Bonér, Alexandre Vasseur
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * Copyright (c) 2005 Contributors.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * initial implementation              Alexandre Vasseur
  *******************************************************************************/
 package ataspectj;
 

tests/java5/ataspectj/ataspectj/PrecedenceTest.java

@@ -1,9 +1,13 @@
 /*******************************************************************************
- * Copyright (c) Jonas Bonér, Alexandre Vasseur
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * Copyright (c) 2005 Contributors.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * initial implementation              Alexandre Vasseur
  *******************************************************************************/
 package ataspectj;
 

tests/java5/ataspectj/ataspectj/SingletonAspectBindingsTest.java

@@ -1,9 +1,13 @@
 /*******************************************************************************
- * Copyright (c) Jonas Bonér, Alexandre Vasseur
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * Copyright (c) 2005 Contributors.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * initial implementation              Alexandre Vasseur
  *******************************************************************************/
 package ataspectj;
 

tests/java5/ataspectj/ataspectj/TestHelper.java

@@ -1,9 +1,13 @@
 /*******************************************************************************
- * Copyright (c) Jonas Bonér, Alexandre Vasseur
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * Copyright (c) 2005 Contributors.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * initial implementation              Alexandre Vasseur
  *******************************************************************************/
 package ataspectj;
 

tests/java5/ataspectj/ataspectj/XXJoinPointTest.java

@@ -1,9 +1,13 @@
 /*******************************************************************************
- * Copyright (c) Jonas Bonér, Alexandre Vasseur
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * Copyright (c) 2005 Contributors.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * initial implementation              Alexandre Vasseur
  *******************************************************************************/
 package ataspectj;
 

tests/src/org/aspectj/systemtest/ajc150/AnnotationPointcutsTests.java

@@ -34,19 +34,19 @@ public class AnnotationPointcutsTests extends XMLBasedAjcTestCase {
   public void test001_usingAnnotationsInPointcuts() {
   	runTest("annotation matching on call");
   }
-  
+
   public void test002_AtAnnotationMatching() {
   	runTest("at annotation matching");
   }
-  
+
   public void test003_Within_Code() {
   	runTest("annotations and within(code)");
   }
-  
+
   public void test004_Within() {
   	runTest("annotations and within");
   }
-  
+
   // TODO extra tests
   // 3) @annotation on the different join point kinds, matches with inherited annotation
   

tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java

@@ -1,12 +1,13 @@
 /*******************************************************************************
- * 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * Copyright (c) 2005 Contributors.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
  * Contributors:
- * initial development             Jonas Bonér, Alexandre Vasseur 
+ * initial implementation              Alexandre Vasseur
  *******************************************************************************/
 package org.aspectj.systemtest.ajc150.ataspectj;
 

weaver/src/org/aspectj/weaver/ast/CastExpr.java

@@ -1,12 +1,13 @@
 /*******************************************************************************
- * 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * Copyright (c) 2005 Contributors.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
  * Contributors:
- * initial implementation               Jonas Bonér, Alexandre Vasseur
+ * initial implementation              Alexandre Vasseur
  *******************************************************************************/
 package org.aspectj.weaver.ast;
 

weaver/src/org/aspectj/weaver/ast/FieldGetOn.java

@@ -1,12 +1,13 @@
 /*******************************************************************************
- * 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * Copyright (c) 2005 Contributors.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
  * Contributors:
- * initial implementation               Jonas Bonér, Alexandre Vasseur
+ * initial implementation              Alexandre Vasseur
  *******************************************************************************/
 package org.aspectj.weaver.ast;
 

weaver/src/org/aspectj/weaver/ast/StringConstExpr.java

@@ -1,12 +1,13 @@
 /*******************************************************************************
- * 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * Copyright (c) 2005 Contributors.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
  * Contributors:
- * initial implementation               Jonas Bonér, Alexandre Vasseur
+ * initial implementation              Alexandre Vasseur
  *******************************************************************************/
 package org.aspectj.weaver.ast;
 

weaver/src/org/aspectj/weaver/ataspectj/Ajc5MemberMaker.java

@@ -1,12 +1,13 @@
 /*******************************************************************************
- * 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * Copyright (c) 2005 Contributors.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *  initial implementation      Jonas Bonér, Alexandre Vasseur
+ * initial implementation              Alexandre Vasseur
  *******************************************************************************/
 package org.aspectj.weaver.ataspectj;
 

weaver/src/org/aspectj/weaver/bcel/BcelPerClauseAspectAdder.java

@@ -1,12 +1,13 @@
 /*******************************************************************************
- * 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
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ * Copyright (c) 2005 Contributors.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
  * Contributors:
- * initial implementation          Jonas Bonér, Alexandre Vasseur
+ * initial implementation              Alexandre Vasseur
  *******************************************************************************/
 package org.aspectj.weaver.bcel;