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

8 files changed, 80 insertions, 49 deletions

diff --git a/aspectj5rt/java5-src/org/aspectj/lang/annotation/After.java b/aspectj5rt/java5-src/org/aspectj/lang/annotation/After.java
index 968270b87..ae42b542e 100644
--- a/aspectj5rt/java5-src/org/aspectj/lang/annotation/After.java
+++ b/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 {
 
diff --git a/aspectj5rt/java5-src/org/aspectj/lang/annotation/AfterReturning.java b/aspectj5rt/java5-src/org/aspectj/lang/annotation/AfterReturning.java
index 38d4a0d6d..0010fcff7 100644
--- a/aspectj5rt/java5-src/org/aspectj/lang/annotation/AfterReturning.java
+++ b/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 {
 
diff --git a/aspectj5rt/java5-src/org/aspectj/lang/annotation/AfterThrowing.java b/aspectj5rt/java5-src/org/aspectj/lang/annotation/AfterThrowing.java
index ca8cb112f..4433fa907 100644
--- a/aspectj5rt/java5-src/org/aspectj/lang/annotation/AfterThrowing.java
+++ b/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 {
 
diff --git a/aspectj5rt/java5-src/org/aspectj/lang/annotation/Around.java b/aspectj5rt/java5-src/org/aspectj/lang/annotation/Around.java
index 806f43e0e..df1a20a70 100644
--- a/aspectj5rt/java5-src/org/aspectj/lang/annotation/Around.java
+++ b/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 {
 
diff --git a/aspectj5rt/java5-src/org/aspectj/lang/annotation/Aspect.java b/aspectj5rt/java5-src/org/aspectj/lang/annotation/Aspect.java
index 1c77dcd12..d45e85c84 100644
--- a/aspectj5rt/java5-src/org/aspectj/lang/annotation/Aspect.java
+++ b/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 {
 
diff --git a/aspectj5rt/java5-src/org/aspectj/lang/annotation/Before.java b/aspectj5rt/java5-src/org/aspectj/lang/annotation/Before.java
index 7f5a14ff4..ea88da101 100644
--- a/aspectj5rt/java5-src/org/aspectj/lang/annotation/Before.java
+++ b/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 {
 
diff --git a/aspectj5rt/java5-src/org/aspectj/lang/annotation/DeclarePrecedence.java b/aspectj5rt/java5-src/org/aspectj/lang/annotation/DeclarePrecedence.java
index d25893b0d..e1a048819 100644
--- a/aspectj5rt/java5-src/org/aspectj/lang/annotation/DeclarePrecedence.java
+++ b/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 {
 
diff --git a/aspectj5rt/java5-src/org/aspectj/lang/annotation/Pointcut.java b/aspectj5rt/java5-src/org/aspectj/lang/annotation/Pointcut.java
index 759165912..364066e06 100644
--- a/aspectj5rt/java5-src/org/aspectj/lang/annotation/Pointcut.java
+++ b/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 {