diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fc368f3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +# Eclipse +.classpath +.project +.settings/ + +# Intellij +.idea/ +*.iml +*.iws + +# Mac +.DS_Store + +# Maven +log/ +target/ diff --git a/dist/junit-4.9b2.jar b/dist/junit-4.9b2.jar deleted file mode 100644 index aec30a0..0000000 Binary files a/dist/junit-4.9b2.jar and /dev/null differ diff --git a/dist/slf4j-api-1.6.4.jar b/dist/slf4j-api-1.6.4.jar deleted file mode 100644 index 4d23f41..0000000 Binary files a/dist/slf4j-api-1.6.4.jar and /dev/null differ diff --git a/dist/slf4j-simple-1.6.4.jar b/dist/slf4j-simple-1.6.4.jar deleted file mode 100644 index 3d1b8d9..0000000 Binary files a/dist/slf4j-simple-1.6.4.jar and /dev/null differ diff --git a/pom.xml b/pom.xml new file mode 100755 index 0000000..1f7511d --- /dev/null +++ b/pom.xml @@ -0,0 +1,51 @@ + + + 4.0.0 + + com.googlecode.jvcdiff + jvcdiff + 0.1-SNAPSHOT + jar + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.5.1 + + 1.6 + 1.6 + + + + + + + + org.slf4j + slf4j-api + 1.7.21 + + + + org.slf4j + slf4j-simple + 1.7.21 + test + + + + junit + junit + 4.12 + test + + + + \ No newline at end of file diff --git a/src/com/googlecode/jvcdiff/BlockHash.java b/src/main/java/com/googlecode/jvcdiff/BlockHash.java similarity index 100% rename from src/com/googlecode/jvcdiff/BlockHash.java rename to src/main/java/com/googlecode/jvcdiff/BlockHash.java diff --git a/src/com/googlecode/jvcdiff/CodeTableWriterInterface.java b/src/main/java/com/googlecode/jvcdiff/CodeTableWriterInterface.java similarity index 100% rename from src/com/googlecode/jvcdiff/CodeTableWriterInterface.java rename to src/main/java/com/googlecode/jvcdiff/CodeTableWriterInterface.java diff --git a/src/com/googlecode/jvcdiff/JSONCodeTableWriter.java b/src/main/java/com/googlecode/jvcdiff/JSONCodeTableWriter.java similarity index 100% rename from src/com/googlecode/jvcdiff/JSONCodeTableWriter.java rename to src/main/java/com/googlecode/jvcdiff/JSONCodeTableWriter.java diff --git a/src/com/googlecode/jvcdiff/RollingHash.java b/src/main/java/com/googlecode/jvcdiff/RollingHash.java similarity index 100% rename from src/com/googlecode/jvcdiff/RollingHash.java rename to src/main/java/com/googlecode/jvcdiff/RollingHash.java diff --git a/src/com/googlecode/jvcdiff/VCDiffAddressCache.java b/src/main/java/com/googlecode/jvcdiff/VCDiffAddressCache.java similarity index 100% rename from src/com/googlecode/jvcdiff/VCDiffAddressCache.java rename to src/main/java/com/googlecode/jvcdiff/VCDiffAddressCache.java diff --git a/src/com/googlecode/jvcdiff/VCDiffAddressCacheImpl.java b/src/main/java/com/googlecode/jvcdiff/VCDiffAddressCacheImpl.java similarity index 100% rename from src/com/googlecode/jvcdiff/VCDiffAddressCacheImpl.java rename to src/main/java/com/googlecode/jvcdiff/VCDiffAddressCacheImpl.java diff --git a/src/com/googlecode/jvcdiff/VCDiffCodeTableData.java b/src/main/java/com/googlecode/jvcdiff/VCDiffCodeTableData.java similarity index 100% rename from src/com/googlecode/jvcdiff/VCDiffCodeTableData.java rename to src/main/java/com/googlecode/jvcdiff/VCDiffCodeTableData.java diff --git a/src/com/googlecode/jvcdiff/VCDiffCodeTableReader.java b/src/main/java/com/googlecode/jvcdiff/VCDiffCodeTableReader.java similarity index 100% rename from src/com/googlecode/jvcdiff/VCDiffCodeTableReader.java rename to src/main/java/com/googlecode/jvcdiff/VCDiffCodeTableReader.java diff --git a/src/com/googlecode/jvcdiff/VCDiffCodeTableWriter.java b/src/main/java/com/googlecode/jvcdiff/VCDiffCodeTableWriter.java similarity index 100% rename from src/com/googlecode/jvcdiff/VCDiffCodeTableWriter.java rename to src/main/java/com/googlecode/jvcdiff/VCDiffCodeTableWriter.java diff --git a/src/com/googlecode/jvcdiff/VCDiffEngine.java b/src/main/java/com/googlecode/jvcdiff/VCDiffEngine.java similarity index 100% rename from src/com/googlecode/jvcdiff/VCDiffEngine.java rename to src/main/java/com/googlecode/jvcdiff/VCDiffEngine.java diff --git a/src/com/googlecode/jvcdiff/VCDiffFormatExtensionFlags.java b/src/main/java/com/googlecode/jvcdiff/VCDiffFormatExtensionFlags.java similarity index 100% rename from src/com/googlecode/jvcdiff/VCDiffFormatExtensionFlags.java rename to src/main/java/com/googlecode/jvcdiff/VCDiffFormatExtensionFlags.java diff --git a/src/com/googlecode/jvcdiff/VCDiffInstructionMap.java b/src/main/java/com/googlecode/jvcdiff/VCDiffInstructionMap.java similarity index 100% rename from src/com/googlecode/jvcdiff/VCDiffInstructionMap.java rename to src/main/java/com/googlecode/jvcdiff/VCDiffInstructionMap.java diff --git a/src/com/googlecode/jvcdiff/VarInt.java b/src/main/java/com/googlecode/jvcdiff/VarInt.java similarity index 100% rename from src/com/googlecode/jvcdiff/VarInt.java rename to src/main/java/com/googlecode/jvcdiff/VarInt.java diff --git a/src/com/googlecode/jvcdiff/codec/DeltaFileHeader.java b/src/main/java/com/googlecode/jvcdiff/codec/DeltaFileHeader.java similarity index 100% rename from src/com/googlecode/jvcdiff/codec/DeltaFileHeader.java rename to src/main/java/com/googlecode/jvcdiff/codec/DeltaFileHeader.java diff --git a/src/com/googlecode/jvcdiff/codec/VCDiffDecoder.java b/src/main/java/com/googlecode/jvcdiff/codec/VCDiffDecoder.java similarity index 100% rename from src/com/googlecode/jvcdiff/codec/VCDiffDecoder.java rename to src/main/java/com/googlecode/jvcdiff/codec/VCDiffDecoder.java diff --git a/src/com/googlecode/jvcdiff/codec/VCDiffDeltaFileWindow.java b/src/main/java/com/googlecode/jvcdiff/codec/VCDiffDeltaFileWindow.java similarity index 100% rename from src/com/googlecode/jvcdiff/codec/VCDiffDeltaFileWindow.java rename to src/main/java/com/googlecode/jvcdiff/codec/VCDiffDeltaFileWindow.java diff --git a/src/com/googlecode/jvcdiff/codec/VCDiffHeaderParser.java b/src/main/java/com/googlecode/jvcdiff/codec/VCDiffHeaderParser.java similarity index 100% rename from src/com/googlecode/jvcdiff/codec/VCDiffHeaderParser.java rename to src/main/java/com/googlecode/jvcdiff/codec/VCDiffHeaderParser.java diff --git a/src/com/googlecode/jvcdiff/codec/VCDiffStreamingDecoder.java b/src/main/java/com/googlecode/jvcdiff/codec/VCDiffStreamingDecoder.java similarity index 100% rename from src/com/googlecode/jvcdiff/codec/VCDiffStreamingDecoder.java rename to src/main/java/com/googlecode/jvcdiff/codec/VCDiffStreamingDecoder.java diff --git a/src/com/googlecode/jvcdiff/codec/VCDiffStreamingDecoderImpl.java b/src/main/java/com/googlecode/jvcdiff/codec/VCDiffStreamingDecoderImpl.java similarity index 100% rename from src/com/googlecode/jvcdiff/codec/VCDiffStreamingDecoderImpl.java rename to src/main/java/com/googlecode/jvcdiff/codec/VCDiffStreamingDecoderImpl.java diff --git a/src/com/googlecode/jvcdiff/mina_buffer/AbstractIoBuffer.java b/src/main/java/com/googlecode/jvcdiff/mina_buffer/AbstractIoBuffer.java similarity index 100% rename from src/com/googlecode/jvcdiff/mina_buffer/AbstractIoBuffer.java rename to src/main/java/com/googlecode/jvcdiff/mina_buffer/AbstractIoBuffer.java diff --git a/src/com/googlecode/jvcdiff/mina_buffer/BufferDataException.java b/src/main/java/com/googlecode/jvcdiff/mina_buffer/BufferDataException.java similarity index 100% rename from src/com/googlecode/jvcdiff/mina_buffer/BufferDataException.java rename to src/main/java/com/googlecode/jvcdiff/mina_buffer/BufferDataException.java diff --git a/src/com/googlecode/jvcdiff/mina_buffer/CachedBufferAllocator.java b/src/main/java/com/googlecode/jvcdiff/mina_buffer/CachedBufferAllocator.java similarity index 100% rename from src/com/googlecode/jvcdiff/mina_buffer/CachedBufferAllocator.java rename to src/main/java/com/googlecode/jvcdiff/mina_buffer/CachedBufferAllocator.java diff --git a/src/com/googlecode/jvcdiff/mina_buffer/IoBuffer.java b/src/main/java/com/googlecode/jvcdiff/mina_buffer/IoBuffer.java similarity index 100% rename from src/com/googlecode/jvcdiff/mina_buffer/IoBuffer.java rename to src/main/java/com/googlecode/jvcdiff/mina_buffer/IoBuffer.java diff --git a/src/com/googlecode/jvcdiff/mina_buffer/IoBufferAllocator.java b/src/main/java/com/googlecode/jvcdiff/mina_buffer/IoBufferAllocator.java similarity index 100% rename from src/com/googlecode/jvcdiff/mina_buffer/IoBufferAllocator.java rename to src/main/java/com/googlecode/jvcdiff/mina_buffer/IoBufferAllocator.java diff --git a/src/com/googlecode/jvcdiff/mina_buffer/IoBufferHexDumper.java b/src/main/java/com/googlecode/jvcdiff/mina_buffer/IoBufferHexDumper.java similarity index 100% rename from src/com/googlecode/jvcdiff/mina_buffer/IoBufferHexDumper.java rename to src/main/java/com/googlecode/jvcdiff/mina_buffer/IoBufferHexDumper.java diff --git a/src/com/googlecode/jvcdiff/mina_buffer/SimpleBufferAllocator.java b/src/main/java/com/googlecode/jvcdiff/mina_buffer/SimpleBufferAllocator.java similarity index 100% rename from src/com/googlecode/jvcdiff/mina_buffer/SimpleBufferAllocator.java rename to src/main/java/com/googlecode/jvcdiff/mina_buffer/SimpleBufferAllocator.java diff --git a/src/com/googlecode/jvcdiff/BlockHashTest.java b/src/test/java/com/googlecode/jvcdiff/BlockHashTest.java similarity index 100% rename from src/com/googlecode/jvcdiff/BlockHashTest.java rename to src/test/java/com/googlecode/jvcdiff/BlockHashTest.java diff --git a/src/com/googlecode/jvcdiff/JSONCodeTableWriterTest.java b/src/test/java/com/googlecode/jvcdiff/JSONCodeTableWriterTest.java similarity index 100% rename from src/com/googlecode/jvcdiff/JSONCodeTableWriterTest.java rename to src/test/java/com/googlecode/jvcdiff/JSONCodeTableWriterTest.java diff --git a/src/com/googlecode/jvcdiff/RollingHashTest.java b/src/test/java/com/googlecode/jvcdiff/RollingHashTest.java similarity index 100% rename from src/com/googlecode/jvcdiff/RollingHashTest.java rename to src/test/java/com/googlecode/jvcdiff/RollingHashTest.java diff --git a/src/com/googlecode/jvcdiff/VCDiffAddressCacheTest.java b/src/test/java/com/googlecode/jvcdiff/VCDiffAddressCacheTest.java similarity index 100% rename from src/com/googlecode/jvcdiff/VCDiffAddressCacheTest.java rename to src/test/java/com/googlecode/jvcdiff/VCDiffAddressCacheTest.java diff --git a/src/com/googlecode/jvcdiff/VCDiffCodeTableDataTest.java b/src/test/java/com/googlecode/jvcdiff/VCDiffCodeTableDataTest.java similarity index 100% rename from src/com/googlecode/jvcdiff/VCDiffCodeTableDataTest.java rename to src/test/java/com/googlecode/jvcdiff/VCDiffCodeTableDataTest.java diff --git a/src/com/googlecode/jvcdiff/VCDiffCodeTableReaderTest.java b/src/test/java/com/googlecode/jvcdiff/VCDiffCodeTableReaderTest.java similarity index 100% rename from src/com/googlecode/jvcdiff/VCDiffCodeTableReaderTest.java rename to src/test/java/com/googlecode/jvcdiff/VCDiffCodeTableReaderTest.java diff --git a/src/com/googlecode/jvcdiff/VCDiffCodeTableWriterTest.java b/src/test/java/com/googlecode/jvcdiff/VCDiffCodeTableWriterTest.java similarity index 100% rename from src/com/googlecode/jvcdiff/VCDiffCodeTableWriterTest.java rename to src/test/java/com/googlecode/jvcdiff/VCDiffCodeTableWriterTest.java diff --git a/src/com/googlecode/jvcdiff/VCDiffEngineTest.java b/src/test/java/com/googlecode/jvcdiff/VCDiffEngineTest.java similarity index 100% rename from src/com/googlecode/jvcdiff/VCDiffEngineTest.java rename to src/test/java/com/googlecode/jvcdiff/VCDiffEngineTest.java diff --git a/src/com/googlecode/jvcdiff/VCDiffInstructionMapTest.java b/src/test/java/com/googlecode/jvcdiff/VCDiffInstructionMapTest.java similarity index 100% rename from src/com/googlecode/jvcdiff/VCDiffInstructionMapTest.java rename to src/test/java/com/googlecode/jvcdiff/VCDiffInstructionMapTest.java diff --git a/src/com/googlecode/jvcdiff/VarIntTest.java b/src/test/java/com/googlecode/jvcdiff/VarIntTest.java similarity index 100% rename from src/com/googlecode/jvcdiff/VarIntTest.java rename to src/test/java/com/googlecode/jvcdiff/VarIntTest.java