Upgrade license from CPLv1/EPLv1 to EPLv2

This was required by the Eclipse team as one precondition for the next
release.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

66 files changed, 513 insertions, 514 deletions

diff --git a/docs/build.xml b/docs/build.xml
index ba81c73d3..2bfab1a0e 100644
--- a/docs/build.xml
+++ b/docs/build.xml
@@ -4,9 +4,9 @@
 <!--               2004-2005 Contributors.                                     -->
 <!-- All rights reserved.                                                      -->
 <!-- This program and the accompanying materials are made available            -->
-<!-- under the terms of the Eclipse Public License v1.0                         -->
+<!-- under the terms of the Eclipse Public License v 2.0                       -->
 <!-- which accompanies this distribution and is available at                   -->
-<!-- http://www.eclipse.org/legal/epl-v10.html                                 -->
+<!-- https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt                 -->
 <!--                                                                           -->
 <!-- Contributors:                                                             -->
 <!--     Xerox/PARC     initial implementation                                 -->
diff --git a/docs/devGuideDB/antsupport.xml b/docs/devGuideDB/antsupport.xml
index 2414bac8e..7e0fdfbc0 100644
--- a/docs/devGuideDB/antsupport.xml
+++ b/docs/devGuideDB/antsupport.xml
@@ -52,7 +52,7 @@
 	with Ant 1.3 and Ant 1.4, but the task sources must be
 	compiled with those versions of the Ant libraries to be used
 	under those versions of Ant.
-	Sources are available under the Eclipse Public License v. 1.0
+	Sources are available under the Eclipse Public License v 2.0
 	at <ulink url="http://eclipse.org/aspectj">http://eclipse.org/aspectj</ulink>.
 	</para>
 	<para>
diff --git a/docs/developer/compiler-weaver/index.html b/docs/developer/compiler-weaver/index.html
index b94686815..bb98e7e23 100644
--- a/docs/developer/compiler-weaver/index.html
+++ b/docs/developer/compiler-weaver/index.html
@@ -618,9 +618,9 @@ standard eclipse EPL license header.</p>
  * Copyright (c) 2006 Contributors.
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
+ * under the terms of the Eclipse Public License v 2.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *  
  * Contributors: 
  *     Jim Hugunin    initial implementation 
@@ -634,9 +634,9 @@ public interface ThrowSignature extends Signature { }</pre>
  * Copyright (c) 2006 Contributors.
  * All rights reserved. 
  * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
+ * under the terms of the Eclipse Public License v 2.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *  
  * Contributors: 
  *     Jim Hugunin    initial implementation 
@@ -914,4 +914,4 @@ feature to the tree there are three steps left to follow:</p>
 </ol>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/dist/LICENSE-AspectJ.html b/docs/dist/LICENSE-AspectJ.html
index b88d3a691..c280f86ec 100644
--- a/docs/dist/LICENSE-AspectJ.html
+++ b/docs/dist/LICENSE-AspectJ.html
@@ -17,8 +17,8 @@ is available from
 
 <p>The Eclipse Foundation makes available all content in this distribution ("Content").  
 		Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-		Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
-		at <a href="../../org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+		Eclipse Public License Version v 2.0 ("EPL").  A copy of the EPL is available 
+		at <a href="../../org/documents/epl-2.0/EPL-2.0.txt">https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt</a>.
 		For purposes of the EPL, "Program" will mean the Content.</p>
 
 		<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/docs/dist/doc/README-11.html b/docs/dist/doc/README-11.html
index f1d4f507f..27e5e7e41 100644
--- a/docs/dist/doc/README-11.html
+++ b/docs/dist/doc/README-11.html
@@ -349,10 +349,10 @@ are now independent SourceForge projects (to keep their licenses).
 <hr>
 <h2><a name="sources">The Sources and the Licenses</a></h2>
 
-  <p> The AspectJ tools sources are available under the
-  <a href="http://eclipse.org/legal/cpl-v10.html">Common Public
-  License</a> in the CVS repository
-  at <a href="http://eclipse.org/aspectj">http://eclipse.org/aspectj</a>.
+  <p>The AspectJ tools sources are available under the
+  <a href="https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt">Eclipse Public License v 2.0</a>
+    in the Git repository at
+    <a href="http://eclipse.org/aspectj">http://eclipse.org/aspectj</a>.
   For more information, see the FAQ entry on
     <a href="faq.html#q:buildingsource">building sources</a>.
   </p>
diff --git a/docs/dist/doc/examples/build.xml b/docs/dist/doc/examples/build.xml
index 11b8f803c..958c72727 100644
--- a/docs/dist/doc/examples/build.xml
+++ b/docs/dist/doc/examples/build.xml
@@ -4,9 +4,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 Eclipse Public License v1.0                        -->
+<!-- under the terms of the Eclipse Public License v 2.0                       -->
 <!-- which accompanies this distribution and is available at                   -->
-<!-- http://www.eclipse.org/legal/epl-v10.html                                 -->
+<!-- https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt                 -->
 <!--                                                                           -->
 <!-- Contributors:                                                             -->
 <!--     Xerox/PARC     initial implementation                                 -->
@@ -16,12 +16,12 @@
 
     <target name="info" >
       <echo>
-  This script builds the AspectJ examples.  
+  This script builds the AspectJ examples.
 
   Relevant targets:
      spacewar        build and run spacewar with debugging (default)
      all             build and run each example
-     {example}       build and run any {example} 
+     {example}       build and run any {example}
                      (use -projecthelp to list {example} names)
      tracing-bc      use AspectJ 1.1 bytecode weaving to build tracing example
 
@@ -32,7 +32,7 @@
   Variants:
      - To avoid running (i.e., compile only), define variable "norun"
      - To define a variable, use the Ant -D option - e.g., on Windows:
-  
+
          ant -f build.xml -DJAVA_HOME=c:\jdk1.3.1 -Dnorun=skip
 
       </echo>
@@ -55,32 +55,32 @@
 
     <target name="init"  depends="init.variables,init.taskdefs"/>
 
-    <target name="init.variables" 
+    <target name="init.variables"
      description="init variables">
-     
+
       <!-- build.compiler value to pick up our CompilerAdapter for javac -->
       <property name="ajc.adapter"
 	           value="org.aspectj.tools.ant.taskdefs.Ajc11CompilerAdapter"/>
 
       <!-- required directories - run from examples or predefine -->
       <property name="example.dir"
-            location="${basedir}"/> 
+            location="${basedir}"/>
       <property name="aspectj.lib.dir"
-            location="${basedir}/../../lib"/> 
+            location="${basedir}/../../lib"/>
 
       <!-- required libraries - install or predefine -->
       <property name="aspectjrt.jar"
-            location="${aspectj.lib.dir}/aspectjrt.jar"/> 
+            location="${aspectj.lib.dir}/aspectjrt.jar"/>
       <property name="aspectjtools.jar"
-            location="${aspectj.lib.dir}/aspectjtools.jar"/> 
+            location="${aspectj.lib.dir}/aspectjtools.jar"/>
       <property name="aspectjweaver.jar"
     		location="${aspectj.lib.dir}/aspectjweaver.jar"/>
 
       <!-- created directories -->
       <property name="classes.dir"
-            location="${example.dir}/classes"/> 
+            location="${example.dir}/classes"/>
       <property name="jar.dir"
-            location="${example.dir}/jars"/> 
+            location="${example.dir}/jars"/>
 
       <!-- checking required libraries -->
       <available file="${aspectjtools.jar}"
@@ -97,14 +97,14 @@
                       tracing.version3"/>
     </target>
 
-    <target name="init.taskdefs" depends="init.variables, 
+    <target name="init.taskdefs" depends="init.variables,
          aspectjtools.jar.available,
          aspectjrt.jar.available"
          unless="taskdefs.init">
       <!-- sets name of new task to iajc, old task to ajc -->
       <taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties">
-          <classpath> 
-            <pathelement path="${aspectjtools.jar}"/> 
+          <classpath>
+            <pathelement path="${aspectjtools.jar}"/>
           </classpath>
       </taskdef>
 	  <property name="taskdefs.init" value="true"/>
