mavenizing runtime module - complete

53 files changed, 287 insertions, 1 deletions

diff --git a/runtime/src/.cvsignore b/runtime/src/.cvsignore
deleted file mode 100644
index a3f0b1b77..000000000
--- a/runtime/src/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.lst
diff --git a/runtime/src/org/aspectj/lang/Aspects14.java b/runtime/src/main/java/org/aspectj/lang/Aspects14.java
index b7f3a3a4b..b7f3a3a4b 100644
--- a/runtime/src/org/aspectj/lang/Aspects14.java
+++ b/runtime/src/main/java/org/aspectj/lang/Aspects14.java
diff --git a/runtime/src/org/aspectj/lang/JoinPoint.java b/runtime/src/main/java/org/aspectj/lang/JoinPoint.java
index 5d66c7930..5d66c7930 100644
--- a/runtime/src/org/aspectj/lang/JoinPoint.java
+++ b/runtime/src/main/java/org/aspectj/lang/JoinPoint.java
diff --git a/runtime/src/org/aspectj/lang/NoAspectBoundException.java b/runtime/src/main/java/org/aspectj/lang/NoAspectBoundException.java
index 286e4c1f1..286e4c1f1 100644
--- a/runtime/src/org/aspectj/lang/NoAspectBoundException.java
+++ b/runtime/src/main/java/org/aspectj/lang/NoAspectBoundException.java
diff --git a/runtime/src/org/aspectj/lang/ProceedingJoinPoint.java b/runtime/src/main/java/org/aspectj/lang/ProceedingJoinPoint.java
index 5bbc2df85..5bbc2df85 100644
--- a/runtime/src/org/aspectj/lang/ProceedingJoinPoint.java
+++ b/runtime/src/main/java/org/aspectj/lang/ProceedingJoinPoint.java
diff --git a/runtime/src/org/aspectj/lang/Signature.java b/runtime/src/main/java/org/aspectj/lang/Signature.java
index 5bc008433..5bc008433 100644
--- a/runtime/src/org/aspectj/lang/Signature.java
+++ b/runtime/src/main/java/org/aspectj/lang/Signature.java
diff --git a/runtime/src/org/aspectj/lang/SoftException.java b/runtime/src/main/java/org/aspectj/lang/SoftException.java
index ea75ebac4..ea75ebac4 100644
--- a/runtime/src/org/aspectj/lang/SoftException.java
+++ b/runtime/src/main/java/org/aspectj/lang/SoftException.java
diff --git a/runtime/src/org/aspectj/lang/package.html b/runtime/src/main/java/org/aspectj/lang/package.html
index a5fe7ae5d..a5fe7ae5d 100644
--- a/runtime/src/org/aspectj/lang/package.html
+++ b/runtime/src/main/java/org/aspectj/lang/package.html
diff --git a/runtime/src/org/aspectj/lang/reflect/AdviceSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/AdviceSignature.java
index c01f75019..c01f75019 100644
--- a/runtime/src/org/aspectj/lang/reflect/AdviceSignature.java
+++ b/runtime/src/main/java/org/aspectj/lang/reflect/AdviceSignature.java
diff --git a/runtime/src/org/aspectj/lang/reflect/CatchClauseSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/CatchClauseSignature.java
index 9a008994d..9a008994d 100644
--- a/runtime/src/org/aspectj/lang/reflect/CatchClauseSignature.java
+++ b/runtime/src/main/java/org/aspectj/lang/reflect/CatchClauseSignature.java
diff --git a/runtime/src/org/aspectj/lang/reflect/CodeSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/CodeSignature.java
index 1c6ba45e3..1c6ba45e3 100644
--- a/runtime/src/org/aspectj/lang/reflect/CodeSignature.java
+++ b/runtime/src/main/java/org/aspectj/lang/reflect/CodeSignature.java
diff --git a/runtime/src/org/aspectj/lang/reflect/ConstructorSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/ConstructorSignature.java
index 268a759a2..268a759a2 100644
--- a/runtime/src/org/aspectj/lang/reflect/ConstructorSignature.java
+++ b/runtime/src/main/java/org/aspectj/lang/reflect/ConstructorSignature.java
diff --git a/runtime/src/org/aspectj/lang/reflect/FieldSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/FieldSignature.java
index df1c57656..df1c57656 100644
--- a/runtime/src/org/aspectj/lang/reflect/FieldSignature.java
+++ b/runtime/src/main/java/org/aspectj/lang/reflect/FieldSignature.java
diff --git a/runtime/src/org/aspectj/lang/reflect/InitializerSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/InitializerSignature.java
index bbef8b6fa..bbef8b6fa 100644
--- a/runtime/src/org/aspectj/lang/reflect/InitializerSignature.java
+++ b/runtime/src/main/java/org/aspectj/lang/reflect/InitializerSignature.java
diff --git a/runtime/src/org/aspectj/lang/reflect/LockSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/LockSignature.java
index 5a52b3041..5a52b3041 100644
--- a/runtime/src/org/aspectj/lang/reflect/LockSignature.java
+++ b/runtime/src/main/java/org/aspectj/lang/reflect/LockSignature.java
diff --git a/runtime/src/org/aspectj/lang/reflect/MemberSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/MemberSignature.java
index cbc448e1b..cbc448e1b 100644
--- a/runtime/src/org/aspectj/lang/reflect/MemberSignature.java
+++ b/runtime/src/main/java/org/aspectj/lang/reflect/MemberSignature.java
diff --git a/runtime/src/org/aspectj/lang/reflect/MethodSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/MethodSignature.java
index d660e1eb1..d660e1eb1 100644
--- a/runtime/src/org/aspectj/lang/reflect/MethodSignature.java
+++ b/runtime/src/main/java/org/aspectj/lang/reflect/MethodSignature.java
diff --git a/runtime/src/org/aspectj/lang/reflect/SourceLocation.java b/runtime/src/main/java/org/aspectj/lang/reflect/SourceLocation.java
index 52f1dd7a6..52f1dd7a6 100644
--- a/runtime/src/org/aspectj/lang/reflect/SourceLocation.java
+++ b/runtime/src/main/java/org/aspectj/lang/reflect/SourceLocation.java
diff --git a/runtime/src/org/aspectj/lang/reflect/UnlockSignature.java b/runtime/src/main/java/org/aspectj/lang/reflect/UnlockSignature.java
index 3e117ce18..3e117ce18 100644
--- a/runtime/src/org/aspectj/lang/reflect/UnlockSignature.java
+++ b/runtime/src/main/java/org/aspectj/lang/reflect/UnlockSignature.java
diff --git a/runtime/src/org/aspectj/lang/reflect/package.html b/runtime/src/main/java/org/aspectj/lang/reflect/package.html
index fc51a5b60..fc51a5b60 100644
--- a/runtime/src/org/aspectj/lang/reflect/package.html
+++ b/runtime/src/main/java/org/aspectj/lang/reflect/package.html
diff --git a/runtime/src/org/aspectj/runtime/CFlow.java b/runtime/src/main/java/org/aspectj/runtime/CFlow.java
index d607b4822..d607b4822 100644
--- a/runtime/src/org/aspectj/runtime/CFlow.java
+++ b/runtime/src/main/java/org/aspectj/runtime/CFlow.java
diff --git a/runtime/src/org/aspectj/runtime/internal/AroundClosure.java b/runtime/src/main/java/org/aspectj/runtime/internal/AroundClosure.java
index 91f7f923c..91f7f923c 100644
--- a/runtime/src/org/aspectj/runtime/internal/AroundClosure.java
+++ b/runtime/src/main/java/org/aspectj/runtime/internal/AroundClosure.java
diff --git a/runtime/src/org/aspectj/runtime/internal/CFlowCounter.java b/runtime/src/main/java/org/aspectj/runtime/internal/CFlowCounter.java
index 633458195..633458195 100644
--- a/runtime/src/org/aspectj/runtime/internal/CFlowCounter.java
+++ b/runtime/src/main/java/org/aspectj/runtime/internal/CFlowCounter.java
diff --git a/runtime/src/org/aspectj/runtime/internal/CFlowPlusState.java b/runtime/src/main/java/org/aspectj/runtime/internal/CFlowPlusState.java
index b78864a33..b78864a33 100644
--- a/runtime/src/org/aspectj/runtime/internal/CFlowPlusState.java
+++ b/runtime/src/main/java/org/aspectj/runtime/internal/CFlowPlusState.java
diff --git a/runtime/src/org/aspectj/runtime/internal/CFlowStack.java b/runtime/src/main/java/org/aspectj/runtime/internal/CFlowStack.java
index 48308f145..48308f145 100644
--- a/runtime/src/org/aspectj/runtime/internal/CFlowStack.java
+++ b/runtime/src/main/java/org/aspectj/runtime/internal/CFlowStack.java
diff --git a/runtime/src/org/aspectj/runtime/internal/Conversions.java b/runtime/src/main/java/org/aspectj/runtime/internal/Conversions.java
index f74e8d919..f74e8d919 100644
--- a/runtime/src/org/aspectj/runtime/internal/Conversions.java
+++ b/runtime/src/main/java/org/aspectj/runtime/internal/Conversions.java
diff --git a/runtime/src/org/aspectj/runtime/internal/PerObjectMap.java b/runtime/src/main/java/org/aspectj/runtime/internal/PerObjectMap.java
index 319740572..319740572 100644
--- a/runtime/src/org/aspectj/runtime/internal/PerObjectMap.java
+++ b/runtime/src/main/java/org/aspectj/runtime/internal/PerObjectMap.java
diff --git a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadCounter.java b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadCounter.java
index 1fa064cee..1fa064cee 100644
--- a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadCounter.java
+++ b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadCounter.java
diff --git a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadCounterImpl11.java b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadCounterImpl11.java
index 71aaacd62..71aaacd62 100644
--- a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadCounterImpl11.java
+++ b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadCounterImpl11.java
diff --git a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStack.java b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStack.java
index 7290163d2..7290163d2 100644
--- a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStack.java
+++ b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStack.java
diff --git a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStackFactory.java b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactory.java
index 38ba0ccbd..38ba0ccbd 100644
--- a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStackFactory.java
+++ b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactory.java
diff --git a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl.java b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl.java
index 2437f06b0..2437f06b0 100644
--- a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl.java
diff --git a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl11.java b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl11.java
index 21c246193..21c246193 100644
--- a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl11.java
+++ b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackFactoryImpl11.java
diff --git a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStackImpl11.java b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackImpl11.java
index 51f09cadd..51f09cadd 100644
--- a/runtime/src/org/aspectj/runtime/internal/cflowstack/ThreadStackImpl11.java
+++ b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadStackImpl11.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/AdviceSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/AdviceSignatureImpl.java
index 0022c03ba..0022c03ba 100644
--- a/runtime/src/org/aspectj/runtime/reflect/AdviceSignatureImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/AdviceSignatureImpl.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/CatchClauseSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/CatchClauseSignatureImpl.java
index 6f049a66b..6f049a66b 100644
--- a/runtime/src/org/aspectj/runtime/reflect/CatchClauseSignatureImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/CatchClauseSignatureImpl.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/CodeSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/CodeSignatureImpl.java
index 74fc462d6..74fc462d6 100644
--- a/runtime/src/org/aspectj/runtime/reflect/CodeSignatureImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/CodeSignatureImpl.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/ConstructorSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/ConstructorSignatureImpl.java
index a7f688d58..a7f688d58 100644
--- a/runtime/src/org/aspectj/runtime/reflect/ConstructorSignatureImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/ConstructorSignatureImpl.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/Factory.java b/runtime/src/main/java/org/aspectj/runtime/reflect/Factory.java
index 759a1367b..759a1367b 100644
--- a/runtime/src/org/aspectj/runtime/reflect/Factory.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/Factory.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/FieldSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/FieldSignatureImpl.java
index 8c3de24c4..8c3de24c4 100644
--- a/runtime/src/org/aspectj/runtime/reflect/FieldSignatureImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/FieldSignatureImpl.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/InitializerSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/InitializerSignatureImpl.java
index adb8f840e..adb8f840e 100644
--- a/runtime/src/org/aspectj/runtime/reflect/InitializerSignatureImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/InitializerSignatureImpl.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/JoinPointImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/JoinPointImpl.java
index 69bff1e3c..69bff1e3c 100644
--- a/runtime/src/org/aspectj/runtime/reflect/JoinPointImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/JoinPointImpl.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/LockSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/LockSignatureImpl.java
index 2448868d0..2448868d0 100644
--- a/runtime/src/org/aspectj/runtime/reflect/LockSignatureImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/LockSignatureImpl.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/MemberSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/MemberSignatureImpl.java
index a7cd77a5f..a7cd77a5f 100644
--- a/runtime/src/org/aspectj/runtime/reflect/MemberSignatureImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/MemberSignatureImpl.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/MethodSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/MethodSignatureImpl.java
index 17416bada..17416bada 100644
--- a/runtime/src/org/aspectj/runtime/reflect/MethodSignatureImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/MethodSignatureImpl.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/SignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/SignatureImpl.java
index 68079b444..68079b444 100644
--- a/runtime/src/org/aspectj/runtime/reflect/SignatureImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/SignatureImpl.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/SourceLocationImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/SourceLocationImpl.java
index 91fc1c321..91fc1c321 100644
--- a/runtime/src/org/aspectj/runtime/reflect/SourceLocationImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/SourceLocationImpl.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/StringMaker.java b/runtime/src/main/java/org/aspectj/runtime/reflect/StringMaker.java
index 53e3988a9..53e3988a9 100644
--- a/runtime/src/org/aspectj/runtime/reflect/StringMaker.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/StringMaker.java
diff --git a/runtime/src/org/aspectj/runtime/reflect/UnlockSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/UnlockSignatureImpl.java
index d8b377a6f..d8b377a6f 100644
--- a/runtime/src/org/aspectj/runtime/reflect/UnlockSignatureImpl.java
+++ b/runtime/src/main/java/org/aspectj/runtime/reflect/UnlockSignatureImpl.java
diff --git a/runtime/src/test/java/org/aspectj/runtime/RuntimeModuleTest.java b/runtime/src/test/java/org/aspectj/runtime/RuntimeModuleTest.java
new file mode 100644
index 000000000..97e1750d8
--- /dev/null
+++ b/runtime/src/test/java/org/aspectj/runtime/RuntimeModuleTest.java
@@ -0,0 +1,77 @@
+package org.aspectj.runtime;
+/* *******************************************************************
+ * Copyright (c) 1999-2001 Xerox Corporation, 
+ *               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 
+ * which accompanies this distribution and is available at 
+ * http://www.eclipse.org/legal/epl-v10.html 
+ *  
+ * Contributors: 
+ *     Xerox/PARC     initial implementation 
+ * ******************************************************************/
+
+import java.io.*;
+
+import org.aspectj.lang.*;
+import org.aspectj.runtime.reflect.JoinPointImplTest;
+import org.aspectj.runtime.reflect.RuntimePerformanceTest;
+import org.aspectj.runtime.reflect.SignatureTest;
+
+import junit.framework.*;
+
+public class RuntimeModuleTest extends TestCase {
+
+    public RuntimeModuleTest(String name) { super(name); }
+    
+    public void testNoAspectBoundException() {
+        RuntimeException fun = new RuntimeException("fun");
+        NoAspectBoundException nab = new NoAspectBoundException("Foo", fun);
+        assertEquals(fun,nab.getCause());
+    }
+
+    public void testSoftExceptionPrintStackTrace() {
+        // let's see
+//        Throwable t = new Error("xyz");       
+//        new SoftException(t).printStackTrace();
+
+        // save to specified PrintStream
+        ByteArrayOutputStream sink = new ByteArrayOutputStream();
+        PrintStream out = new PrintStream(sink);
+        new SoftException(new Error("xyz")).printStackTrace(out);
+        String s = new String(sink.toByteArray());
+        out.flush();
+        checkSoftExceptionString(s);
+
+        // save to specified PrintWriter
+        sink = new ByteArrayOutputStream();
+        PrintWriter pout = new PrintWriter(sink);
+        new SoftException(new Error("xyz")).printStackTrace(pout);
+        pout.flush();
+        s = new String(sink.toByteArray());
+        checkSoftExceptionString(s);
+
+        // check System.err redirect
+        PrintStream systemErr = System.err;
+        try {
+            sink = new ByteArrayOutputStream();
+            out = new PrintStream(sink);
+            System.setErr(out);
+            new SoftException(new Error("xyz")).printStackTrace();
+            out.flush();
+            s = new String(sink.toByteArray());
+            checkSoftExceptionString(s);
+        } finally {
+            System.setErr(systemErr);
+        }
+    }
+   
+    
+    static void checkSoftExceptionString(String s) {        
+        assertTrue(-1 != s.indexOf("SoftException"));
+        assertTrue(-1 != s.indexOf("Caused by: java.lang.Error"));
+        assertTrue(-1 != s.indexOf("xyz"));
+        assertTrue(-1 != s.indexOf("testSoftExceptionPrintStackTrace"));
+    }
+}  
diff --git a/runtime/src/test/java/org/aspectj/runtime/reflect/JoinPointImplTest.java b/runtime/src/test/java/org/aspectj/runtime/reflect/JoinPointImplTest.java
new file mode 100644
index 000000000..2a17ad998
--- /dev/null
+++ b/runtime/src/test/java/org/aspectj/runtime/reflect/JoinPointImplTest.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * 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.runtime.reflect;
+
+import junit.framework.TestCase;
+
+/**
+ * @author colyer
+ *
+ */
+public class JoinPointImplTest extends TestCase {
+
+	public void testGetArgs() {
+	    String arg1 = "abc";
+	    StringBuffer arg2 = new StringBuffer("def");
+	    Object arg3 = new Object();
+		Object[] args = new Object[] { arg1, arg2, arg3 };
+		JoinPointImpl jpi = new JoinPointImpl(null,null,null,args);
+		
+		Object[] retrievedArgs = jpi.getArgs();
+		assertEquals("First arg unchanged",arg1,retrievedArgs[0]);
+		assertEquals("Second arg unchanged",arg2,retrievedArgs[1]);
+		assertEquals("Third arg unchanged",arg3,retrievedArgs[2]);
+		retrievedArgs[0] = "xyz";
+		((StringBuffer)retrievedArgs[1]).append("ghi");
+		retrievedArgs[2] = "jkl";
+		Object[] afterUpdateArgs = jpi.getArgs();
+		assertEquals("Object reference not changed",arg1,afterUpdateArgs[0]);
+		assertEquals("Object reference unchanged",arg2,afterUpdateArgs[1]);
+		assertEquals("state of referenced object updated","defghi",afterUpdateArgs[1].toString());
+		assertEquals("Object reference not changed",arg3,afterUpdateArgs[2]);
+	}
+	
+}
diff --git a/runtime/src/test/java/org/aspectj/runtime/reflect/RuntimePerformanceTest.java b/runtime/src/test/java/org/aspectj/runtime/reflect/RuntimePerformanceTest.java
new file mode 100644
index 000000000..25959aebc
--- /dev/null
+++ b/runtime/src/test/java/org/aspectj/runtime/reflect/RuntimePerformanceTest.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * 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:
+ *     Matthew Webster - initial implementation
+ *******************************************************************************/
+package org.aspectj.runtime.reflect;
+
+import java.lang.reflect.Method;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import org.aspectj.lang.Signature;
+
+import junit.framework.TestCase;
+
+public class RuntimePerformanceTest extends TestCase {
+
+	private static final Timer timer = new Timer(true);
+	private static final long TIMEOUT = 10000;
+	private static final long ITERATIONS = 1000000;
+	private static final long WARMUP_ITERATIONS = 10000;
+	private static final long EXPECTED_RATIO = 8;
+	private static final Factory factory = new Factory("RutimePerformanceTest.java",RuntimePerformanceTest.class);
+
+	private boolean savedUseCaches;
+	private Method method;
+	private Signature signature;
+
+	private TimerTask task;
+	private boolean abort;
+
+	public RuntimePerformanceTest(String name) {
+		super(name);
+	}
+
+	protected void setUp() throws Exception {
+		super.setUp();
+		
+		/* Save default state */
+		savedUseCaches = SignatureImpl.getUseCache();
+		
+		/* If a test takes too long we can kill it and fail */
+		abort = false;
+		task = new TimerTask() {
+			public void run () {
+				abort = true;	
+			}
+		};
+		timer.schedule(task,TIMEOUT);
+	}
+	
+	protected void tearDown() throws Exception {
+		super.tearDown();
+		
+		/* Restore default state */
+		SignatureImpl.setUseCache(savedUseCaches);
+
+		task.cancel();
+	}
+
+	public void testToString () {
+		Signature signature = makeMethodSig("test");
+
+		SignatureImpl.setUseCache(false);
+		warmUp(signature);
+		long noCache = invokeSignatureToString(signature,ITERATIONS/EXPECTED_RATIO);
+		System.out.println("noCache=" + noCache);
+
+		SignatureImpl.setUseCache(true);
+		warmUp(signature);
+		long cache = invokeSignatureToString(signature,ITERATIONS);
+		System.out.println("cache=" + cache);
+
+		long ratio = (EXPECTED_RATIO*noCache/cache);
+		System.out.println("ratio=" + ratio);
+		assertTrue("Using cache should be " + EXPECTED_RATIO + " times faster: " + ratio,(ratio >= EXPECTED_RATIO));
+	}
+	
+	private long invokeSignatureToString (Signature sig, long iterations) {
+		long start = System.currentTimeMillis();
+		String s;
+
+		for (long l = 0; !abort && (l < iterations); l++) {
+			s = sig.toShortString();
+			s = sig.toString();
+			s = sig.toLongString();
+		}
+		if (abort) throw new RuntimeException("invokeSignatureToString aborted after " + (TIMEOUT/1000) + " seconds");
+
+		long finish = System.currentTimeMillis();
+		return (finish-start);		
+	}
+	
+	private void warmUp (Signature sig) {
+		invokeSignatureToString(sig,WARMUP_ITERATIONS);	 
+	}
+	
+	private Signature makeMethodSig (String methodName) {
+		Class clazz = getClass();
+		Class[] parameterTypes = new Class[] { String.class };
+		String[] parameterNames = new String[] { "s" };
+		Class[] exceptionTypes = new Class[] {};
+		Class returnType = Void.TYPE;
+		return factory.makeMethodSig(1,methodName,clazz,parameterTypes,parameterNames,exceptionTypes,returnType);
+	}
+}
\ No newline at end of file
diff --git a/runtime/src/test/java/org/aspectj/runtime/reflect/SignatureTest.java b/runtime/src/test/java/org/aspectj/runtime/reflect/SignatureTest.java
new file mode 100644
index 000000000..7a66a5b39
--- /dev/null
+++ b/runtime/src/test/java/org/aspectj/runtime/reflect/SignatureTest.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * 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.runtime.reflect;
+
+import java.lang.ref.Reference;
+import java.lang.reflect.Field;
+
+import junit.framework.TestCase;
+
+/**
+ */
+public class SignatureTest extends TestCase {
+	public void testGetDeclaringTypeName() {
+		FieldSignatureImpl fsi = new FieldSignatureImpl(0,"x",SignatureTest.class,String.class);
+		assertEquals(SignatureTest.class.getName(),fsi.getDeclaringTypeName());
+		assertSame(fsi.getDeclaringTypeName(),fsi.getDeclaringTypeName()); // should be cached.
+	}
+	
+	public void testToShortMiddleLongString () {
+		MethodSignatureImpl msi = new MethodSignatureImpl(0,"test",SignatureTest.class,new Class[] { String.class, Integer.TYPE }, new String[] { "s", "i" }, new Class[] {}, Runnable.class);
+		String shortString = msi.toShortString();
+		assertSame(shortString,msi.toShortString()); // should be cached.
+		String middleString = msi.toString();
+		assertSame(middleString,msi.toString()); // should be cached.
+		String longString = msi.toLongString();
+		assertSame(longString,msi.toLongString()); // should be cached.
+		assertTrue("String representations should be different",!(shortString.equals(middleString) || middleString.equals(longString) || longString.equals(shortString)));
+	}
+	
+	public void testClearCache() throws Exception {
+		MethodSignatureImpl msi = new MethodSignatureImpl(0,"test",SignatureTest.class,new Class[] { String.class, Integer.TYPE }, new String[] { "s", "i" }, new Class[] {}, Runnable.class);
+		String shortString = msi.toShortString();
+		assertSame(shortString,msi.toShortString());
+		
+		Field field = SignatureImpl.class.getDeclaredField("stringCache");
+		field.setAccessible(true);
+		Object res = field.get(msi);
+		
+		field = res.getClass().getDeclaredField("toStringCacheRef");
+		field.setAccessible(true);
+		Reference ref = (Reference)field.get(res);
+		
+		ref.clear();
+		assertEquals(shortString,msi.toShortString());
+		
+		String longString = msi.toLongString();
+		assertSame(longString,msi.toLongString()); // should be cached.		
+	}
+}