From f33f3955eee379b29fda02dac1d30ba628669d67 Mon Sep 17 00:00:00 2001
From: Adam Retter <adam.retter@googlemail.com>
Date: Sat, 31 Jan 2015 23:43:01 +0000
Subject: [PATCH] Moved Java Samples main classes into samples/src/main/java

---
 java/Makefile                                     | 15 +++++++++++----
 .../src/main/java}/RocksDBColumnFamilySample.java |  0
 .../src/main/java}/RocksDBSample.java             |  0
 3 files changed, 11 insertions(+), 4 deletions(-)
 rename java/{ => samples/src/main/java}/RocksDBColumnFamilySample.java (100%)
 rename java/{ => samples/src/main/java}/RocksDBSample.java (100%)

diff --git a/java/Makefile b/java/Makefile
index a1434d494..a07afb20a 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -103,6 +103,10 @@ BENCHMARK_MAIN_SRC = benchmark/src/main/java
 BENCHMARK_OUTPUT = benchmark/target
 BENCHMARK_MAIN_CLASSES = $(BENCHMARK_OUTPUT)/classes
 
+SAMPLES_MAIN_SRC = samples/src/main/java
+SAMPLES_OUTPUT = samples/target
+SAMPLES_MAIN_CLASSES = $(SAMPLES_OUTPUT)/classes
+
 JAVA_TEST_LIBDIR = test-libs
 JAVA_JUNIT_JAR = $(JAVA_TEST_LIBDIR)/junit-4.12.jar
 JAVA_HAMCR_JAR = $(JAVA_TEST_LIBDIR)/hamcrest-core-1.3.jar
@@ -116,6 +120,7 @@ clean:
 	rm -rf test-libs/
 	rm -rf $(OUTPUT)
 	rm -rf $(BENCHMARK_OUTPUT)
+	rm -rf $(SAMPLES_OUTPUT)
 
 
 javadocs:
@@ -134,17 +139,19 @@ java:
 	javah -cp $(MAIN_CLASSES) -d $(NATIVE_INCLUDE) -jni $(NATIVE_JAVA_CLASSES)
 
 sample: java
-	javac -cp $(ROCKSDB_JAR) RocksDBSample.java
+	mkdir -p $(SAMPLES_MAIN_CLASSES)
+	javac -cp $(MAIN_CLASSES) -d $(SAMPLES_MAIN_CLASSES) $(SAMPLES_MAIN_SRC)/RocksDBSample.java
 	@rm -rf /tmp/rocksdbjni
 	@rm -rf /tmp/rocksdbjni_not_found
-	java -ea -Djava.library.path=.:../ -cp ".:./*" -Xcheck:jni RocksDBSample /tmp/rocksdbjni
+	java -ea -Xcheck:jni -Djava.library.path=target -cp $(MAIN_CLASSES):$(SAMPLES_MAIN_CLASSES) RocksDBSample /tmp/rocksdbjni
 	@rm -rf /tmp/rocksdbjni
 	@rm -rf /tmp/rocksdbjni_not_found
 
 column_family_sample: java
-	javac -cp $(ROCKSDB_JAR) RocksDBColumnFamilySample.java
+	mkdir -p $(SAMPLES_MAIN_CLASSES)
+	javac -cp $(MAIN_CLASSES) -d $(SAMPLES_MAIN_CLASSES) $(SAMPLES_MAIN_SRC)/RocksDBColumnFamilySample.java
 	@rm -rf /tmp/rocksdbjni
-	java -ea -Djava.library.path=.:../ -cp ".:./*" -Xcheck:jni RocksDBColumnFamilySample /tmp/rocksdbjni
+	java -ea -Xcheck:jni -Djava.library.path=target -cp $(MAIN_CLASSES):$(SAMPLES_MAIN_CLASSES) RocksDBColumnFamilySample /tmp/rocksdbjni
 	@rm -rf /tmp/rocksdbjni
 
 resolve_test_deps:
diff --git a/java/RocksDBColumnFamilySample.java b/java/samples/src/main/java/RocksDBColumnFamilySample.java
similarity index 100%
rename from java/RocksDBColumnFamilySample.java
rename to java/samples/src/main/java/RocksDBColumnFamilySample.java
diff --git a/java/RocksDBSample.java b/java/samples/src/main/java/RocksDBSample.java
similarity index 100%
rename from java/RocksDBSample.java
rename to java/samples/src/main/java/RocksDBSample.java