@@ -112,12 +112,12 @@
 
     <!-- targets to fail unless required libraries available -->
 
-    <target name="aspectjrt.jar.available" depends="init.variables" 
+    <target name="aspectjrt.jar.available" depends="init.variables"
           unless="aspectjrt.jar.available" >
       <fail message="expecting aspectjrt.jar at ${aspectjrt.jar}"/>
     </target>
 
-    <target name="aspectjtools.jar.available" depends="init.variables" 
+    <target name="aspectjtools.jar.available" depends="init.variables"
           unless="aspectjtools.jar.available" >
       <fail message="expecting aspectjtools.jar at ${aspectjtools.jar}"/>
     </target>
@@ -130,7 +130,7 @@
        <echo message="##### Ajx list=${list} class=${class}" />
        <antcall target="clean" />
        <!-- can use ajc or iajc here -->
-       <iajc destdir="${classes.dir}" argfiles="${list}" 
+       <iajc destdir="${classes.dir}" argfiles="${list}"
        		fork="true"
        		forkclasspath="${aspectjtools.jar}"
           classpath="${aspectjrt.jar}"/>
@@ -141,8 +141,8 @@
 
     </target>
 
-    <target name="Ajx-run" 
-     description="run {class} unless {norun} is set" 
+    <target name="Ajx-run"
+     description="run {class} unless {norun} is set"
           unless="norun" >
        <echo message="##### Ajx-run list=${list} class=${class}" />
        <java classname="${class}" fork="yes">
@@ -156,14 +156,14 @@
     <!-- ============================================================= -->
     <!-- example targets                                               -->
     <!-- ============================================================= -->
-    <target name="all" 
+    <target name="all"
      description="build and run all examples"
          depends="bean,intro,intro-clone,intro-compare,intro-hash,
                   observer,spacewar,spacewar-demo,telecom,
                   telecom-timing,tracing-none,tracing-1,
                   tracing-2,tracing-3,tracing-lt,tjp"/>
 
-    <target name="nonGui" 
+    <target name="nonGui"
      description="build and run non-GUI examples"
          depends="bean,intro,intro-clone,intro-compare,intro-hash,
                   telecom,telecom-timing,tracing-none,tracing-1,
@@ -303,36 +303,36 @@
     <target name="tracing-adapter" depends="init"
      description="tracing example compiled via javac task">
        <antcall target="clean" />
-       <!-- to fork, set adapter.fork=true 
+       <!-- to fork, set adapter.fork=true
             and put aspectjtools.jar on ant classpath -->
-       <javac destdir="${classes.dir}" 
+       <javac destdir="${classes.dir}"
                  fork="${adapter.fork}">
          <src path="${example.dir}"/>
          <include name="tracing/*.java"/>
-         
+
          <!-- compilerarg's ignored unless using our compiler adapter -->
-		 <compilerarg compiler="${ajc.adapter}" 
+		 <compilerarg compiler="${ajc.adapter}"
 		 	line="-verbose -Xlint -proceedOnError"/>
 		 <!-- use separate values if a path might have spaces -->
-		 <compilerarg compiler="${ajc.adapter}" 
+		 <compilerarg compiler="${ajc.adapter}"
 		 	value="-classpath"/>
-		 <compilerarg compiler="${ajc.adapter}" 
+		 <compilerarg compiler="${ajc.adapter}"
 		 	value="${aspectjrt.jar}"/>
-		 <compilerarg compiler="${ajc.adapter}" 
+		 <compilerarg compiler="${ajc.adapter}"
 		     path="${example.dir}/tracing/version3/Trace.java"/>
-		 <compilerarg compiler="${ajc.adapter}" 
+		 <compilerarg compiler="${ajc.adapter}"
 		     path="${example.dir}/tracing/version3/TraceMyClasses.java"/>
-       </javac>	   
+       </javac>
     </target>
 
     <target name="tracing-adapter-ajc" depends="init"
      description="tracing example compiled using ajc via compiler adapter">
 		<!-- aspectjtools.jar must be on system/ant classpath -->
 		<antcall target="tracing-adapter">
-			<param name="build.compiler" value="${ajc.adapter}"/> 
+			<param name="build.compiler" value="${ajc.adapter}"/>
 		</antcall>
 	</target>
-	
+
     <!-- ============================================================= -->
     <!-- do tracing example with 1.1 bytecode weaving (binary aspects) -->
     <!-- (and use fork/forkclasspath to avoid Eclipse 2.x bug)         -->
@@ -355,8 +355,8 @@
        <echo message="---------- running without tracing - START"/>
        <java classname="tracing.ExampleMain">
          <classpath>
-            <pathelement path="${aspectjrt.jar}"/> 
-            <pathelement path="${jar.dir}/tracingApp.jar"/> 
+            <pathelement path="${aspectjrt.jar}"/>
+            <pathelement path="${jar.dir}/tracingApp.jar"/>
          </classpath>
        </java>
        <echo message="---------- running without tracing - FINISH "/>
@@ -376,7 +376,7 @@
        <!-- but the aspects could be written to be binary only. -->
        <iajc outjar="${jar.dir}/tracedApp.jar"
              inpath="${jar.dir}/tracingApp.jar"
-         aspectpath="${jar.dir}/tracingLib.jar" 
+         aspectpath="${jar.dir}/tracingLib.jar"
           classpath="${aspectjrt.jar}"
           fork="true"
           forkclasspath="${aspectjtools.jar}"
@@ -389,9 +389,9 @@
        <echo message="---------- running with tracing - START"/>
        <java classname="tracing.version3.TraceMyClasses">
          <classpath>
-            <pathelement path="${aspectjrt.jar}"/> 
-            <pathelement path="${jar.dir}/tracingLib.jar"/> 
-            <pathelement path="${jar.dir}/tracedApp.jar"/> 
+            <pathelement path="${aspectjrt.jar}"/>
+            <pathelement path="${jar.dir}/tracingLib.jar"/>
+            <pathelement path="${jar.dir}/tracedApp.jar"/>
          </classpath>
        </java>
        <echo message="---------- running with tracing - FINISH"/>
@@ -431,8 +431,8 @@
        <echo message="---------- running without tracing - START"/>
        <java classname="tracing.ExampleMain">
          <classpath>
-            <pathelement path="${aspectjrt.jar}"/> 
-            <pathelement path="${jar.dir}/tracingApp.jar"/> 
+            <pathelement path="${aspectjrt.jar}"/>
+            <pathelement path="${jar.dir}/tracingApp.jar"/>
          </classpath>
        </java>
        <echo message="---------- running without tracing - FINISH "/>
@@ -442,7 +442,7 @@
        <java classname="tracing.ExampleMain"
          fork="true">
          <classpath>
-            <pathelement path="${aspectjweaver.jar}"/> 
+            <pathelement path="${aspectjweaver.jar}"/>
          </classpath>
 		 <jvmarg line="-showversion"/>
 		 <sysproperty key="java.system.class.loader" value="org.aspectj.weaver.loadtime.WeavingURLClassLoader"/>
