fixes for 137235 (contributed by Ron): more intelligent logic for determining if a path entry is a jar/zip (don't just rely on suffix, some new .bndl files seem to be becoming popular...)

3 files changed, 79 insertions, 0 deletions

diff --git a/tests/ltw/folder.jar/Aspect1.aj b/tests/ltw/folder.jar/Aspect1.aj
new file mode 100644
index 000000000..173cb8603
--- /dev/null
+++ b/tests/ltw/folder.jar/Aspect1.aj
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html 
+ * 
+ * Contributors:
+ *   Matthew Webster         initial implementation
+ *******************************************************************************/
+import org.aspectj.lang.JoinPoint;
+
+public aspect Aspect1 {
+	
+		before () : execution(void Main.test1()) {
+			System.err.println("Aspect1.before_" + thisJoinPoint.getSignature().getName());
+		}
+}
diff --git a/tests/ltw/folder.jar/Aspect2.aj b/tests/ltw/folder.jar/Aspect2.aj
new file mode 100644
index 000000000..519a47eeb
--- /dev/null
+++ b/tests/ltw/folder.jar/Aspect2.aj
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html 
+ * 
+ * Contributors:
+ *   Matthew Webster	initial implementation
+ *******************************************************************************/
+import org.aspectj.lang.JoinPoint;
+
+public aspect Aspect2 {
+	
+		before () : execution(void Main.test2()){
+			System.err.println("Aspect2.before_" + thisJoinPoint.getSignature().getName());
+		}
+}
diff --git a/tests/ltw/folder.jar/Main.java b/tests/ltw/folder.jar/Main.java
new file mode 100644
index 000000000..9e53bfb4d
--- /dev/null
+++ b/tests/ltw/folder.jar/Main.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html 
+ * 
+ * Contributors:
+ *   Matthew Webster         initial implementation
+ *******************************************************************************/
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+
+public class Main {
+
+	public void test1 () {
+		System.out.println("Main.test1");
+	}
+
+	public void test2 () {
+		System.out.println("Main.test2");
+	}
+
+	public void invokeDeclaredMethods () throws Exception {
+		Method[] methods = getClass().getDeclaredMethods();
+		for (int i = 0; i < methods.length; i++) {
+			Method method = methods[i];
+			int modifiers = method.getModifiers();
+			if (!Modifier.isStatic(modifiers) && !method.getName().equals("invokeDeclaredMethods")) {
+				method.invoke(this,new Object[] {});
+			}
+		}
+	}
+	
+	public static void main (String[] args) throws Exception {
+		System.out.println("Main.main");
+		new Main().test1();
+		new Main().test2();
+	}
+}