fixes for 120363 : from matthew (include/exclude problems for LTW)

3 files changed, 26 insertions, 4 deletions

diff --git a/tests/java5/ataspectj/ataspectj/aop-dumpbeforeandafter.xml b/tests/java5/ataspectj/ataspectj/aop-dumpbeforeandafter.xml
index 487d5dd62..43b749053 100644
--- a/tests/java5/ataspectj/ataspectj/aop-dumpbeforeandafter.xml
+++ b/tests/java5/ataspectj/ataspectj/aop-dumpbeforeandafter.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <aspectj>
-    <weaver options="-verbose">
-        <dump within="ataspectj..*" beforeandafter="true"/> 
-    </weaver>
+    <weaver options="-XlazyTjp -verbose">
+        <dump within="com.foo.bar..*" beforeandafter="true"/> 
+        <include within="com.foo..*"/>
+        <exclude within="com.foo.bar..*CGLIB*"/>
+	</weaver>
 </aspectj>
diff --git a/tests/java5/ataspectj/ataspectj/Test$$EnhancerByCGLIB$$12345.java b/tests/java5/ataspectj/com/foo/bar/Test$$EnhancerByCGLIB$$12345.java
index 78df5f1b1..3640800b6 100644
--- a/tests/java5/ataspectj/ataspectj/Test$$EnhancerByCGLIB$$12345.java
+++ b/tests/java5/ataspectj/com/foo/bar/Test$$EnhancerByCGLIB$$12345.java
@@ -8,12 +8,13 @@
  * Contributors:
  *     Matthew Webster - initial implementation
  *******************************************************************************/
-package ataspectj;
+package com.foo.bar;
 
 public class Test$$EnhancerByCGLIB$$12345 {
 
 	public static void main(String[] args) {
 		System.out.println("Test$$EnhancerByCGLIB$$12345.main()");
+		Test.main(args);
 	}
 
 }
diff --git a/tests/java5/ataspectj/com/foo/bar/Test.java b/tests/java5/ataspectj/com/foo/bar/Test.java
new file mode 100644
index 000000000..a1629a7b4
--- /dev/null
+++ b/tests/java5/ataspectj/com/foo/bar/Test.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 com.foo.bar;
+
+public class Test {
+
+	public static void main(String[] args) {
+		System.out.println("Test.main()");
+	}
+
+}