From 249d7cb199b5c08e7a7a51189a733cc8fef12cf9 Mon Sep 17 00:00:00 2001 From: Bryan Duxbury Date: Thu, 29 Jan 2009 01:21:20 +0000 Subject: [PATCH] THRIFT-166. java: Java tests should be in lib/java/test/ THRIFT-221. java: Make java build classpath more dynamic and configurable This issue moves all the tests from test/java to lib/java/test/src and combines the build files. In addition, rather than continue on with the same busted approach to finding dependent jars for the tests, THRIFT-221 has been implemented, allowing the user to specify a .thrift-build.properties file in their home directory that contains additional classpath entries. As a result of this patch, "make check" does not currently work as it is expected to. This will be resolved in a follow-up commit. git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@738695 13f79535-47bb-0310-9956-ffa450edef68 --- aclocal/ax_java.m4 | 2 +- lib/java/build.xml | 51 +++++++++++++++ {test/java => lib/java/test}/TestClient | 0 .../java/test}/TestNonblockingServer | 0 {test/java => lib/java/test}/TestServer | 0 .../org/apache/thrift/test}/DeepCopyTest.java | 0 .../org/apache/thrift/test}/EqualityTest.java | 0 .../org/apache/thrift/test}/IdentityTest.java | 0 .../apache/thrift/test}/JSONProtoTest.java | 0 .../apache/thrift/test}/JavaBeansTest.java | 0 .../test}/OverloadNonblockingServer.java | 0 .../org/apache/thrift/test}/TestClient.java | 0 .../thrift/test}/TestNonblockingServer.java | 0 .../org/apache/thrift/test}/TestServer.java | 0 .../org/apache/thrift/test}/ToStringTest.java | 0 test/java/build.xml | 64 ------------------- 16 files changed, 52 insertions(+), 65 deletions(-) rename {test/java => lib/java/test}/TestClient (100%) rename {test/java => lib/java/test}/TestNonblockingServer (100%) rename {test/java => lib/java/test}/TestServer (100%) rename {test/java/src => lib/java/test/org/apache/thrift/test}/DeepCopyTest.java (100%) rename {test/java/src => lib/java/test/org/apache/thrift/test}/EqualityTest.java (100%) rename {test/java/src => lib/java/test/org/apache/thrift/test}/IdentityTest.java (100%) rename {test/java/src => lib/java/test/org/apache/thrift/test}/JSONProtoTest.java (100%) rename {test/java/src => lib/java/test/org/apache/thrift/test}/JavaBeansTest.java (100%) rename {test/java/src => lib/java/test/org/apache/thrift/test}/OverloadNonblockingServer.java (100%) rename {test/java/src => lib/java/test/org/apache/thrift/test}/TestClient.java (100%) rename {test/java/src => lib/java/test/org/apache/thrift/test}/TestNonblockingServer.java (100%) rename {test/java/src => lib/java/test/org/apache/thrift/test}/TestServer.java (100%) rename {test/java/src => lib/java/test/org/apache/thrift/test}/ToStringTest.java (100%) delete mode 100644 test/java/build.xml diff --git a/aclocal/ax_java.m4 b/aclocal/ax_java.m4 index 70ec2c34..abff8c6c 100644 --- a/aclocal/ax_java.m4 +++ b/aclocal/ax_java.m4 @@ -32,7 +32,7 @@ dnl TODO: allow to exclude compilers (rationale: most Java programs cannot compi dnl with some compilers like guavac). AC_DEFUN([AX_PROG_JAVAC],[ -test -z "$JAVAC" && AC_CHECK_PROGS(JAVAC, "gcj -C" guavac jikes javac) +test -z "$JAVAC" && AC_CHECK_PROGS(JAVAC, "gcj -C" guavac javac) test -z "$JAVAC" && AC_MSG_ERROR([no acceptable Java compiler found in \$PATH]) AX_PROG_JAVAC_WORKS ]) diff --git a/lib/java/build.xml b/lib/java/build.xml index 6f9d0b09..1215de12 100644 --- a/lib/java/build.xml +++ b/lib/java/build.xml @@ -2,13 +2,25 @@ Thrift Build File + + + + + + + + + + + + @@ -27,7 +39,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/java/TestClient b/lib/java/test/TestClient similarity index 100% rename from test/java/TestClient rename to lib/java/test/TestClient diff --git a/test/java/TestNonblockingServer b/lib/java/test/TestNonblockingServer similarity index 100% rename from test/java/TestNonblockingServer rename to lib/java/test/TestNonblockingServer diff --git a/test/java/TestServer b/lib/java/test/TestServer similarity index 100% rename from test/java/TestServer rename to lib/java/test/TestServer diff --git a/test/java/src/DeepCopyTest.java b/lib/java/test/org/apache/thrift/test/DeepCopyTest.java similarity index 100% rename from test/java/src/DeepCopyTest.java rename to lib/java/test/org/apache/thrift/test/DeepCopyTest.java diff --git a/test/java/src/EqualityTest.java b/lib/java/test/org/apache/thrift/test/EqualityTest.java similarity index 100% rename from test/java/src/EqualityTest.java rename to lib/java/test/org/apache/thrift/test/EqualityTest.java diff --git a/test/java/src/IdentityTest.java b/lib/java/test/org/apache/thrift/test/IdentityTest.java similarity index 100% rename from test/java/src/IdentityTest.java rename to lib/java/test/org/apache/thrift/test/IdentityTest.java diff --git a/test/java/src/JSONProtoTest.java b/lib/java/test/org/apache/thrift/test/JSONProtoTest.java similarity index 100% rename from test/java/src/JSONProtoTest.java rename to lib/java/test/org/apache/thrift/test/JSONProtoTest.java diff --git a/test/java/src/JavaBeansTest.java b/lib/java/test/org/apache/thrift/test/JavaBeansTest.java similarity index 100% rename from test/java/src/JavaBeansTest.java rename to lib/java/test/org/apache/thrift/test/JavaBeansTest.java diff --git a/test/java/src/OverloadNonblockingServer.java b/lib/java/test/org/apache/thrift/test/OverloadNonblockingServer.java similarity index 100% rename from test/java/src/OverloadNonblockingServer.java rename to lib/java/test/org/apache/thrift/test/OverloadNonblockingServer.java diff --git a/test/java/src/TestClient.java b/lib/java/test/org/apache/thrift/test/TestClient.java similarity index 100% rename from test/java/src/TestClient.java rename to lib/java/test/org/apache/thrift/test/TestClient.java diff --git a/test/java/src/TestNonblockingServer.java b/lib/java/test/org/apache/thrift/test/TestNonblockingServer.java similarity index 100% rename from test/java/src/TestNonblockingServer.java rename to lib/java/test/org/apache/thrift/test/TestNonblockingServer.java diff --git a/test/java/src/TestServer.java b/lib/java/test/org/apache/thrift/test/TestServer.java similarity index 100% rename from test/java/src/TestServer.java rename to lib/java/test/org/apache/thrift/test/TestServer.java diff --git a/test/java/src/ToStringTest.java b/lib/java/test/org/apache/thrift/test/ToStringTest.java similarity index 100% rename from test/java/src/ToStringTest.java rename to lib/java/test/org/apache/thrift/test/ToStringTest.java diff --git a/test/java/build.xml b/test/java/build.xml deleted file mode 100644 index b779663a..00000000 --- a/test/java/build.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - Thrift Test Build File - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- 2.17.1