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

---
 Makefile                                      | 39 +++++++++++--------
 java/Makefile                                 | 28 ++++++-------
 java/crossbuild/build-linux-centos.sh         |  4 +-
 java/crossbuild/build-linux.sh                |  4 +-
 .../java}/org/rocksdb/AbstractComparator.java |  0
 .../org/rocksdb/AbstractRocksIterator.java    |  0
 .../main/java}/org/rocksdb/AbstractSlice.java |  0
 .../java}/org/rocksdb/AbstractWriteBatch.java |  0
 .../main/java}/org/rocksdb/BackupInfo.java    |  0
 .../main/java}/org/rocksdb/BackupableDB.java  |  0
 .../org/rocksdb/BackupableDBOptions.java      |  0
 .../org/rocksdb/BlockBasedTableConfig.java    |  0
 .../main/java}/org/rocksdb/BloomFilter.java   |  0
 .../java}/org/rocksdb/BuiltinComparator.java  |  0
 .../main/java}/org/rocksdb/Checkpoint.java    |  0
 .../main/java}/org/rocksdb/ChecksumType.java  |  0
 .../org/rocksdb/ColumnFamilyDescriptor.java   |  0
 .../java}/org/rocksdb/ColumnFamilyHandle.java |  0
 .../org/rocksdb/ColumnFamilyOptions.java      |  0
 .../rocksdb/ColumnFamilyOptionsInterface.java |  0
 .../java}/org/rocksdb/CompactionStyle.java    |  0
 .../main/java}/org/rocksdb/Comparator.java    |  0
 .../java}/org/rocksdb/ComparatorOptions.java  |  0
 .../java}/org/rocksdb/CompressionType.java    |  0
 .../main/java}/org/rocksdb/DBOptions.java     |  0
 .../java}/org/rocksdb/DBOptionsInterface.java |  0
 .../java}/org/rocksdb/DirectComparator.java   |  0
 .../main/java}/org/rocksdb/DirectSlice.java   |  0
 .../main/java}/org/rocksdb/EncodingType.java  |  0
 .../main/java}/org/rocksdb/Filter.java        |  0
 .../main/java}/org/rocksdb/FlushOptions.java  |  0
 .../org/rocksdb/GenericRateLimiterConfig.java |  0
 .../rocksdb/HashLinkedListMemTableConfig.java |  0
 .../rocksdb/HashSkipListMemTableConfig.java   |  0
 .../main/java}/org/rocksdb/HistogramData.java |  0
 .../main/java}/org/rocksdb/HistogramType.java |  0
 .../main/java}/org/rocksdb/IndexType.java     |  0
 .../main/java}/org/rocksdb/InfoLogLevel.java  |  0
 .../java}/org/rocksdb/MemTableConfig.java     |  0
 .../main/java}/org/rocksdb/MergeOperator.java |  0
 .../org/rocksdb/NativeLibraryLoader.java      |  0
 .../main/java}/org/rocksdb/Options.java       |  0
 .../java}/org/rocksdb/PlainTableConfig.java   |  0
 .../java}/org/rocksdb/RateLimiterConfig.java  |  0
 .../main/java}/org/rocksdb/ReadOptions.java   |  0
 .../org/rocksdb/RestoreBackupableDB.java      |  0
 .../java}/org/rocksdb/RestoreOptions.java     |  0
 .../main/java}/org/rocksdb/RocksDB.java       |  0
 .../java}/org/rocksdb/RocksDBException.java   |  0
 .../main/java}/org/rocksdb/RocksEnv.java      |  0
 .../main/java}/org/rocksdb/RocksIterator.java |  0
 .../org/rocksdb/RocksIteratorInterface.java   |  0
 .../main/java}/org/rocksdb/RocksObject.java   |  0
 .../org/rocksdb/SkipListMemTableConfig.java   |  0
 .../main/java}/org/rocksdb/Slice.java         |  0
 .../main/java}/org/rocksdb/Snapshot.java      |  0
 .../main/java}/org/rocksdb/Statistics.java    |  0
 .../org/rocksdb/StatisticsCollector.java      |  0
 .../rocksdb/StatisticsCollectorCallback.java  |  0
 .../org/rocksdb/StatsCollectorInput.java      |  0
 .../org/rocksdb/StringAppendOperator.java     |  0
 .../java}/org/rocksdb/TableFormatConfig.java  |  0
 .../main/java}/org/rocksdb/TickerType.java    |  0
 .../org/rocksdb/TransactionLogIterator.java   |  0
 .../main/java}/org/rocksdb/TtlDB.java         |  0
 .../org/rocksdb/VectorMemTableConfig.java     |  0
 .../java}/org/rocksdb/WBWIRocksIterator.java  |  0
 .../main/java}/org/rocksdb/WriteBatch.java    |  0
 .../org/rocksdb/WriteBatchInterface.java      |  0
 .../org/rocksdb/WriteBatchWithIndex.java      |  0
 .../main/java}/org/rocksdb/WriteOptions.java  |  0
 .../java}/org/rocksdb/util/Environment.java   |  0
 .../main/java}/org/rocksdb/util/SizeUnit.java |  0
 73 files changed, 41 insertions(+), 34 deletions(-)
 rename java/{ => src/main/java}/org/rocksdb/AbstractComparator.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/AbstractRocksIterator.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/AbstractSlice.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/AbstractWriteBatch.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/BackupInfo.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/BackupableDB.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/BackupableDBOptions.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/BlockBasedTableConfig.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/BloomFilter.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/BuiltinComparator.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/Checkpoint.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/ChecksumType.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/ColumnFamilyDescriptor.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/ColumnFamilyHandle.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/ColumnFamilyOptions.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/ColumnFamilyOptionsInterface.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/CompactionStyle.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/Comparator.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/ComparatorOptions.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/CompressionType.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/DBOptions.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/DBOptionsInterface.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/DirectComparator.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/DirectSlice.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/EncodingType.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/Filter.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/FlushOptions.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/GenericRateLimiterConfig.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/HashLinkedListMemTableConfig.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/HashSkipListMemTableConfig.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/HistogramData.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/HistogramType.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/IndexType.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/InfoLogLevel.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/MemTableConfig.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/MergeOperator.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/NativeLibraryLoader.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/Options.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/PlainTableConfig.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/RateLimiterConfig.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/ReadOptions.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/RestoreBackupableDB.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/RestoreOptions.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/RocksDB.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/RocksDBException.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/RocksEnv.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/RocksIterator.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/RocksIteratorInterface.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/RocksObject.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/SkipListMemTableConfig.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/Slice.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/Snapshot.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/Statistics.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/StatisticsCollector.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/StatisticsCollectorCallback.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/StatsCollectorInput.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/StringAppendOperator.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/TableFormatConfig.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/TickerType.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/TransactionLogIterator.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/TtlDB.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/VectorMemTableConfig.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/WBWIRocksIterator.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/WriteBatch.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/WriteBatchInterface.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/WriteBatchWithIndex.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/WriteOptions.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/util/Environment.java (100%)
 rename java/{ => src/main/java}/org/rocksdb/util/SizeUnit.java (100%)

