From 0c8c0a3d21365eade6f53a0484bba71f24637a65 Mon Sep 17 00:00:00 2001 From: aclement Date: Fri, 9 Dec 2005 10:52:15 +0000 Subject: Some updates for 118754. The various places that were checking for 'MISSING' now call 'isMissing' if they can. I think this negates some work Adrian did with introducing MissingWithKnownSignature - but we have to make this change for LTW to work properly. Someone with a bit of time on their hands should go through all the places isMissing() is now called and see if the check should be 'isReallyMissing()' which would allow the MissingWithKnownSignature to get through. I will raise an enhancement to cover this. --- tests/java5/ataspectj/ajc-ant.xml | 8 +++++++ .../ataspectj/Test$$EnhancerByCGLIB$$12345.java | 19 ++++++++++++++++ tests/java5/ataspectj/ataspectj/TestInterface.java | 16 +++++++++++++ .../ataspectj/ataspectj/TestProxyGenerator.java | 26 ++++++++++++++++++++++ .../ataspectj/ataspectj/aop-dumpbeforeandafter.xml | 4 ++-- .../java5/ataspectj/ataspectj/aop-dumpclosure.xml | 5 ++++- tests/java5/ataspectj/ataspectj/aop-dumpproxy.xml | 9 ++++++++ 7 files changed, 84 insertions(+), 3 deletions(-) create mode 100644 tests/java5/ataspectj/ataspectj/Test$$EnhancerByCGLIB$$12345.java create mode 100644 tests/java5/ataspectj/ataspectj/TestInterface.java create mode 100644 tests/java5/ataspectj/ataspectj/TestProxyGenerator.java create mode 100644 tests/java5/ataspectj/ataspectj/aop-dumpproxy.xml (limited to 'tests/java5') diff --git a/tests/java5/ataspectj/ajc-ant.xml b/tests/java5/ataspectj/ajc-ant.xml index 5c4495be4..695e8ac07 100644 --- a/tests/java5/ataspectj/ajc-ant.xml +++ b/tests/java5/ataspectj/ajc-ant.xml @@ -60,6 +60,14 @@ + + + + + + + + diff --git a/tests/java5/ataspectj/ataspectj/Test$$EnhancerByCGLIB$$12345.java b/tests/java5/ataspectj/ataspectj/Test$$EnhancerByCGLIB$$12345.java new file mode 100644 index 000000000..78df5f1b1 --- /dev/null +++ b/tests/java5/ataspectj/ataspectj/Test$$EnhancerByCGLIB$$12345.java @@ -0,0 +1,19 @@ +/******************************************************************************* + * Copyright (c) 2005 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Common Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/cpl-v10.html + * + * Contributors: + * Matthew Webster - initial implementation + *******************************************************************************/ +package ataspectj; + +public class Test$$EnhancerByCGLIB$$12345 { + + public static void main(String[] args) { + System.out.println("Test$$EnhancerByCGLIB$$12345.main()"); + } + +} diff --git a/tests/java5/ataspectj/ataspectj/TestInterface.java b/tests/java5/ataspectj/ataspectj/TestInterface.java new file mode 100644 index 000000000..beac1461b --- /dev/null +++ b/tests/java5/ataspectj/ataspectj/TestInterface.java @@ -0,0 +1,16 @@ +/******************************************************************************* + * Copyright (c) 2005 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Common Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/cpl-v10.html + * + * Contributors: + * Matthew Webster - initial implementation + *******************************************************************************/ +package ataspectj; + +public interface TestInterface { + + public void testMethod (); +} diff --git a/tests/java5/ataspectj/ataspectj/TestProxyGenerator.java b/tests/java5/ataspectj/ataspectj/TestProxyGenerator.java new file mode 100644 index 000000000..1dc0e9aac --- /dev/null +++ b/tests/java5/ataspectj/ataspectj/TestProxyGenerator.java @@ -0,0 +1,26 @@ +/******************************************************************************* + * Copyright (c) 2005 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Common Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/cpl-v10.html + * + * Contributors: + * Matthew Webster - initial implementation + *******************************************************************************/ +package ataspectj; + +import java.lang.reflect.Proxy; + +public class TestProxyGenerator implements TestInterface { + + public void testMethod() { + } + + public static void main(String[] args) { + Class clazz = TestProxyGenerator.class; + Class proxyClazz = Proxy.getProxyClass(clazz.getClassLoader(),new Class[] { TestInterface.class}); + System.out.println("TestProxyGenerator.main() proxyClazz=" + proxyClazz + ", proxyClassLoader=" + proxyClazz.getClassLoader()); + } + +} diff --git a/tests/java5/ataspectj/ataspectj/aop-dumpbeforeandafter.xml b/tests/java5/ataspectj/ataspectj/aop-dumpbeforeandafter.xml index c2824e2be..487d5dd62 100644 --- a/tests/java5/ataspectj/ataspectj/aop-dumpbeforeandafter.xml +++ b/tests/java5/ataspectj/ataspectj/aop-dumpbeforeandafter.xml @@ -1,6 +1,6 @@ - - + + diff --git a/tests/java5/ataspectj/ataspectj/aop-dumpclosure.xml b/tests/java5/ataspectj/ataspectj/aop-dumpclosure.xml index d73c1c23b..fdee559eb 100644 --- a/tests/java5/ataspectj/ataspectj/aop-dumpclosure.xml +++ b/tests/java5/ataspectj/ataspectj/aop-dumpclosure.xml @@ -4,6 +4,9 @@ - + + diff --git a/tests/java5/ataspectj/ataspectj/aop-dumpproxy.xml b/tests/java5/ataspectj/ataspectj/aop-dumpproxy.xml new file mode 100644 index 000000000..1a76c0152 --- /dev/null +++ b/tests/java5/ataspectj/ataspectj/aop-dumpproxy.xml @@ -0,0 +1,9 @@ + + + + + + + -- cgit v1.2.3