diff --git a/docs/dist/doc/examples/ltw/HelloWorld.java b/docs/dist/doc/examples/ltw/HelloWorld.java
index 59d80b592..1d44b8b82 100644
--- a/docs/dist/doc/examples/ltw/HelloWorld.java
+++ b/docs/dist/doc/examples/ltw/HelloWorld.java
@@ -1,15 +1,15 @@
 /*
  * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
  * Contributors:
  *     Matthew Webster    initial implementation
  */
 public class HelloWorld {
-	
+
 	public static void main (String[] args) {
 		System.out.println("Hello World!");
 	}
diff --git a/docs/dist/doc/examples/ltw/Tracing.aj b/docs/dist/doc/examples/ltw/Tracing.aj
index 36170ab0c..de20c5403 100644
--- a/docs/dist/doc/examples/ltw/Tracing.aj
+++ b/docs/dist/doc/examples/ltw/Tracing.aj
@@ -1,10 +1,10 @@
 /*
  * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
  * Contributors:
  *     Matthew Webster    initial implementation
  */
diff --git a/docs/dist/doc/index.html b/docs/dist/doc/index.html
index f8309f335..c22e26715 100644
--- a/docs/dist/doc/index.html
+++ b/docs/dist/doc/index.html
@@ -216,9 +216,9 @@
      </td>
      <td>Source code for AspectJ is available 
          under the open-source 
-         <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License v1.0</a>
-         license from the CVS
-         repositories for the AspectJ project.  See the
+         <a href="https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt">Eclipse Public License v 2.0</a>
+         license from the Git
+         repositories for the AspectJ project. See the
          <a href="faq.html#q:buildingsource">FAQ entry</a>.
          </td>
      </tr>
@@ -226,7 +226,7 @@
 <tr> <td><a href="http://eclipse.org/ajdt">AspectJ for Eclipse</a>
      </td>
      <td>AspectJ Development Environment support for
-         Eclipse is available under Eclipse Public License v1.0
+         Eclipse is available under Eclipse Public License v 1.0
          from the eclipse.org project site
          <a href="http://eclipse.org/ajdt">
                   http://eclipse.org/ajdt</a>
diff --git a/docs/faq/faq.xml b/docs/faq/faq.xml
index d9a236e36..e616aae11 100644
--- a/docs/faq/faq.xml
+++ b/docs/faq/faq.xml
@@ -164,8 +164,11 @@
           <para>How is AspectJ licensed?</para>
         </question>
         <answer>
-          <para>Since AspectJ 1.5.2, source code and documentation is available under the
-            <ulink url="http://www.eclipse.org/org/documents/epl-v10.php">Eclipse Public License 1.0</ulink>.
+          <para>Since AspectJ 1.9.7, source code and documentation is available under the
+            <ulink url="https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt">Eclipse Public License v 2.0</ulink>.
+          </para>
+          <para>AspectJ 1.5.2 through 1.9.6 source code and documentation is available under the
+            <ulink url="http://www.eclipse.org/org/documents/epl-v10.php">Eclipse Public License v 1.0</ulink>.
           </para>
           <para>AspectJ 1.1 through 1.5.1 source code and documentation is available under the
             <ulink url="http://eclipse.org/legal/cpl-v10.html">Common Public License 1.0</ulink>.
@@ -177,7 +180,7 @@
               redistribution.
           </para>
           <para>The runtime jar aspectjrt.jar and its distribution are also covered by the
-          <ulink url="http://www.eclipse.org/org/documents/epl-v10.php">Eclipse Public License</ulink>.
+          <ulink url="https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt">Eclipse Public License</ulink>.
           </para>
           <para>For answers to common licensing questions, see the
           <ulink url="http://www.eclipse.org/legal/eplfaq.php">Eclipse Public License FAQ</ulink>.
@@ -1022,13 +1025,9 @@ aspect.
                 </para>
               </listitem>
               <listitem>
-                <para>AspectJ is available under a non-proprietary, open source license,
-                 either the
-                  <ulink url="http://www.opensource.org/licenses/mozilla1.1">
-                            Mozilla Public License 1.1</ulink>
-                  for 1.0 or the
-                  <ulink url="http://eclipse.org/legal/cpl-v10.html">
-                   Common Public License 1.0</ulink> for 1.1.
+                <para>AspectJ is available under a non-proprietary, open source license, the
+                  <ulink url="https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt">
+                   Eclipse Public License v 2.0</ulink>.
                   AspectJ will continue to evolve and be available, regardless
                   of the fate of any particular organization involved with
                   AspectJ.
diff --git a/docs/sandbox/aopalliance/src/org/aspectj/aopalliance/AOPAllianceAdapter.aj b/docs/sandbox/aopalliance/src/org/aspectj/aopalliance/AOPAllianceAdapter.aj
index 3487a2500..50c71830b 100644
--- a/docs/sandbox/aopalliance/src/org/aspectj/aopalliance/AOPAllianceAdapter.aj
+++ b/docs/sandbox/aopalliance/src/org/aspectj/aopalliance/AOPAllianceAdapter.aj
@@ -1,72 +1,72 @@
-/*******************************************************************************

- * Copyright (c) 2004 IBM Corporation and others.

- * 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://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.aspectj.aopalliance;

-

-import org.aspectj.lang.SoftException;

-import org.aopalliance.intercept.MethodInterceptor;

-import org.aopalliance.intercept.ConstructorInterceptor;

-

-public abstract aspect AOPAllianceAdapter {

-	

-	/**

-	 * Return the interceptor to use at method execution join points.

-	 * Must be overriden by subclasses.

-	 * @return MethodInterceptor, or null if no method advice required

-	 */

-	protected abstract MethodInterceptor getMethodInterceptor();

-	

-	/**

-	 * Return the interceptor to use at constructor execution join points.

-	 * May be overriden by subclasses.

-	 * @return ConstructorInterceptor, or null if no constructor advice required

-	 */

-	protected ConstructorInterceptor getConstructorInterceptor() {

-	  return null;

-	}

-	

-	protected abstract pointcut targetJoinPoint();

-	

-	pointcut methodExecution() : execution(* *(..));

-	pointcut constructorExecution() : execution(new(..));

-	

-	Object around() : targetJoinPoint() && methodExecution() {

-		MethodInvocationClosure mic = new MethodInvocationClosure(thisJoinPoint) {

-			public Object execute() { return proceed();}

-		};

-		MethodInterceptor mInt = getMethodInterceptor();

-		if (mInt != null) {

-			try {

-				return mInt.invoke(mic);

-			} catch (Throwable t) {

-				throw new SoftException(t);

-			}

-		} else {

-			return proceed();

-		}

-	}

-	

-	Object around() : targetJoinPoint() && constructorExecution() {

-		ConstructorInvocationClosure cic = new ConstructorInvocationClosure(thisJoinPoint) {

-			public Object execute() { proceed(); return thisJoinPoint.getThis();}

-		};

-		ConstructorInterceptor cInt = getConstructorInterceptor();

-		if (cInt != null) {

-			try {

-				return cInt.construct(cic);

-			} catch (Throwable t) {

-				throw new SoftException(t);

-			}

-		} else {

-			return proceed();

-		}

-	}

-	

-}

+/*******************************************************************************
+ * Copyright (c) 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.aspectj.aopalliance;
+
+import org.aspectj.lang.SoftException;
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.ConstructorInterceptor;
+
+public abstract aspect AOPAllianceAdapter {
+
+	/**
+	 * Return the interceptor to use at method execution join points.
+	 * Must be overriden by subclasses.
+	 * @return MethodInterceptor, or null if no method advice required
+	 */
+	protected abstract MethodInterceptor getMethodInterceptor();
+
+	/**
+	 * Return the interceptor to use at constructor execution join points.
+	 * May be overriden by subclasses.
+	 * @return ConstructorInterceptor, or null if no constructor advice required
+	 */
+	protected ConstructorInterceptor getConstructorInterceptor() {
+	  return null;
+	}
+
+	protected abstract pointcut targetJoinPoint();
+
+	pointcut methodExecution() : execution(* *(..));
+	pointcut constructorExecution() : execution(new(..));
+
+	Object around() : targetJoinPoint() && methodExecution() {
+		MethodInvocationClosure mic = new MethodInvocationClosure(thisJoinPoint) {
+			public Object execute() { return proceed();}
+		};
+		MethodInterceptor mInt = getMethodInterceptor();
+		if (mInt != null) {
+			try {
+				return mInt.invoke(mic);
+			} catch (Throwable t) {
+				throw new SoftException(t);
+			}
+		} else {
+			return proceed();
+		}
+	}
+
+	Object around() : targetJoinPoint() && constructorExecution() {
+		ConstructorInvocationClosure cic = new ConstructorInvocationClosure(thisJoinPoint) {
+			public Object execute() { proceed(); return thisJoinPoint.getThis();}
+		};
+		ConstructorInterceptor cInt = getConstructorInterceptor();
+		if (cInt != null) {
+			try {
+				return cInt.construct(cic);
+			} catch (Throwable t) {
+				throw new SoftException(t);
+			}
+		} else {
+			return proceed();
+		}
+	}
+
+}
diff --git a/docs/sandbox/aopalliance/src/org/aspectj/aopalliance/ConstructorInvocationClosure.java b/docs/sandbox/aopalliance/src/org/aspectj/aopalliance/ConstructorInvocationClosure.java
index f14d3c4e8..8495d13be 100644
--- a/docs/sandbox/aopalliance/src/org/aspectj/aopalliance/ConstructorInvocationClosure.java
+++ b/docs/sandbox/aopalliance/src/org/aspectj/aopalliance/ConstructorInvocationClosure.java
@@ -1,32 +1,32 @@
-/*******************************************************************************

- * Copyright (c) 2004 IBM Corporation and others.

- * 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://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.aspectj.aopalliance;

-

-import java.lang.reflect.Constructor;

-

-import org.aopalliance.intercept.ConstructorInvocation;

-import org.aspectj.lang.JoinPoint;

-

-public abstract class ConstructorInvocationClosure extends InvocationJoinPointClosure

-		implements ConstructorInvocation {

-

-	public ConstructorInvocationClosure(JoinPoint jp) {

-		super(jp);

-	}

-	

-	/* (non-Javadoc)

-	 * @see org.aopalliance.intercept.MethodInvocation#getMethod()

-	 */

