Andy Clement's patch for enh 46347: "-inpath"

12 files changed, 54 insertions, 0 deletions

diff --git a/ajde/testdata/InpathTest/.cvsignore b/ajde/testdata/InpathTest/.cvsignore
new file mode 100644
index 000000000..39b6b088c
--- /dev/null
+++ b/ajde/testdata/InpathTest/.cvsignore
@@ -0,0 +1,3 @@
+bin
+build.ajsym
+build2.ajsym
diff --git a/ajde/testdata/InpathTest/build.lst b/ajde/testdata/InpathTest/build.lst
new file mode 100644
index 000000000..ec1f031f5
--- /dev/null
+++ b/ajde/testdata/InpathTest/build.lst
@@ -0,0 +1 @@
+src1/Main.java

diff --git a/ajde/testdata/InpathTest/build2.lst b/ajde/testdata/InpathTest/build2.lst
new file mode 100644
index 000000000..263b509b2
--- /dev/null
+++ b/ajde/testdata/InpathTest/build2.lst
@@ -0,0 +1 @@
+src2/Aspect.java

diff --git a/ajde/testdata/InpathTest/indir1/META-INF/MANIFEST.MF b/ajde/testdata/InpathTest/indir1/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..fb5efeb68
--- /dev/null
+++ b/ajde/testdata/InpathTest/indir1/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0

+Created-By: 1.3.1_04 (Sun Microsystems Inc.)

+

diff --git a/ajde/testdata/InpathTest/indir1/META-INF/test.xml b/ajde/testdata/InpathTest/indir1/META-INF/test.xml
new file mode 100644
index 000000000..f9efa1f1f
--- /dev/null
+++ b/ajde/testdata/InpathTest/indir1/META-INF/test.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<jar name="input1.jar">
+</jar>
+
diff --git a/ajde/testdata/InpathTest/indir1/test/TestProperties.class b/ajde/testdata/InpathTest/indir1/test/TestProperties.class
new file mode 100644
index 000000000..a58740c20
--- /dev/null
+++ b/ajde/testdata/InpathTest/indir1/test/TestProperties.class
diff --git a/ajde/testdata/InpathTest/indir1/test/test.props b/ajde/testdata/InpathTest/indir1/test/test.props
new file mode 100644
index 000000000..8462a7ab6
--- /dev/null
+++ b/ajde/testdata/InpathTest/indir1/test/test.props
@@ -0,0 +1 @@
+test=test2
\ No newline at end of file
diff --git a/ajde/testdata/InpathTest/indir2/example/HelloWorld.class b/ajde/testdata/InpathTest/indir2/example/HelloWorld.class
new file mode 100644
index 000000000..e333988e6
--- /dev/null
+++ b/ajde/testdata/InpathTest/indir2/example/HelloWorld.class
diff --git a/ajde/testdata/InpathTest/indir2/example/HelloWorld.java b/ajde/testdata/InpathTest/indir2/example/HelloWorld.java
new file mode 100644
index 000000000..476abc7ee
--- /dev/null
+++ b/ajde/testdata/InpathTest/indir2/example/HelloWorld.java
@@ -0,0 +1,12 @@
+package example;
+
+public class HelloWorld {
+
+  public static void say(String msg) {
+    System.err.println(msg);
+  }
+
+  public static void main(String []argv) {
+    say("hello world");
+  }
+}
diff --git a/ajde/testdata/InpathTest/injar.jar b/ajde/testdata/InpathTest/injar.jar
new file mode 100644
index 000000000..7dcd06f97
--- /dev/null
+++ b/ajde/testdata/InpathTest/injar.jar
diff --git a/ajde/testdata/InpathTest/src1/Main.java b/ajde/testdata/InpathTest/src1/Main.java
new file mode 100644
index 000000000..417fc6809
--- /dev/null
+++ b/ajde/testdata/InpathTest/src1/Main.java
@@ -0,0 +1,22 @@
+import java.io.IOException;
+
+/*
+ * Created on 30-Jul-03
+ *
+ * To change this generated comment go to 
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+
+/**
+ * @author websterm
+ *
+ * To change this generated comment go to 
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+public class Main {
+
+	public static void main(String[] args) throws IOException {
+		String propsName = (args.length > 0)? args[0] : "test.props";
+		new test.TestProperties().load(propsName);
+	}
+}
diff --git a/ajde/testdata/InpathTest/src2/Aspect.java b/ajde/testdata/InpathTest/src2/Aspect.java
new file mode 100644
index 000000000..c70994870
--- /dev/null
+++ b/ajde/testdata/InpathTest/src2/Aspect.java
@@ -0,0 +1,7 @@
+public aspect Aspect {
+  pointcut sayCalls(): call(* say(..));
+
+  before(): sayCalls() {
+    System.err.println("Before say()");
+  }
+}