diff --git a/build.xml b/build.xml
index 50da29d2..71be1304 100644
--- a/build.xml
+++ b/build.xml
@@ -46,7 +46,6 @@
-
@@ -113,15 +112,33 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ basedir="${deploy.dir}/classes">
+
+
diff --git a/tests/lib/test-al.jar b/lib/test/test-al.jar
similarity index 100%
rename from tests/lib/test-al.jar
rename to lib/test/test-al.jar
diff --git a/tests/lib/test-ar.jar b/lib/test/test-ar.jar
similarity index 100%
rename from tests/lib/test-ar.jar
rename to lib/test/test-ar.jar
diff --git a/tests/lib/test-br.jar b/lib/test/test-br.jar
similarity index 100%
rename from tests/lib/test-br.jar
rename to lib/test/test-br.jar
diff --git a/tests/lib/test-c.jar b/lib/test/test-c.jar
similarity index 100%
rename from tests/lib/test-c.jar
rename to lib/test/test-c.jar
diff --git a/tests/lib/test.jar b/lib/test/test.jar
similarity index 100%
rename from tests/lib/test.jar
rename to lib/test/test.jar
diff --git a/src/java/com/samskivert/swing/tests/util/ProximityTrackerTest.java b/src/java/com/samskivert/swing/tests/ProximityTrackerTest.java
similarity index 100%
rename from src/java/com/samskivert/swing/tests/util/ProximityTrackerTest.java
rename to src/java/com/samskivert/swing/tests/ProximityTrackerTest.java
diff --git a/src/java/com/samskivert/util/tests/ConfigUtilTest.java b/src/java/com/samskivert/util/tests/ConfigUtilTest.java
index f874f5c2..adebf58c 100644
--- a/src/java/com/samskivert/util/tests/ConfigUtilTest.java
+++ b/src/java/com/samskivert/util/tests/ConfigUtilTest.java
@@ -76,7 +76,7 @@ public class ConfigUtilTest extends TestCase
public void runTest ()
{
try {
- String path = "/rsrc/util/test.properties";
+ String path = "rsrc/util/test.properties";
Properties props = ConfigUtil.loadInheritedProperties(path);
assertTrue("props valid", props.toString().equals(DUMP));
diff --git a/tests/README b/tests/README
deleted file mode 100644
index 0085edf1..00000000
--- a/tests/README
+++ /dev/null
@@ -1,42 +0,0 @@
-samskivert tests
-----------------
-
-This is where all test code for the samskivert library exists. Where
-possible unit tests should be created for all services provided by the
-library. Tests are implemented using JUnit where
-applicable and automatically invoked from ant.
-
-Running the tests
------------------
-
-First build the main library (by invoking ant in the top-level project
-directory) and then the tests can be built and invoked via ant:
-
-% ant test
-
-which will build and then invoke the test code.
-
-Adding new tests
-----------------
-
-Unit tests are implemented using JUnit which means that they should extend
-junit.framework.TestCase and follow the guidelines outlined here
- for creating test cases.
-
-Test classfiles should be named Test.java where is the
-associated class in the samskivert library for which a test is being
-implemented. For example, a test for the
-com.samskivert.servlet.SiteResourceLoader class would be named
-com.samskivert.servlet.SiteResourceLoaderTest.
-
-If multiple test drivers for a single class are desired, they can deviate
-from the prescribed naming scheme but must still end with Test.java so
-that ant will automatically locate and invoke them as part of the build
-process.
-
-Test implementors will want to look at existing tests as a starting point
-and at the test support classes in the com.samskivert.test package (which
-is part of the main samskivert library source tree, not the test source
-tree).
-
-$Id: README,v 1.1 2001/11/05 09:13:25 mdb Exp $
diff --git a/tests/build.xml b/tests/build.xml
deleted file mode 100644
index 55aeac9b..00000000
--- a/tests/build.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-