-	public Constructor getConstructor() {

-		return (Constructor) getStaticPart();

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c) 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.aspectj.aopalliance;
+
+import java.lang.reflect.Constructor;
+
+import org.aopalliance.intercept.ConstructorInvocation;
+import org.aspectj.lang.JoinPoint;
+
+public abstract class ConstructorInvocationClosure extends InvocationJoinPointClosure
+		implements ConstructorInvocation {
+
+	public ConstructorInvocationClosure(JoinPoint jp) {
+		super(jp);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.aopalliance.intercept.MethodInvocation#getMethod()
+	 */
+	public Constructor getConstructor() {
+		return (Constructor) getStaticPart();
+	}
+
+}
diff --git a/docs/sandbox/aopalliance/src/org/aspectj/aopalliance/InvocationJoinPointClosure.java b/docs/sandbox/aopalliance/src/org/aspectj/aopalliance/InvocationJoinPointClosure.java
index 1bb20c4d8..d26f031b8 100644
--- a/docs/sandbox/aopalliance/src/org/aspectj/aopalliance/InvocationJoinPointClosure.java
+++ b/docs/sandbox/aopalliance/src/org/aspectj/aopalliance/InvocationJoinPointClosure.java
@@ -1,54 +1,54 @@
-/*******************************************************************************

- * Copyright (c) 2004 IBM Corporation and others.

- * 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://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.aspectj.aopalliance;

-

-import java.lang.reflect.AccessibleObject;

-

-import org.aopalliance.intercept.Invocation;

-import org.aspectj.lang.JoinPoint;

-import org.aspectj.lang.reflect.CodeSignature;

-import org.aspectj.lang.reflect.ConstructorSignature;

-import org.aspectj.lang.reflect.MethodSignature;

-

-public abstract class InvocationJoinPointClosure extends JoinPointClosure implements Invocation {

-

-	public InvocationJoinPointClosure(JoinPoint jp) {

-		super(jp);

-	}

-	

-	/* (non-Javadoc)

-	 * @see org.aopalliance.intercept.Joinpoint#getStaticPart()

-	 */

-	public AccessibleObject getStaticPart() {

-		CodeSignature cSig = (CodeSignature)jp.getSignature();

-		Class clazz = cSig.getDeclaringType();

-		AccessibleObject ret = null;

-		try {

-			if (cSig instanceof MethodSignature) {

-				ret = clazz.getMethod(cSig.getName(),cSig.getParameterTypes());				

-			} else if (cSig instanceof ConstructorSignature) {

-				ret = clazz.getConstructor(cSig.getParameterTypes());

-			}

-		} catch (NoSuchMethodException mEx) {

-			throw new UnsupportedOperationException(

-					"Can't find member " + cSig.toLongString());

-		}

-		return ret;

-	}

-	

-	/* (non-Javadoc)

-	 * @see org.aopalliance.intercept.Invocation#getArguments()

-	 */

-	public Object[] getArguments() {

-		return jp.getArgs();

-	}	

-

-}

+/*******************************************************************************
+ * Copyright (c) 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.aspectj.aopalliance;
+
+import java.lang.reflect.AccessibleObject;
+
+import org.aopalliance.intercept.Invocation;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.reflect.CodeSignature;
+import org.aspectj.lang.reflect.ConstructorSignature;
+import org.aspectj.lang.reflect.MethodSignature;
+
+public abstract class InvocationJoinPointClosure extends JoinPointClosure implements Invocation {
+
+	public InvocationJoinPointClosure(JoinPoint jp) {
+		super(jp);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.aopalliance.intercept.Joinpoint#getStaticPart()
+	 */
+	public AccessibleObject getStaticPart() {
+		CodeSignature cSig = (CodeSignature)jp.getSignature();
+		Class clazz = cSig.getDeclaringType();
+		AccessibleObject ret = null;
+		try {
+			if (cSig instanceof MethodSignature) {
+				ret = clazz.getMethod(cSig.getName(),cSig.getParameterTypes());
+			} else if (cSig instanceof ConstructorSignature) {
+				ret = clazz.getConstructor(cSig.getParameterTypes());
+			}
+		} catch (NoSuchMethodException mEx) {
+			throw new UnsupportedOperationException(
+					"Can't find member " + cSig.toLongString());
+		}
+		return ret;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.aopalliance.intercept.Invocation#getArguments()
+	 */
+	public Object[] getArguments() {
+		return jp.getArgs();
+	}
+
+}
diff --git a/docs/sandbox/aopalliance/src/org/aspectj/aopalliance/JoinPointClosure.java b/docs/sandbox/aopalliance/src/org/aspectj/aopalliance/JoinPointClosure.java
index e2c709289..38f2846d4 100644
--- a/docs/sandbox/aopalliance/src/org/aspectj/aopalliance/JoinPointClosure.java
+++ b/docs/sandbox/aopalliance/src/org/aspectj/aopalliance/JoinPointClosure.java
@@ -1,50 +1,50 @@
-/*******************************************************************************

- * Copyright (c) 2004 IBM Corporation and others.

- * 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://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.aspectj.aopalliance;

-

-import java.lang.reflect.AccessibleObject;

-

-import org.aopalliance.intercept.Joinpoint;

-import org.aspectj.lang.JoinPoint;

-

-public abstract class JoinPointClosure implements Joinpoint {

-	

-	protected JoinPoint jp;

-	

-	public JoinPointClosure(JoinPoint joinPoint) {

-		this.jp = joinPoint;

-	}

-	

-	/* (non-Javadoc)

-	 * @see org.aopalliance.intercept.Joinpoint#proceed()

-	 */

-	public Object proceed() throws Throwable {

-		return execute();

-	}

-	

-	// for subclasses, renamed from proceed to avoid confusion in 

-	// AspectJ around advice.

-	public abstract Object execute();

-	

-	/* (non-Javadoc)

-	 * @see org.aopalliance.intercept.Joinpoint#getThis()

-	 */

-	public Object getThis() {

-		return jp.getThis();  

-	}

-	/* (non-Javadoc)

-	 * @see org.aopalliance.intercept.Joinpoint#getStaticPart()

-	 * Must return either a Field, Method or Constructor representing the entity

-	 * at the joinpoint.

-	 */

-	public abstract AccessibleObject getStaticPart();

-

-}