diff --git a/Makefile b/Makefile
index 1c0dea975..724be1d3c 100644
--- a/Makefile
+++ b/Makefile
@@ -631,35 +631,40 @@ libsnappy.a:
 rocksdbjavastatic: libz.a libbz2.a libsnappy.a
 	OPT="-fPIC -DNDEBUG -O2" $(MAKE) $(LIBRARY) -j
 	cd java;$(MAKE) javalib;
-	rm -f ./java/$(ROCKSDBJNILIB)
-	$(CXX) $(CXXFLAGS) -I./java/. $(JAVA_INCLUDE) -shared -fPIC -o ./java/$(ROCKSDBJNILIB) $(JNI_NATIVE_SOURCES) $(LIBOBJECTS) $(COVERAGEFLAGS) libz.a libbz2.a libsnappy.a
-	cd java;strip -S -x $(ROCKSDBJNILIB)
-	cd java;jar -cf $(ROCKSDB_JAR) org/rocksdb/*.class org/rocksdb/util/*.class HISTORY*.md $(ROCKSDBJNILIB)
-	cd java/javadoc;jar -cf ../$(ROCKSDB_JAVADOCS_JAR) *
-	cd java;jar -cf $(ROCKSDB_SOURCES_JAR) org
+	rm -f ./java/target/$(ROCKSDBJNILIB)
+	$(CXX) $(CXXFLAGS) -I./java/. $(JAVA_INCLUDE) -shared -fPIC -o ./java/target/$(ROCKSDBJNILIB) $(JNI_NATIVE_SOURCES) $(LIBOBJECTS) $(COVERAGEFLAGS) libz.a libbz2.a libsnappy.a
+	cd java/target;strip -S -x $(ROCKSDBJNILIB)
+	cd java;jar -cf target/$(ROCKSDB_JAR) HISTORY*.md
+	cd java/target;jar -uf $(ROCKSDB_JAR) $(ROCKSDBJNILIB)
+	cd java/target/classes;jar -uf ../$(ROCKSDB_JAR) org/rocksdb/*.class org/rocksdb/util/*.class
+	cd java/target/apidocs;jar -cf ../$(ROCKSDB_JAVADOCS_JAR) *
+	cd java/src/main/java;jar -cf ../../../target/$(ROCKSDB_SOURCES_JAR) org
 
 rocksdbjavastaticrelease: rocksdbjavastatic
 	cd java/crossbuild && vagrant destroy -f && vagrant up linux32 && vagrant halt linux32 && vagrant up linux64 && vagrant halt linux64
-	cd java;jar -cf $(ROCKSDB_JAR_ALL) org/rocksdb/*.class org/rocksdb/util/*.class HISTORY*.md librocksdbjni-*.so librocksdbjni-*.jnilib
+	cd java;jar -cf target/$(ROCKSDB_JAR_ALL) HISTORY*.md
+	cd java/target;jar -uf $(ROCKSDB_JAR_ALL) librocksdbjni-*.so librocksdbjni-*.jnilib
+	cd java/target/classes;jar -uf ../$(ROCKSDB_JAR_ALL) org/rocksdb/*.class org/rocksdb/util/*.class
 
 rocksdbjavastaticpublish: rocksdbjavastaticrelease
-	mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -DpomFile=java/rocksjni.pom -Dfile=java/rocksdbjni-$(ROCKSDB_MAJOR).$(ROCKSDB_MINOR).$(ROCKSDB_PATCH)-javadoc.jar -Dclassifier=javadoc
-	mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -DpomFile=java/rocksjni.pom -Dfile=java/rocksdbjni-$(ROCKSDB_MAJOR).$(ROCKSDB_MINOR).$(ROCKSDB_PATCH)-sources.jar -Dclassifier=sources
-	mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -DpomFile=java/rocksjni.pom -Dfile=java/rocksdbjni-$(ROCKSDB_MAJOR).$(ROCKSDB_MINOR).$(ROCKSDB_PATCH)-linux64.jar -Dclassifier=linux64
-	mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -DpomFile=java/rocksjni.pom -Dfile=java/rocksdbjni-$(ROCKSDB_MAJOR).$(ROCKSDB_MINOR).$(ROCKSDB_PATCH)-linux32.jar -Dclassifier=linux32
-	mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -DpomFile=java/rocksjni.pom -Dfile=java/rocksdbjni-$(ROCKSDB_MAJOR).$(ROCKSDB_MINOR).$(ROCKSDB_PATCH)-osx.jar -Dclassifier=osx
-	mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -DpomFile=java/rocksjni.pom -Dfile=java/rocksdbjni-$(ROCKSDB_MAJOR).$(ROCKSDB_MINOR).$(ROCKSDB_PATCH).jar
+	mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -DpomFile=java/rocksjni.pom -Dfile=java/target/rocksdbjni-$(ROCKSDB_MAJOR).$(ROCKSDB_MINOR).$(ROCKSDB_PATCH)-javadoc.jar -Dclassifier=javadoc
+	mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -DpomFile=java/rocksjni.pom -Dfile=java/target/rocksdbjni-$(ROCKSDB_MAJOR).$(ROCKSDB_MINOR).$(ROCKSDB_PATCH)-sources.jar -Dclassifier=sources
+	mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -DpomFile=java/rocksjni.pom -Dfile=java/target/rocksdbjni-$(ROCKSDB_MAJOR).$(ROCKSDB_MINOR).$(ROCKSDB_PATCH)-linux64.jar -Dclassifier=linux64
+	mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -DpomFile=java/rocksjni.pom -Dfile=java/target/rocksdbjni-$(ROCKSDB_MAJOR).$(ROCKSDB_MINOR).$(ROCKSDB_PATCH)-linux32.jar -Dclassifier=linux32
+	mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -DpomFile=java/rocksjni.pom -Dfile=java/target/rocksdbjni-$(ROCKSDB_MAJOR).$(ROCKSDB_MINOR).$(ROCKSDB_PATCH)-osx.jar -Dclassifier=osx
+	mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -DpomFile=java/rocksjni.pom -Dfile=java/target/rocksdbjni-$(ROCKSDB_MAJOR).$(ROCKSDB_MINOR).$(ROCKSDB_PATCH).jar
 
 rocksdbjava:
 	OPT="-fPIC -DNDEBUG -O2" $(MAKE) $(LIBRARY) -j32
 	cd java;$(MAKE) javalib;
-	rm -f ./java/$(ROCKSDBJNILIB)
-	$(CXX) $(CXXFLAGS) -I./java/. $(JAVA_INCLUDE) -shared -fPIC -o ./java/$(ROCKSDBJNILIB) $(JNI_NATIVE_SOURCES) $(LIBOBJECTS) $(JAVA_LDFLAGS) $(COVERAGEFLAGS)
-	cd java;jar -cf $(ROCKSDB_JAR) org/rocksdb/*.class org/rocksdb/util/*.class HISTORY*.md $(ROCKSDBJNILIB)
+	rm -f ./java/target/$(ROCKSDBJNILIB)
+	$(CXX) $(CXXFLAGS) -I./java/. $(JAVA_INCLUDE) -shared -fPIC -o ./java/target/$(ROCKSDBJNILIB) $(JNI_NATIVE_SOURCES) $(LIBOBJECTS) $(JAVA_LDFLAGS) $(COVERAGEFLAGS)
+	cd java;jar -cf target/$(ROCKSDB_JAR) HISTORY*.md
+	cd java/target;jar -uf $(ROCKSDB_JAR) $(ROCKSDBJNILIB)
+	cd java/target/classes;jar -uf ../$(ROCKSDB_JAR) org/rocksdb/*.class org/rocksdb/util/*.class
 
 jclean:
 	cd java;$(MAKE) clean;
-	rm -f $(ROCKSDBJNILIB)
 
 jtest:
 	cd java;$(MAKE) sample;$(MAKE) test;
diff --git a/java/Makefile b/java/Makefile
index a43275c2c..b7d44fc25 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -92,11 +92,12 @@ JAVA_TESTS = org.rocksdb.BackupableDBOptionsTest\
 	org.rocksdb.WriteOptionsTest\
 	org.rocksdb.WriteBatchWithIndexTest
 
+MAIN_SRC = src/main/java
 TEST_SRC = src/test/java
 OUTPUT = target
-# TODO update after moving main classes
-MAIN_CLASSES = .
+MAIN_CLASSES = $(OUTPUT)/classes
 TEST_CLASSES = $(OUTPUT)/test-classes
+JAVADOC = $(OUTPUT)/apidocs
 
 JAVA_TEST_LIBDIR = ./test-libs/
 JAVA_JUNIT_JAR = $(JAVA_TEST_LIBDIR)junit-4.12-beta-2.jar
@@ -107,25 +108,25 @@ JAVA_ASSERTJ_JAR = $(JAVA_TEST_LIBDIR)assertj-core-1.7.0.jar
 JAVA_TESTCLASSPATH = $(JAVA_JUNIT_JAR):$(JAVA_HAMCR_JAR):$(JAVA_MOCKITO_JAR):$(JAVA_CGLIB_JAR):$(JAVA_ASSERTJ_JAR):.:./*
 
 clean:
-	-find . -name "*.class" -exec rm {} \;
 	rm -rf include/*
-	rm -rf javadoc/*
 	rm -rf test-libs/
 	rm -rf $(OUTPUT)
-	rm -rf librocksdbjni*
-	rm -f rocksdbjni*
 
 
 javadocs:
-	mkdir -p javadoc; javadoc -d javadoc -sourcepath . -subpackages org -exclude org.rocksdb.test
+	mkdir -p $(JAVADOC)
+	javadoc -d $(JAVADOC) -sourcepath $(MAIN_SRC) -subpackages org
 
 javalib: java java_test javadocs
 
 java:
-	javac org/rocksdb/util/*.java org/rocksdb/*.java
+	mkdir -p $(MAIN_CLASSES)
+	javac -d $(MAIN_CLASSES)\
+		$(MAIN_SRC)/org/rocksdb/util/*.java\
+		$(MAIN_SRC)/org/rocksdb/*.java
 	@cp ../HISTORY.md ./HISTORY-CPP.md
 	@rm -f ./HISTORY-CPP.md
-	javah -d $(NATIVE_INCLUDE) -jni $(NATIVE_JAVA_CLASSES)
+	javah -cp $(MAIN_CLASSES) -d $(NATIVE_INCLUDE) -jni $(NATIVE_JAVA_CLASSES)
 
 sample: java
 	javac -cp $(ROCKSDB_JAR) RocksDBSample.java
@@ -151,13 +152,14 @@ resolve_test_deps:
 
 java_test: resolve_test_deps
 	mkdir -p $(TEST_CLASSES)
-	javac -cp $(MAIN_CLASSES):$(JAVA_TESTCLASSPATH) -d $(TEST_CLASSES) $(TEST_SRC)/org/rocksdb/*.java
-	javac -cp $(MAIN_CLASSES):$(JAVA_TESTCLASSPATH) -d $(TEST_CLASSES) $(TEST_SRC)/org/rocksdb/test/*.java
-	javac -cp $(MAIN_CLASSES):$(JAVA_TESTCLASSPATH) -d $(TEST_CLASSES) $(TEST_SRC)/org/rocksdb/util/*.java
+	javac -cp $(MAIN_CLASSES):$(JAVA_TESTCLASSPATH) -d $(TEST_CLASSES)\
+		$(TEST_SRC)/org/rocksdb/test/*.java\
+		$(TEST_SRC)/org/rocksdb/util/*.java\
+		$(TEST_SRC)/org/rocksdb/*.java
 	javah -cp $(MAIN_CLASSES):$(TEST_CLASSES) -d $(NATIVE_INCLUDE) -jni $(NATIVE_JAVA_TEST_CLASSES)
 
 test: java resolve_test_deps java_test
-	java -ea -Xcheck:jni -Djava.library.path=.:../ -cp "$(MAIN_CLASSES):$(TEST_CLASSES):$(JAVA_TESTCLASSPATH)" org.rocksdb.test.RocksJunitRunner $(JAVA_TESTS)
+	java -ea -Xcheck:jni -Djava.library.path=target -cp "$(MAIN_CLASSES):$(TEST_CLASSES):$(JAVA_TESTCLASSPATH)" org.rocksdb.test.RocksJunitRunner $(JAVA_TESTS)
 
 db_bench: java
 	javac org/rocksdb/benchmark/*.java
diff --git a/java/crossbuild/build-linux-centos.sh b/java/crossbuild/build-linux-centos.sh
index 5730b1533..158303069 100755
--- a/java/crossbuild/build-linux-centos.sh
+++ b/java/crossbuild/build-linux-centos.sh
@@ -18,6 +18,6 @@ export JAVA_HOME=/usr/lib/jvm/java-1.7.0
 cd /rocksdb
 scl enable devtoolset-1.1 'make jclean clean'
 scl enable devtoolset-1.1 'make -j 4 rocksdbjavastatic'
-cp /rocksdb/java/librocksdbjni-* /rocksdb-build
-cp /rocksdb/java/rocksdbjni-* /rocksdb-build
+cp /rocksdb/java/target/librocksdbjni-* /rocksdb-build
+cp /rocksdb/java/target/rocksdbjni-* /rocksdb-build
 
diff --git a/java/crossbuild/build-linux.sh b/java/crossbuild/build-linux.sh
index 75edac526..48d1c28d9 100755
--- a/java/crossbuild/build-linux.sh
+++ b/java/crossbuild/build-linux.sh
@@ -8,7 +8,7 @@ export JAVA_HOME=$(echo /usr/lib/jvm/java-7-openjdk*)
 cd /rocksdb
 make jclean clean
 make -j 4 rocksdbjavastatic
-cp /rocksdb/java/librocksdbjni-* /rocksdb-build
-cp /rocksdb/java/rocksdbjni-* /rocksdb-build
+cp /rocksdb/java/target/librocksdbjni-* /rocksdb-build
+cp /rocksdb/java/target/rocksdbjni-* /rocksdb-build
 sudo shutdown -h now
 
diff --git a/java/org/rocksdb/AbstractComparator.java b/java/src/main/java/org/rocksdb/AbstractComparator.java
similarity index 100%
rename from java/org/rocksdb/AbstractComparator.java
rename to java/src/main/java/org/rocksdb/AbstractComparator.java
diff --git a/java/org/rocksdb/AbstractRocksIterator.java b/java/src/main/java/org/rocksdb/AbstractRocksIterator.java
similarity index 100%
rename from java/org/rocksdb/AbstractRocksIterator.java
rename to java/src/main/java/org/rocksdb/AbstractRocksIterator.java
diff --git a/java/org/rocksdb/AbstractSlice.java b/java/src/main/java/org/rocksdb/AbstractSlice.java
similarity index 100%
rename from java/org/rocksdb/AbstractSlice.java
rename to java/src/main/java/org/rocksdb/AbstractSlice.java
diff --git a/java/org/rocksdb/AbstractWriteBatch.java b/java/src/main/java/org/rocksdb/AbstractWriteBatch.java
similarity index 100%
rename from java/org/rocksdb/AbstractWriteBatch.java
rename to java/src/main/java/org/rocksdb/AbstractWriteBatch.java
diff --git a/java/org/rocksdb/BackupInfo.java b/java/src/main/java/org/rocksdb/BackupInfo.java
similarity index 100%
rename from java/org/rocksdb/BackupInfo.java
rename to java/src/main/java/org/rocksdb/BackupInfo.java
diff --git a/java/org/rocksdb/BackupableDB.java b/java/src/main/java/org/rocksdb/BackupableDB.java
similarity index 100%
rename from java/org/rocksdb/BackupableDB.java
rename to java/src/main/java/org/rocksdb/BackupableDB.java
diff --git a/java/org/rocksdb/BackupableDBOptions.java b/java/src/main/java/org/rocksdb/BackupableDBOptions.java
similarity index 100%
rename from java/org/rocksdb/BackupableDBOptions.java
rename to java/src/main/java/org/rocksdb/BackupableDBOptions.java
diff --git a/java/org/rocksdb/BlockBasedTableConfig.java b/java/src/main/java/org/rocksdb/BlockBasedTableConfig.java
similarity index 100%
rename from java/org/rocksdb/BlockBasedTableConfig.java
rename to java/src/main/java/org/rocksdb/BlockBasedTableConfig.java
diff --git a/java/org/rocksdb/BloomFilter.java b/java/src/main/java/org/rocksdb/BloomFilter.java
similarity index 100%
rename from java/org/rocksdb/BloomFilter.java
rename to java/src/main/java/org/rocksdb/BloomFilter.java
diff --git a/java/org/rocksdb/BuiltinComparator.java b/java/src/main/java/org/rocksdb/BuiltinComparator.java
similarity index 100%
rename from java/org/rocksdb/BuiltinComparator.java
rename to java/src/main/java/org/rocksdb/BuiltinComparator.java
diff --git a/java/org/rocksdb/Checkpoint.java b/java/src/main/java/org/rocksdb/Checkpoint.java
similarity index 100%
rename from java/org/rocksdb/Checkpoint.java
rename to java/src/main/java/org/rocksdb/Checkpoint.java
diff --git a/java/org/rocksdb/ChecksumType.java b/java/src/main/java/org/rocksdb/ChecksumType.java
similarity index 100%
rename from java/org/rocksdb/ChecksumType.java
rename to java/src/main/java/org/rocksdb/ChecksumType.java
diff --git a/java/org/rocksdb/ColumnFamilyDescriptor.java b/java/src/main/java/org/rocksdb/ColumnFamilyDescriptor.java
similarity index 100%
rename from java/org/rocksdb/ColumnFamilyDescriptor.java
rename to java/src/main/java/org/rocksdb/ColumnFamilyDescriptor.java
diff --git a/java/org/rocksdb/ColumnFamilyHandle.java b/java/src/main/java/org/rocksdb/ColumnFamilyHandle.java
similarity index 100%
rename from java/org/rocksdb/ColumnFamilyHandle.java
rename to java/src/main/java/org/rocksdb/ColumnFamilyHandle.java
diff --git a/java/org/rocksdb/ColumnFamilyOptions.java b/java/src/main/java/org/rocksdb/ColumnFamilyOptions.java
similarity index 100%
rename from java/org/rocksdb/ColumnFamilyOptions.java
rename to java/src/main/java/org/rocksdb/ColumnFamilyOptions.java
diff --git a/java/org/rocksdb/ColumnFamilyOptionsInterface.java b/java/src/main/java/org/rocksdb/ColumnFamilyOptionsInterface.java
similarity index 100%
rename from java/org/rocksdb/ColumnFamilyOptionsInterface.java
rename to java/src/main/java/org/rocksdb/ColumnFamilyOptionsInterface.java
diff --git a/java/org/rocksdb/CompactionStyle.java b/java/src/main/java/org/rocksdb/CompactionStyle.java
similarity index 100%
rename from java/org/rocksdb/CompactionStyle.java
rename to java/src/main/java/org/rocksdb/CompactionStyle.java
diff --git a/java/org/rocksdb/Comparator.java b/java/src/main/java/org/rocksdb/Comparator.java
similarity index 100%
rename from java/org/rocksdb/Comparator.java
rename to java/src/main/java/org/rocksdb/Comparator.java
diff --git a/java/org/rocksdb/ComparatorOptions.java b/java/src/main/java/org/rocksdb/ComparatorOptions.java
similarity index 100%
rename from java/org/rocksdb/ComparatorOptions.java
rename to java/src/main/java/org/rocksdb/ComparatorOptions.java
diff --git a/java/org/rocksdb/CompressionType.java b/java/src/main/java/org/rocksdb/CompressionType.java
similarity index 100%
rename from java/org/rocksdb/CompressionType.java
rename to java/src/main/java/org/rocksdb/CompressionType.java
diff --git a/java/org/rocksdb/DBOptions.java b/java/src/main/java/org/rocksdb/DBOptions.java
similarity index 100%
rename from java/org/rocksdb/DBOptions.java
rename to java/src/main/java/org/rocksdb/DBOptions.java
diff --git a/java/org/rocksdb/DBOptionsInterface.java b/java/src/main/java/org/rocksdb/DBOptionsInterface.java
similarity index 100%
rename from java/org/rocksdb/DBOptionsInterface.java
rename to java/src/main/java/org/rocksdb/DBOptionsInterface.java
diff --git a/java/org/rocksdb/DirectComparator.java b/java/src/main/java/org/rocksdb/DirectComparator.java
similarity index 100%
rename from java/org/rocksdb/DirectComparator.java
rename to java/src/main/java/org/rocksdb/DirectComparator.java
diff --git a/java/org/rocksdb/DirectSlice.java b/java/src/main/java/org/rocksdb/DirectSlice.java
similarity index 100%
rename from java/org/rocksdb/DirectSlice.java
rename to java/src/main/java/org/rocksdb/DirectSlice.java
diff --git a/java/org/rocksdb/EncodingType.java b/java/src/main/java/org/rocksdb/EncodingType.java
similarity index 100%
rename from java/org/rocksdb/EncodingType.java
rename to java/src/main/java/org/rocksdb/EncodingType.java
diff --git a/java/org/rocksdb/Filter.java b/java/src/main/java/org/rocksdb/Filter.java
similarity index 100%
rename from java/org/rocksdb/Filter.java
rename to java/src/main/java/org/rocksdb/Filter.java
diff --git a/java/org/rocksdb/FlushOptions.java b/java/src/main/java/org/rocksdb/FlushOptions.java
similarity index 100%
rename from java/org/rocksdb/FlushOptions.java
rename to java/src/main/java/org/rocksdb/FlushOptions.java
diff --git a/java/org/rocksdb/GenericRateLimiterConfig.java b/java/src/main/java/org/rocksdb/GenericRateLimiterConfig.java
similarity index 100%
rename from java/org/rocksdb/GenericRateLimiterConfig.java
rename to java/src/main/java/org/rocksdb/GenericRateLimiterConfig.java
diff --git a/java/org/rocksdb/HashLinkedListMemTableConfig.java b/java/src/main/java/org/rocksdb/HashLinkedListMemTableConfig.java
similarity index 100%
rename from java/org/rocksdb/HashLinkedListMemTableConfig.java
rename to java/src/main/java/org/rocksdb/HashLinkedListMemTableConfig.java
diff --git a/java/org/rocksdb/HashSkipListMemTableConfig.java b/java/src/main/java/org/rocksdb/HashSkipListMemTableConfig.java
similarity index 100%
rename from java/org/rocksdb/HashSkipListMemTableConfig.java
rename to java/src/main/java/org/rocksdb/HashSkipListMemTableConfig.java
diff --git a/java/org/rocksdb/HistogramData.java b/java/src/main/java/org/rocksdb/HistogramData.java
similarity index 100%
rename from java/org/rocksdb/HistogramData.java
rename to java/src/main/java/org/rocksdb/HistogramData.java
diff --git a/java/org/rocksdb/HistogramType.java b/java/src/main/java/org/rocksdb/HistogramType.java
similarity index 100%
rename from java/org/rocksdb/HistogramType.java
rename to java/src/main/java/org/rocksdb/HistogramType.java
diff --git a/java/org/rocksdb/IndexType.java b/java/src/main/java/org/rocksdb/IndexType.java
similarity index 100%
rename from java/org/rocksdb/IndexType.java
rename to java/src/main/java/org/rocksdb/IndexType.java
diff --git a/java/org/rocksdb/InfoLogLevel.java b/java/src/main/java/org/rocksdb/InfoLogLevel.java
similarity index 100%
rename from java/org/rocksdb/InfoLogLevel.java
rename to java/src/main/java/org/rocksdb/InfoLogLevel.java
diff --git a/java/org/rocksdb/MemTableConfig.java b/java/src/main/java/org/rocksdb/MemTableConfig.java
similarity index 100%
rename from java/org/rocksdb/MemTableConfig.java
rename to java/src/main/java/org/rocksdb/MemTableConfig.java
diff --git a/java/org/rocksdb/MergeOperator.java b/java/src/main/java/org/rocksdb/MergeOperator.java
similarity index 100%
rename from java/org/rocksdb/MergeOperator.java
rename to java/src/main/java/org/rocksdb/MergeOperator.java
diff --git a/java/org/rocksdb/NativeLibraryLoader.java b/java/src/main/java/org/rocksdb/NativeLibraryLoader.java
similarity index 100%
rename from java/org/rocksdb/NativeLibraryLoader.java
rename to java/src/main/java/org/rocksdb/NativeLibraryLoader.java
diff --git a/java/org/rocksdb/Options.java b/java/src/main/java/org/rocksdb/Options.java
similarity index 100%
rename from java/org/rocksdb/Options.java
rename to java/src/main/java/org/rocksdb/Options.java
diff --git a/java/org/rocksdb/PlainTableConfig.java b/java/src/main/java/org/rocksdb/PlainTableConfig.java
similarity index 100%
rename from java/org/rocksdb/PlainTableConfig.java
rename to java/src/main/java/org/rocksdb/PlainTableConfig.java
diff --git a/java/org/rocksdb/RateLimiterConfig.java b/java/src/main/java/org/rocksdb/RateLimiterConfig.java
similarity index 100%
rename from java/org/rocksdb/RateLimiterConfig.java
rename to java/src/main/java/org/rocksdb/RateLimiterConfig.java
diff --git a/java/org/rocksdb/ReadOptions.java b/java/src/main/java/org/rocksdb/ReadOptions.java
similarity index 100%
rename from java/org/rocksdb/ReadOptions.java
rename to java/src/main/java/org/rocksdb/ReadOptions.java
diff --git a/java/org/rocksdb/RestoreBackupableDB.java b/java/src/main/java/org/rocksdb/RestoreBackupableDB.java
similarity index 100%
rename from java/org/rocksdb/RestoreBackupableDB.java
rename to java/src/main/java/org/rocksdb/RestoreBackupableDB.java
diff --git a/java/org/rocksdb/RestoreOptions.java b/java/src/main/java/org/rocksdb/RestoreOptions.java
similarity index 100%
rename from java/org/rocksdb/RestoreOptions.java
rename to java/src/main/java/org/rocksdb/RestoreOptions.java
diff --git a/java/org/rocksdb/RocksDB.java b/java/src/main/java/org/rocksdb/RocksDB.java
similarity index 100%
rename from java/org/rocksdb/RocksDB.java
rename to java/src/main/java/org/rocksdb/RocksDB.java
diff --git a/java/org/rocksdb/RocksDBException.java b/java/src/main/java/org/rocksdb/RocksDBException.java
similarity index 100%
rename from java/org/rocksdb/RocksDBException.java
rename to java/src/main/java/org/rocksdb/RocksDBException.java
diff --git a/java/org/rocksdb/RocksEnv.java b/java/src/main/java/org/rocksdb/RocksEnv.java
similarity index 100%
rename from java/org/rocksdb/RocksEnv.java
rename to java/src/main/java/org/rocksdb/RocksEnv.java
diff --git a/java/org/rocksdb/RocksIterator.java b/java/src/main/java/org/rocksdb/RocksIterator.java
similarity index 100%
rename from java/org/rocksdb/RocksIterator.java
rename to java/src/main/java/org/rocksdb/RocksIterator.java
diff --git a/java/org/rocksdb/RocksIteratorInterface.java b/java/src/main/java/org/rocksdb/RocksIteratorInterface.java
similarity index 100%
rename from java/org/rocksdb/RocksIteratorInterface.java
rename to java/src/main/java/org/rocksdb/RocksIteratorInterface.java
diff --git a/java/org/rocksdb/RocksObject.java b/java/src/main/java/org/rocksdb/RocksObject.java
similarity index 100%
rename from java/org/rocksdb/RocksObject.java
rename to java/src/main/java/org/rocksdb/RocksObject.java
diff --git a/java/org/rocksdb/SkipListMemTableConfig.java b/java/src/main/java/org/rocksdb/SkipListMemTableConfig.java
similarity index 100%
rename from java/org/rocksdb/SkipListMemTableConfig.java
rename to java/src/main/java/org/rocksdb/SkipListMemTableConfig.java
diff --git a/java/org/rocksdb/Slice.java b/java/src/main/java/org/rocksdb/Slice.java
similarity index 100%
rename from java/org/rocksdb/Slice.java
rename to java/src/main/java/org/rocksdb/Slice.java
diff --git a/java/org/rocksdb/Snapshot.java b/java/src/main/java/org/rocksdb/Snapshot.java
similarity index 100%
rename from java/org/rocksdb/Snapshot.java
rename to java/src/main/java/org/rocksdb/Snapshot.java
diff --git a/java/org/rocksdb/Statistics.java b/java/src/main/java/org/rocksdb/Statistics.java
similarity index 100%
rename from java/org/rocksdb/Statistics.java
rename to java/src/main/java/org/rocksdb/Statistics.java
diff --git a/java/org/rocksdb/StatisticsCollector.java b/java/src/main/java/org/rocksdb/StatisticsCollector.java
similarity index 100%
rename from java/org/rocksdb/StatisticsCollector.java
rename to java/src/main/java/org/rocksdb/StatisticsCollector.java
diff --git a/java/org/rocksdb/StatisticsCollectorCallback.java b/java/src/main/java/org/rocksdb/StatisticsCollectorCallback.java
similarity index 100%
rename from java/org/rocksdb/StatisticsCollectorCallback.java
rename to java/src/main/java/org/rocksdb/StatisticsCollectorCallback.java
diff --git a/java/org/rocksdb/StatsCollectorInput.java b/java/src/main/java/org/rocksdb/StatsCollectorInput.java
similarity index 100%
rename from java/org/rocksdb/StatsCollectorInput.java
rename to java/src/main/java/org/rocksdb/StatsCollectorInput.java
diff --git a/java/org/rocksdb/StringAppendOperator.java b/java/src/main/java/org/rocksdb/StringAppendOperator.java
similarity index 100%
rename from java/org/rocksdb/StringAppendOperator.java
rename to java/src/main/java/org/rocksdb/StringAppendOperator.java
diff --git a/java/org/rocksdb/TableFormatConfig.java b/java/src/main/java/org/rocksdb/TableFormatConfig.java
similarity index 100%
rename from java/org/rocksdb/TableFormatConfig.java
rename to java/src/main/java/org/rocksdb/TableFormatConfig.java
diff --git a/java/org/rocksdb/TickerType.java b/java/src/main/java/org/rocksdb/TickerType.java
similarity index 100%
rename from java/org/rocksdb/TickerType.java
rename to java/src/main/java/org/rocksdb/TickerType.java
diff --git a/java/org/rocksdb/TransactionLogIterator.java b/java/src/main/java/org/rocksdb/TransactionLogIterator.java
similarity index 100%
rename from java/org/rocksdb/TransactionLogIterator.java
rename to java/src/main/java/org/rocksdb/TransactionLogIterator.java
diff --git a/java/org/rocksdb/TtlDB.java b/java/src/main/java/org/rocksdb/TtlDB.java
similarity index 100%
rename from java/org/rocksdb/TtlDB.java
rename to java/src/main/java/org/rocksdb/TtlDB.java
diff --git a/java/org/rocksdb/VectorMemTableConfig.java b/java/src/main/java/org/rocksdb/VectorMemTableConfig.java
similarity index 100%
rename from java/org/rocksdb/VectorMemTableConfig.java
rename to java/src/main/java/org/rocksdb/VectorMemTableConfig.java
diff --git a/java/org/rocksdb/WBWIRocksIterator.java b/java/src/main/java/org/rocksdb/WBWIRocksIterator.java
similarity index 100%
rename from java/org/rocksdb/WBWIRocksIterator.java
rename to java/src/main/java/org/rocksdb/WBWIRocksIterator.java
diff --git a/java/org/rocksdb/WriteBatch.java b/java/src/main/java/org/rocksdb/WriteBatch.java
similarity index 100%
rename from java/org/rocksdb/WriteBatch.java
rename to java/src/main/java/org/rocksdb/WriteBatch.java
diff --git a/java/org/rocksdb/WriteBatchInterface.java b/java/src/main/java/org/rocksdb/WriteBatchInterface.java
similarity index 100%
rename from java/org/rocksdb/WriteBatchInterface.java
rename to java/src/main/java/org/rocksdb/WriteBatchInterface.java
diff --git a/java/org/rocksdb/WriteBatchWithIndex.java b/java/src/main/java/org/rocksdb/WriteBatchWithIndex.java
similarity index 100%
rename from java/org/rocksdb/WriteBatchWithIndex.java
rename to java/src/main/java/org/rocksdb/WriteBatchWithIndex.java
diff --git a/java/org/rocksdb/WriteOptions.java b/java/src/main/java/org/rocksdb/WriteOptions.java
similarity index 100%
rename from java/org/rocksdb/WriteOptions.java
rename to java/src/main/java/org/rocksdb/WriteOptions.java
diff --git a/java/org/rocksdb/util/Environment.java b/java/src/main/java/org/rocksdb/util/Environment.java
similarity index 100%
rename from java/org/rocksdb/util/Environment.java
rename to java/src/main/java/org/rocksdb/util/Environment.java
diff --git a/java/org/rocksdb/util/SizeUnit.java b/java/src/main/java/org/rocksdb/util/SizeUnit.java
similarity index 100%
rename from java/org/rocksdb/util/SizeUnit.java
rename to java/src/main/java/org/rocksdb/util/SizeUnit.java