7 files changed, 94 insertions, 1 deletions
diff --git a/loadtime5/build.xml b/loadtime5/build.xml
index 97a1e2d99..41c07c1f1 100644
--- a/loadtime5/build.xml
+++ b/loadtime5/build.xml
@@ -28,7 +28,7 @@
         <!-- FIXME: we override compile due to use of 1.5 -->
         <mkdir dir="${basedir}/bin"/>
         <javac debug="on" destdir="${basedir}/bin" source="1.5" target="1.5">
-            <src path="${basedir}/src"/>
+            <src path="${basedir}/java5-src"/>
             <classpath refid="loadtime5.src.path"/>
         </javac>
     </target>
diff --git a/loadtime5/src/org/aspectj/weaver/loadtime/Agent.java b/loadtime5/java5-src/org/aspectj/weaver/loadtime/Agent.java
index bb3489841..bb3489841 100644
--- a/loadtime5/src/org/aspectj/weaver/loadtime/Agent.java
+++ b/loadtime5/java5-src/org/aspectj/weaver/loadtime/Agent.java
diff --git a/loadtime5/src/org/aspectj/weaver/loadtime/ClassPreProcessorAgentAdapter.java b/loadtime5/java5-src/org/aspectj/weaver/loadtime/ClassPreProcessorAgentAdapter.java
index 9e81bd13d..9e81bd13d 100644
--- a/loadtime5/src/org/aspectj/weaver/loadtime/ClassPreProcessorAgentAdapter.java
+++ b/loadtime5/java5-src/org/aspectj/weaver/loadtime/ClassPreProcessorAgentAdapter.java
diff --git a/loadtime5/java5-testsrc/Loadtime515ModuleTests.java b/loadtime5/java5-testsrc/Loadtime515ModuleTests.java
new file mode 100644
index 000000000..91d3aece8
--- /dev/null
+++ b/loadtime5/java5-testsrc/Loadtime515ModuleTests.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * 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: (See CVS logs)
+ * 
+ *******************************************************************************/
+
+import org.aspectj.weaver.loadtime.LoadtimeTests;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ */
+public class Loadtime515ModuleTests extends TestCase {
+
+    public static Test suite() {
+        TestSuite suite = new TestSuite(Loadtime515ModuleTests.class.getName());
+        suite.addTestSuite(LoadtimeTests.class);
+        return suite;
+    }
+
+}
diff --git a/loadtime5/java5-testsrc/org/aspectj/weaver/loadtime/LoadtimeTests.java b/loadtime5/java5-testsrc/org/aspectj/weaver/loadtime/LoadtimeTests.java
new file mode 100644
index 000000000..f777b7ff5
--- /dev/null
+++ b/loadtime5/java5-testsrc/org/aspectj/weaver/loadtime/LoadtimeTests.java
@@ -0,0 +1,26 @@
+/* *******************************************************************
+ * 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: 
+ *     Wes Isberg       initial implementation 
+ * ******************************************************************/
+
+
+package org.aspectj.weaver.loadtime;
+
+import java.lang.instrument.Instrumentation;
+
+import junit.framework.TestCase;
+
+public class LoadtimeTests extends TestCase {
+
+    public void testPremain() throws Exception {            
+        Class[] parmTypes = {String.class, Instrumentation.class };
+        assertNotNull(Agent.class.getMethod("premain", parmTypes));
+    }
+}
diff --git a/loadtime5/newbuild.xml b/loadtime5/newbuild.xml
new file mode 100644
index 000000000..a2a3e6243
--- /dev/null
+++ b/loadtime5/newbuild.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!-- see ../build/*.html for explanation -->
+<project name="loadtime5" default="test" basedir=".">
+    <import file="${basedir}/../build/build.xml"/>  
+</project>
+
diff --git a/loadtime5/testsrc/Loadtime5ModuleTests.java b/loadtime5/testsrc/Loadtime5ModuleTests.java
new file mode 100644
index 000000000..231c80df6
--- /dev/null
+++ b/loadtime5/testsrc/Loadtime5ModuleTests.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * 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: (See CVS logs)
+ * 
+ *******************************************************************************/
+
+import org.aspectj.testing.util.TestUtil;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ */
+public class Loadtime5ModuleTests extends TestCase {
+
+    public static Test suite() {
+        TestSuite suite = new TestSuite(Loadtime5ModuleTests.class.getName());
+        TestUtil.loadTestsReflectively(suite, "Loadtime515ModuleTests", true);
+        return suite;
+    }
+    public static void main(String[] args) {
+        junit.textui.TestRunner.main(new String[] {Loadtime5ModuleTests.class.getName()});
+    }
+
+}