+/*******************************************************************************
+ * Copyright (c) 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.aspectj.aopalliance;
+
+import java.lang.reflect.AccessibleObject;
+
+import org.aopalliance.intercept.Joinpoint;
+import org.aspectj.lang.JoinPoint;
+
+public abstract class JoinPointClosure implements Joinpoint {
+
+	protected JoinPoint jp;
+
+	public JoinPointClosure(JoinPoint joinPoint) {
+		this.jp = joinPoint;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.aopalliance.intercept.Joinpoint#proceed()
+	 */
+	public Object proceed() throws Throwable {
+		return execute();
+	}
+
+	// for subclasses, renamed from proceed to avoid confusion in
+	// AspectJ around advice.
+	public abstract Object execute();
+
+	/* (non-Javadoc)
+	 * @see org.aopalliance.intercept.Joinpoint#getThis()
+	 */
+	public Object getThis() {
+		return jp.getThis();
+	}
+	/* (non-Javadoc)
+	 * @see org.aopalliance.intercept.Joinpoint#getStaticPart()
+	 * Must return either a Field, Method or Constructor representing the entity
+	 * at the joinpoint.
+	 */
+	public abstract AccessibleObject getStaticPart();
+
+}
diff --git a/docs/sandbox/aopalliance/src/org/aspectj/aopalliance/MethodInvocationClosure.java b/docs/sandbox/aopalliance/src/org/aspectj/aopalliance/MethodInvocationClosure.java
index 166c8a70c..087761fec 100644
--- a/docs/sandbox/aopalliance/src/org/aspectj/aopalliance/MethodInvocationClosure.java
+++ b/docs/sandbox/aopalliance/src/org/aspectj/aopalliance/MethodInvocationClosure.java
@@ -1,33 +1,33 @@
-/*******************************************************************************

- * Copyright (c) 2004 IBM Corporation and others.

- * 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://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.aspectj.aopalliance;

-

-import java.lang.reflect.Method;

-

-import org.aopalliance.intercept.MethodInvocation;

-import org.aspectj.lang.JoinPoint;

-

-public abstract class MethodInvocationClosure extends InvocationJoinPointClosure

-		implements

-			MethodInvocation {

-

-	public MethodInvocationClosure(JoinPoint jp) {

-		super(jp);

-	}

-	

-	/* (non-Javadoc)

-	 * @see org.aopalliance.intercept.MethodInvocation#getMethod()

-	 */

-	public Method getMethod() {

-		return (Method) getStaticPart();

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c) 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.aspectj.aopalliance;
+
+import java.lang.reflect.Method;
+
+import org.aopalliance.intercept.MethodInvocation;
+import org.aspectj.lang.JoinPoint;
+
+public abstract class MethodInvocationClosure extends InvocationJoinPointClosure
+		implements
+			MethodInvocation {
+
+	public MethodInvocationClosure(JoinPoint jp) {
+		super(jp);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.aopalliance.intercept.MethodInvocation#getMethod()
+	 */
+	public Method getMethod() {
+		return (Method) getStaticPart();
+	}
+
+}
diff --git a/docs/sandbox/api-clients/org/aspectj/samples/AsmHierarchyBuilderExtensionTest.java b/docs/sandbox/api-clients/org/aspectj/samples/AsmHierarchyBuilderExtensionTest.java
index 1c99844ab..040929c67 100644
--- a/docs/sandbox/api-clients/org/aspectj/samples/AsmHierarchyBuilderExtensionTest.java
+++ b/docs/sandbox/api-clients/org/aspectj/samples/AsmHierarchyBuilderExtensionTest.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
  * Copyright (c) 2004 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://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Mik Kersten     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
+ *     Mik Kersten     initial implementation
  * ******************************************************************/
  package org.aspectj.samples;
 
@@ -21,35 +21,35 @@ import org.aspectj.asm.IProgramElement;
 import org.aspectj.asm.internal.ProgramElement;
 import org.aspectj.org.eclipse.jdt.internal.compiler.ast.MessageSend;
 import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.BlockScope;
-  
+
 /**
  * This test demonstrates how hierarchy building in the ASM can be extended
  * to put additional information in the model, for example method call sites.
- * 
+ *
  * @author Mik Kersten
  */
 public class AsmHierarchyBuilderExtensionTest extends AjdeTestCase {
 
     private ExtendedAsmHiearchyBuilder builder = new ExtendedAsmHiearchyBuilder();
-    
+
 	public void testHiearchyExtension() {
 	    assertNotNull(AsmManager.getDefault().getHierarchy().getRoot());
 	    System.out.println(AsmManager.getDefault().getHierarchy().getRoot().toLongString());
 	}
-	
+
 	protected void setUp() throws Exception {
 		super.setUp("examples");
 		AjBuildManager.setAsmHierarchyBuilder(builder);  // NOTE that we set our builder here
-		assertTrue("build success", doSynchronousBuild("../examples/coverage/coverage.lst"));	
+		assertTrue("build success", doSynchronousBuild("../examples/coverage/coverage.lst"));
 	}
 }
 
 class ExtendedAsmHiearchyBuilder extends AsmHierarchyBuilder {
-    
+
     public boolean visit(MessageSend messageSend, BlockScope scope) {
 		IProgramElement peNode = new ProgramElement(
 				new String(">>> found call: " + messageSend.toString()),
-				IProgramElement.Kind.CODE,	
+				IProgramElement.Kind.CODE,
 				null, //makeLocation(messageSend),
 				0,
 				"",
diff --git a/docs/sandbox/api-clients/org/aspectj/samples/AsmRelationshipMapUsageTest.java b/docs/sandbox/api-clients/org/aspectj/samples/AsmRelationshipMapUsageTest.java
index 98ecdfa7b..d1f050be3 100644
--- a/docs/sandbox/api-clients/org/aspectj/samples/AsmRelationshipMapUsageTest.java
+++ b/docs/sandbox/api-clients/org/aspectj/samples/AsmRelationshipMapUsageTest.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
  * Copyright (c) 2004 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://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Mik Kersten     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
+ *     Mik Kersten     initial implementation
  * ******************************************************************/
 
 package org.aspectj.samples;
@@ -20,13 +20,13 @@ import org.aspectj.ajdt.internal.core.builder.AjBuildManager;
 import org.aspectj.asm.*;
 
 /**
- * Collects join point information for all advised methods and constructors.  
- * 
+ * Collects join point information for all advised methods and constructors.
+ *
  * @author Mik Kersten
  */
 public class AsmRelationshipMapUsageTest extends AjdeTestCase {
 
-    public void testFindAdvisedMethods() {        
+    public void testFindAdvisedMethods() {
         System.out.println("----------------------------------");
         System.out.println("Methods affected by advice: ");
         HierarchyWalker walker = new HierarchyWalker() {
@@ -38,9 +38,9 @@ public class AsmRelationshipMapUsageTest extends AjdeTestCase {
 	                        IRelationship relationship = (IRelationship)it.next();
 	                        if (relationship.getKind().equals(IRelationship.Kind.ADVICE)) {
 	                            System.out.println(
-	                                    "method: " + node.toString() 
+	                                    "method: " + node.toString()
 	                                    + ", advised by: " + relationship.getTargets());
-	                        } 
+	                        }
 	                    }
                     }
                 }
@@ -48,7 +48,7 @@ public class AsmRelationshipMapUsageTest extends AjdeTestCase {
         };
         AsmManager.getDefault().getHierarchy().getRoot().walk(walker);
     }
-    
+
     public void testListFilesAffectedByInterTypeDecs() {
         System.out.println("----------------------------------");
         System.out.println("Files affected by inter type declarations: ");
@@ -61,9 +61,9 @@ public class AsmRelationshipMapUsageTest extends AjdeTestCase {
 	                        IRelationship relationship = (IRelationship)it.next();
 	                        if (relationship.getKind().equals(IRelationship.Kind.DECLARE_INTER_TYPE)) {
 	                            System.out.println(
-                                    "file: " + node.getSourceLocation().getSourceFile().getName() 
+                                    "file: " + node.getSourceLocation().getSourceFile().getName()
                                     + ", declared on by: " + relationship.getTargets());
-	                        } 
+	                        }
 	                    }
                     }
                 }
@@ -71,11 +71,11 @@ public class AsmRelationshipMapUsageTest extends AjdeTestCase {
         };
         AsmManager.getDefault().getHierarchy().getRoot().walk(walker);
     }
-    
-	
+
+
 	protected void setUp() throws Exception {
 	    super.setUp("examples");
-		assertTrue("build success", doSynchronousBuild("../examples/spacewar/spacewar/debug.lst"));	
+		assertTrue("build success", doSynchronousBuild("../examples/spacewar/spacewar/debug.lst"));
 	}
 }
 
diff --git a/docs/sandbox/common/org/aspectj/langlib/Pointcuts.java b/docs/sandbox/common/org/aspectj/langlib/Pointcuts.java
index ce6151a38..89faecc95 100644
--- a/docs/sandbox/common/org/aspectj/langlib/Pointcuts.java
+++ b/docs/sandbox/common/org/aspectj/langlib/Pointcuts.java
@@ -1,16 +1,16 @@
 /* *******************************************************************
  * Copyright (c) 2003 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://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Wes Isberg     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
+ *     Wes Isberg     initial implementation
  * ******************************************************************/
 
-// START-SAMPLE library-pointcutIdioms Standard pointcut idioms 
+// START-SAMPLE library-pointcutIdioms Standard pointcut idioms
 package org.aspectj.langlib;
 
 import java.io.*;
@@ -19,7 +19,7 @@ import java.util.*;
 /**
  * Library of pointcut idioms to use in combination with
  * other pointcuts.
- * 
+ *
  * @author Wes Isberg
  */
 public final class Pointcuts {
@@ -36,54 +36,54 @@ public final class Pointcuts {
 
     public pointcut mainExecution() :
         execution(public static void main(String[]));
-        
+
     /** staticly-determinable to never match any join point */
     public pointcut never();
        // if(false) && execution(ThreadDeath *(ThreadDeath, ThreadDeath));
-    
+
     public pointcut afterAdviceSupported() : !handler(*);
 
     public pointcut aroundAdviceSupported() : !handler(*)
         && !initialization(new(..)) && !preinitialization(new(..));
 
-    public pointcut anyMethodExecution() : 
+    public pointcut anyMethodExecution() :
         execution(* *(..));
 
-    public pointcut anyPublicMethodExecution() : 
+    public pointcut anyPublicMethodExecution() :
         execution(public * *(..));
 
-    public pointcut anyNonPrivateMethodExecution() : 
+    public pointcut anyNonPrivateMethodExecution() :
         execution(!private * *(..));
 
-    public pointcut anyConstructorExecution() : 
+    public pointcut anyConstructorExecution() :
         execution(new(..));
 
-    public pointcut anyPublicConstructorExecution() : 
+    public pointcut anyPublicConstructorExecution() :
         execution(public new(..));
 
     public pointcut anyNonPrivateConstructorExecution() :
         execution(!private new(..));
 
-    public pointcut anyPublicFieldGet() : 
+    public pointcut anyPublicFieldGet() :
         get(public * *);
 
-    public pointcut anyNonPrivateFieldGet() : 
+    public pointcut anyNonPrivateFieldGet() :
         get(!private * *);
 
-    public pointcut anyPublicFieldSet() : 
+    public pointcut anyPublicFieldSet() :
         set(public * *);
 
-    public pointcut anyNonPrivateFieldSet() : 
+    public pointcut anyNonPrivateFieldSet() :
         set(!private * *); // also !transient?
 
     public pointcut withinSetter() :  // require !static?
         withincode(void set*(*)); // use any return type? multiple parms?
 
-    public pointcut withinGetter() : 
+    public pointcut withinGetter() :
         withincode(!void get*()); // permit parms? require !static?
-    
-    public pointcut anyNonPublicFieldSetOutsideConstructorOrSetter() : 
-        set(!public * *) && !withincode(new(..)) 
+
+    public pointcut anyNonPublicFieldSetOutsideConstructorOrSetter() :
+        set(!public * *) && !withincode(new(..))
         && !withinSetter();
 
     public pointcut anyRunnableImplementation() :
@@ -94,7 +94,7 @@ public final class Pointcuts {
 
     public pointcut anySetSystemErrOut() :
         call(void System.setOut(..)) || call(void System.setErr(..));
-    
+
     public pointcut withinAnyJavaCode() :
         within(java..*) || within(javax..*);
 
@@ -108,15 +108,15 @@ public final class Pointcuts {
     public pointcut anyThreadConstruction() :
         call(Thread+.new(..)) || execution(Thread+.new(..));
 
-    /** 
-     * Any calls to java.io classes 
+    /**
+     * Any calls to java.io classes
      * (but not methods declared only on their subclasses).
      */
     public pointcut anyJavaIOCalls() :
         call(* java.io..*.*(..)) || call(java.io..*.new(..));
 
-    /** 
-     * Any calls to java.awt or javax.swing methods or constructors 
+    /**
+     * Any calls to java.awt or javax.swing methods or constructors
      * (but not methods declared only on their subclasses).
      */
     public pointcut anyJavaAWTOrSwingCalls() :
@@ -125,10 +125,10 @@ public final class Pointcuts {
 
     public pointcut cloneImplementationsInNonCloneable() :
         execution(Object !Cloneable+.clone());
-        
+
     public pointcut runImplementationsInNonRunnable() :
         execution(void !Runnable+.run());
-        
+
     /** any calls to java.lang.reflect or Class.get* (except getName()) */
     public pointcut anySystemReflectiveCalls() :
         call(* java.lang.reflect..*.*(..))
@@ -152,13 +152,13 @@ public final class Pointcuts {
      * an Iterator can remove elements.
      */
     public pointcut anyCollectionWriteCalls() :
-        call(boolean Collection+.add(Object)) 
-        || call(boolean Collection+.addAll(Collection)) 
+        call(boolean Collection+.add(Object))
+        || call(boolean Collection+.addAll(Collection))
         || call(void Collection+.clear())
         || call(boolean Collection+.remove(Object))
         || call(boolean Collection+.removeAll(Collection))
         || call(boolean Collection+.retainAll(Collection));
-        
+
     public pointcut mostThrowableReadCalls() :
         call(* Throwable+.get*(..))
         || call(* Throwable+.print*(..))
@@ -167,13 +167,13 @@ public final class Pointcuts {
     public pointcut exceptionWrappingCalls() :
         (args(Throwable+,..) || args(.., Throwable+))
         && (set(Throwable+ Throwable+.*)
-            || (call(* Throwable+.*(..)) 
+            || (call(* Throwable+.*(..))
                 || call(Throwable+.new(..))));
 
     public pointcut anyCodeThrowingException() :
         execution(* *(..) throws Exception+)
             || execution(new(..) throws Exception+);
-            
+
     private Pointcuts() {} // XXX avoid this? else pointcuts match it...
 }
 //END-SAMPLE library-pointcutIdioms
diff --git a/docs/teaching/exercises/answers/Answer1a.java b/docs/teaching/exercises/answers/Answer1a.java
index 138312d8d..09c41a28d 100644
--- a/docs/teaching/exercises/answers/Answer1a.java
+++ b/docs/teaching/exercises/answers/Answer1a.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/answers/Answer1b.java b/docs/teaching/exercises/answers/Answer1b.java
index e2718c9f8..95c6e130d 100644
--- a/docs/teaching/exercises/answers/Answer1b.java
+++ b/docs/teaching/exercises/answers/Answer1b.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/answers/Answer1c.java b/docs/teaching/exercises/answers/Answer1c.java
index 613731639..f90dc8bcc 100644
--- a/docs/teaching/exercises/answers/Answer1c.java
+++ b/docs/teaching/exercises/answers/Answer1c.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/answers/Answer2a.java b/docs/teaching/exercises/answers/Answer2a.java
index 22e77a5e8..46519a83e 100644
--- a/docs/teaching/exercises/answers/Answer2a.java
+++ b/docs/teaching/exercises/answers/Answer2a.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/answers/Answer2b.java b/docs/teaching/exercises/answers/Answer2b.java
index c6f38faca..c9ba82bee 100644
--- a/docs/teaching/exercises/answers/Answer2b.java
+++ b/docs/teaching/exercises/answers/Answer2b.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/answers/Answer2c.java b/docs/teaching/exercises/answers/Answer2c.java
index 5e792b8f2..2364aaeb0 100644
--- a/docs/teaching/exercises/answers/Answer2c.java
+++ b/docs/teaching/exercises/answers/Answer2c.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/answers/Answer2d.java b/docs/teaching/exercises/answers/Answer2d.java
index 6fd93b813..0d99f537f 100644
--- a/docs/teaching/exercises/answers/Answer2d.java
+++ b/docs/teaching/exercises/answers/Answer2d.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/answers/Answer2e.java b/docs/teaching/exercises/answers/Answer2e.java
index db49b90c1..7da69c313 100644
--- a/docs/teaching/exercises/answers/Answer2e.java
+++ b/docs/teaching/exercises/answers/Answer2e.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/answers/Answer2f.java b/docs/teaching/exercises/answers/Answer2f.java
index 8d9849037..f8992ccf9 100644
--- a/docs/teaching/exercises/answers/Answer2f.java
+++ b/docs/teaching/exercises/answers/Answer2f.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/answers/Answer3a.java b/docs/teaching/exercises/answers/Answer3a.java
index 6f2f1b8d9..d48924ee8 100644
--- a/docs/teaching/exercises/answers/Answer3a.java
+++ b/docs/teaching/exercises/answers/Answer3a.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/answers/Answer3b.java b/docs/teaching/exercises/answers/Answer3b.java
index ae8837456..4fe3072fa 100644
--- a/docs/teaching/exercises/answers/Answer3b.java
+++ b/docs/teaching/exercises/answers/Answer3b.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
@@ -21,10 +21,10 @@ import figures.FigureElement;
 aspect Answer3b {
     before(Object o):
             execution(public * *(..))
-            && !execution(public String toString(..)) 
+            && !execution(public String toString(..))
             // or perhaps !cflow(adviceexecution())
-            && within(figures.*) 
-            && target(o) 
+            && within(figures.*)
+            && target(o)
     {
         Log.write(thisJoinPoint + " at " + o);
     }
diff --git a/docs/teaching/exercises/answers/Answer3c.java b/docs/teaching/exercises/answers/Answer3c.java
index 89b8378d1..198558d06 100644
--- a/docs/teaching/exercises/answers/Answer3c.java
+++ b/docs/teaching/exercises/answers/Answer3c.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
@@ -18,7 +18,7 @@ import figures.*;
 
 aspect Answer3c {
     before():
-            execution(void Group.add(FigureElement)) 
+            execution(void Group.add(FigureElement))
             && args(Point) {
         Log.write("adding Point");
     }
diff --git a/docs/teaching/exercises/answers/Answer3d.java b/docs/teaching/exercises/answers/Answer3d.java
index 3ce984904..b2e74218c 100755
--- a/docs/teaching/exercises/answers/Answer3d.java
+++ b/docs/teaching/exercises/answers/Answer3d.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
@@ -20,8 +20,8 @@ aspect Answer3d {
 
     private boolean Point.inGroup = false;
 
-    before(Point p): 
-            execution(void Group.add(FigureElement)) 
+    before(Point p):
+            execution(void Group.add(FigureElement))
             && args(p) {
         if (p.inGroup) {
             throw new IllegalStateException();
diff --git a/docs/teaching/exercises/answers/Answer3e.java b/docs/teaching/exercises/answers/Answer3e.java
index 19199afd1..505aa22c6 100755
--- a/docs/teaching/exercises/answers/Answer3e.java
+++ b/docs/teaching/exercises/answers/Answer3e.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
@@ -20,9 +20,9 @@ aspect Answer3e {
 
     private Group Point.containingGroup = null;
 
-    before(Group g, Point p): 
-            execution(void Group.add(FigureElement)) 
-            && this(g) 
+    before(Group g, Point p):
+            execution(void Group.add(FigureElement))
+            && this(g)
             && args(p) {
         if (p.containingGroup != null) {
             throw new IllegalStateException(p.containingGroup.toString());
diff --git a/docs/teaching/exercises/answers/Answer4a.java b/docs/teaching/exercises/answers/Answer4a.java
index f7350e842..99fa96cc1 100644
--- a/docs/teaching/exercises/answers/Answer4a.java
+++ b/docs/teaching/exercises/answers/Answer4a.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/answers/Answer4b.java b/docs/teaching/exercises/answers/Answer4b.java
index bde0a74e1..2e77fd862 100644
--- a/docs/teaching/exercises/answers/Answer4b.java
+++ b/docs/teaching/exercises/answers/Answer4b.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
@@ -20,7 +20,7 @@ aspect Answer4b {
     private Rectangle Group.cache = null;
 
     Rectangle around(Group g):
-            execution(Rectangle Group.getBounds()) 
+            execution(Rectangle Group.getBounds())
             && this(g) {
         if (g.cache == null) {
             g.cache = proceed(g);
diff --git a/docs/teaching/exercises/answers/Answer4c.java b/docs/teaching/exercises/answers/Answer4c.java
index 795b5db80..c9d0e8415 100644
--- a/docs/teaching/exercises/answers/Answer4c.java
+++ b/docs/teaching/exercises/answers/Answer4c.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
@@ -20,7 +20,7 @@ aspect Answer4c {
     private Rectangle Group.cache = null;
 
     Rectangle around(Group g):
-            execution(Rectangle Group.getBounds()) 
+            execution(Rectangle Group.getBounds())
             && this(g) {
         if (g.cache == null) {
             g.cache = proceed(g);
@@ -28,8 +28,8 @@ aspect Answer4c {
         return g.cache;
     }
 
-    before(Group g): 
-            call(void move(int, int)) 
+    before(Group g):
+            call(void move(int, int))
             && target(g) {
         g.cache = null;
     }
diff --git a/docs/teaching/exercises/answers/Answer4d.java b/docs/teaching/exercises/answers/Answer4d.java
index cc6c4785e..2f019c249 100644
--- a/docs/teaching/exercises/answers/Answer4d.java
+++ b/docs/teaching/exercises/answers/Answer4d.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
@@ -22,14 +22,14 @@ aspect Answer4d {
     private Group Point.enclosingGroup = null;
 
     before(Point p, Group g):
-            execution(void add(FigureElement)) 
-            && args(p) 
+            execution(void add(FigureElement))
+            && args(p)
             && target(g) {
         p.enclosingGroup = g;
     }
 
     Rectangle around(Group g):
-            execution(Rectangle Group.getBounds()) 
+            execution(Rectangle Group.getBounds())
             && this(g) {
         if (g.cache == null) {
             g.cache = proceed(g);
@@ -37,8 +37,8 @@ aspect Answer4d {
         return g.cache;
     }
 
-    before(Point p): 
-            set(* Point.*) 
+    before(Point p):
+            set(* Point.*)
             && target(p) {
         if (p.enclosingGroup != null) {
             p.enclosingGroup.cache = null;
diff --git a/docs/teaching/exercises/answers/Answer4e.java b/docs/teaching/exercises/answers/Answer4e.java
index 7d7be5b91..e3d6fa3d4 100644
--- a/docs/teaching/exercises/answers/Answer4e.java
+++ b/docs/teaching/exercises/answers/Answer4e.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
@@ -21,15 +21,15 @@ aspect Answer4e {
     private Rectangle Group.cache = null;
     private Group FigureElement.enclosingGroup = null;
 
-    before(FigureElement p, Group g): 
-	    execution(void add(FigureElement)) 
-	    && args(p) 
+    before(FigureElement p, Group g):
+	    execution(void add(FigureElement))
+	    && args(p)
 	    && target(g) {
         p.enclosingGroup = g;
     }
 
     Rectangle around(Group g):
-            execution(Rectangle Group.getBounds()) 
+            execution(Rectangle Group.getBounds())
 	    && this(g) {
         if (g.cache == null) {
             g.cache = proceed(g);
@@ -37,8 +37,8 @@ aspect Answer4e {
         return g.cache;
     }
 
-    before(Point p): 
-	    set(* Point.*) 
+    before(Point p):
+	    set(* Point.*)
 	    && target(p) {
         FigureElement fe = p;
         while (fe.enclosingGroup != null) {
diff --git a/docs/teaching/exercises/figures/Box.java b/docs/teaching/exercises/figures/Box.java
index e47cd5290..2db991a21 100644
--- a/docs/teaching/exercises/figures/Box.java
+++ b/docs/teaching/exercises/figures/Box.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/figures/FigureElement.java b/docs/teaching/exercises/figures/FigureElement.java
index 1bf136a83..ac588f94d 100644
--- a/docs/teaching/exercises/figures/FigureElement.java
+++ b/docs/teaching/exercises/figures/FigureElement.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
@@ -17,7 +17,7 @@ import java.awt.*;
 import java.awt.geom.*;
 
 public interface FigureElement {
-    public static final Rectangle MAX_BOUNDS = 
+    public static final Rectangle MAX_BOUNDS =
         new Rectangle(0, 0, 500, 500);
 
     public abstract void move(int dx, int dy);
diff --git a/docs/teaching/exercises/figures/Group.java b/docs/teaching/exercises/figures/Group.java
index b29625ce0..f8ec65556 100644
--- a/docs/teaching/exercises/figures/Group.java
+++ b/docs/teaching/exercises/figures/Group.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/figures/Line.java b/docs/teaching/exercises/figures/Line.java
index 876f45f7a..fb3b86b65 100644
--- a/docs/teaching/exercises/figures/Line.java
+++ b/docs/teaching/exercises/figures/Line.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/figures/Point.java b/docs/teaching/exercises/figures/Point.java
index c522f9a63..95bd63994 100644
--- a/docs/teaching/exercises/figures/Point.java
+++ b/docs/teaching/exercises/figures/Point.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/figures/ShapeFigureElement.java b/docs/teaching/exercises/figures/ShapeFigureElement.java
index 36bec0fa6..8e7bd34c2 100644
--- a/docs/teaching/exercises/figures/ShapeFigureElement.java
+++ b/docs/teaching/exercises/figures/ShapeFigureElement.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/figures/SlothfulPoint.java b/docs/teaching/exercises/figures/SlothfulPoint.java
index 2afb7acf9..89f80d700 100644
--- a/docs/teaching/exercises/figures/SlothfulPoint.java
+++ b/docs/teaching/exercises/figures/SlothfulPoint.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/figures/gui/FigurePanel.java b/docs/teaching/exercises/figures/gui/FigurePanel.java
index adb5314ed..6b264f42a 100644
--- a/docs/teaching/exercises/figures/gui/FigurePanel.java
+++ b/docs/teaching/exercises/figures/gui/FigurePanel.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/figures/gui/LogAdapter.java b/docs/teaching/exercises/figures/gui/LogAdapter.java
index 023b137e3..dbacd37ca 100644
--- a/docs/teaching/exercises/figures/gui/LogAdapter.java
+++ b/docs/teaching/exercises/figures/gui/LogAdapter.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/figures/gui/Main.java b/docs/teaching/exercises/figures/gui/Main.java
index aa41ae928..23330ca8a 100644
--- a/docs/teaching/exercises/figures/gui/Main.java
+++ b/docs/teaching/exercises/figures/gui/Main.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/support/Log.java b/docs/teaching/exercises/support/Log.java
index 5b6cd2e37..7c615836e 100644
--- a/docs/teaching/exercises/support/Log.java
+++ b/docs/teaching/exercises/support/Log.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/tests/CoreTest.java b/docs/teaching/exercises/tests/CoreTest.java
index ea61def77..e069e67b5 100644
--- a/docs/teaching/exercises/tests/CoreTest.java
+++ b/docs/teaching/exercises/tests/CoreTest.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/tests/Test2a.java b/docs/teaching/exercises/tests/Test2a.java
index c2143abf9..8035a0543 100644
--- a/docs/teaching/exercises/tests/Test2a.java
+++ b/docs/teaching/exercises/tests/Test2a.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/tests/Test2b.java b/docs/teaching/exercises/tests/Test2b.java
index 815e34a85..2e2fecf73 100644
--- a/docs/teaching/exercises/tests/Test2b.java
+++ b/docs/teaching/exercises/tests/Test2b.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/tests/Test2c.java b/docs/teaching/exercises/tests/Test2c.java
index a175be771..2bb7093ee 100644
--- a/docs/teaching/exercises/tests/Test2c.java
+++ b/docs/teaching/exercises/tests/Test2c.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/tests/Test2d.java b/docs/teaching/exercises/tests/Test2d.java
index f404d9ce2..baabd9aea 100644
--- a/docs/teaching/exercises/tests/Test2d.java
+++ b/docs/teaching/exercises/tests/Test2d.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/tests/Test2e.java b/docs/teaching/exercises/tests/Test2e.java
index a7c7f7247..bf388cbb6 100644
--- a/docs/teaching/exercises/tests/Test2e.java
+++ b/docs/teaching/exercises/tests/Test2e.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/tests/Test2f.java b/docs/teaching/exercises/tests/Test2f.java
index 526b791b8..adcf58923 100644
--- a/docs/teaching/exercises/tests/Test2f.java
+++ b/docs/teaching/exercises/tests/Test2f.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/tests/Test3a.java b/docs/teaching/exercises/tests/Test3a.java
index fdb459ad5..8baf39096 100644
--- a/docs/teaching/exercises/tests/Test3a.java
+++ b/docs/teaching/exercises/tests/Test3a.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/tests/Test3b.java b/docs/teaching/exercises/tests/Test3b.java
index 51becc7fd..294951824 100644
--- a/docs/teaching/exercises/tests/Test3b.java
+++ b/docs/teaching/exercises/tests/Test3b.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/tests/Test3c.java b/docs/teaching/exercises/tests/Test3c.java
index bcdfbb4f9..d563d8056 100644
--- a/docs/teaching/exercises/tests/Test3c.java
+++ b/docs/teaching/exercises/tests/Test3c.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/tests/Test3d.java b/docs/teaching/exercises/tests/Test3d.java
index cf51ab9cf..0dc4c0ad4 100755
--- a/docs/teaching/exercises/tests/Test3d.java
+++ b/docs/teaching/exercises/tests/Test3d.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/tests/Test3e.java b/docs/teaching/exercises/tests/Test3e.java
index 54507b775..c223a83cd 100755
--- a/docs/teaching/exercises/tests/Test3e.java
+++ b/docs/teaching/exercises/tests/Test3e.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/tests/Test4a.java b/docs/teaching/exercises/tests/Test4a.java
index 027f3a985..4087f39a6 100644
--- a/docs/teaching/exercises/tests/Test4a.java
+++ b/docs/teaching/exercises/tests/Test4a.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/tests/Test4b.java b/docs/teaching/exercises/tests/Test4b.java
index 0a8b0b430..3429b3d24 100644
--- a/docs/teaching/exercises/tests/Test4b.java
+++ b/docs/teaching/exercises/tests/Test4b.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/tests/Test4c.java b/docs/teaching/exercises/tests/Test4c.java
index c2720003e..544409db1 100644
--- a/docs/teaching/exercises/tests/Test4c.java
+++ b/docs/teaching/exercises/tests/Test4c.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/tests/Test4d.java b/docs/teaching/exercises/tests/Test4d.java
index 2c65cecdd..dc7770f34 100644
--- a/docs/teaching/exercises/tests/Test4d.java
+++ b/docs/teaching/exercises/tests/Test4d.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/exercises/tests/Test4e.java b/docs/teaching/exercises/tests/Test4e.java
index 0e88a6c7e..4d8b18466 100644
--- a/docs/teaching/exercises/tests/Test4e.java
+++ b/docs/teaching/exercises/tests/Test4e.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 Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors:
  *     PARC     initial implementation
diff --git a/docs/teaching/readme.txt b/docs/teaching/readme.txt
index e1f16c903..48f4e1466 100644
--- a/docs/teaching/readme.txt
+++ b/docs/teaching/readme.txt
@@ -3,9 +3,9 @@ Copyright (c) 1998-2002 Palo Alto Research Center, Incorporated (PARC).
 All rights reserved. 
 
  * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
+ * under the terms of the Eclipse Public License v 2.0 
  * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *  
  * Contributors: 
- *     PARC     initial implementation 
\ No newline at end of file
+ *     PARC     initial implementation