diff options
author | Eugene Kliuchnikov <eustas@google.com> | 2017-02-28 16:59:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-28 16:59:52 +0100 |
commit | c931e576d2a7ae3dba9a7fc369895e3d31bb3f8b (patch) | |
tree | aa06e917be17ea9d8c9d705009c18b100aa1de0c /java | |
parent | aaac88a1e0165676c27ec11cc675dc49a93dfa35 (diff) | |
download | brotli-c931e576d2a7ae3dba9a7fc369895e3d31bb3f8b.zip brotli-c931e576d2a7ae3dba9a7fc369895e3d31bb3f8b.tar.gz brotli-c931e576d2a7ae3dba9a7fc369895e3d31bb3f8b.tar.bz2 |
Move `java/` to `java/org/brotli/` to fix `sources.jar` structure (#517)
Also added man pages to `docs/`
Diffstat (limited to 'java')
-rwxr-xr-x | java/org/brotli/dec/BUILD (renamed from java/dec/BUILD) | 0 | ||||
-rwxr-xr-x | java/org/brotli/dec/BitReader.java (renamed from java/dec/BitReader.java) | 0 | ||||
-rwxr-xr-x | java/org/brotli/dec/BitReaderTest.java (renamed from java/dec/BitReaderTest.java) | 0 | ||||
-rwxr-xr-x | java/org/brotli/dec/BrotliInputStream.java (renamed from java/dec/BrotliInputStream.java) | 0 | ||||
-rwxr-xr-x | java/org/brotli/dec/BrotliRuntimeException.java (renamed from java/dec/BrotliRuntimeException.java) | 0 | ||||
-rwxr-xr-x | java/org/brotli/dec/Context.java (renamed from java/dec/Context.java) | 0 | ||||
-rwxr-xr-x | java/org/brotli/dec/Decode.java (renamed from java/dec/Decode.java) | 0 | ||||
-rwxr-xr-x | java/org/brotli/dec/DecodeTest.java (renamed from java/dec/DecodeTest.java) | 0 | ||||
-rwxr-xr-x | java/org/brotli/dec/Dictionary.java (renamed from java/dec/Dictionary.java) | 0 | ||||
-rwxr-xr-x | java/org/brotli/dec/DictionaryTest.java (renamed from java/dec/DictionaryTest.java) | 0 | ||||
-rwxr-xr-x | java/org/brotli/dec/Huffman.java (renamed from java/dec/Huffman.java) | 0 | ||||
-rwxr-xr-x | java/org/brotli/dec/HuffmanTreeGroup.java (renamed from java/dec/HuffmanTreeGroup.java) | 0 | ||||
-rwxr-xr-x | java/org/brotli/dec/Prefix.java (renamed from java/dec/Prefix.java) | 0 | ||||
-rwxr-xr-x | java/org/brotli/dec/RunningState.java (renamed from java/dec/RunningState.java) | 0 | ||||
-rwxr-xr-x | java/org/brotli/dec/State.java (renamed from java/dec/State.java) | 0 | ||||
-rwxr-xr-x | java/org/brotli/dec/SynthTest.java (renamed from java/dec/SynthTest.java) | 0 | ||||
-rwxr-xr-x | java/org/brotli/dec/Transform.java (renamed from java/dec/Transform.java) | 0 | ||||
-rwxr-xr-x | java/org/brotli/dec/TransformTest.java (renamed from java/dec/TransformTest.java) | 0 | ||||
-rwxr-xr-x | java/org/brotli/dec/Utils.java (renamed from java/dec/Utils.java) | 0 | ||||
-rwxr-xr-x | java/org/brotli/dec/WordTransformType.java (renamed from java/dec/WordTransformType.java) | 0 | ||||
-rwxr-xr-x | java/org/brotli/dec/pom.xml (renamed from java/dec/pom.xml) | 12 | ||||
-rwxr-xr-x | java/org/brotli/integration/BUILD (renamed from java/integration/BUILD) | 6 | ||||
-rwxr-xr-x | java/org/brotli/integration/BundleChecker.java (renamed from java/integration/BundleChecker.java) | 0 | ||||
-rwxr-xr-x | java/org/brotli/integration/fuzz_data.zip (renamed from java/integration/fuzz_data.zip) | bin | 23854 -> 23854 bytes | |||
-rwxr-xr-x | java/org/brotli/integration/pom.xml (renamed from java/integration/pom.xml) | 0 | ||||
-rwxr-xr-x | java/org/brotli/integration/test_data.zip (renamed from java/integration/test_data.zip) | bin | 2827113 -> 2827113 bytes | |||
-rwxr-xr-x | java/org/brotli/pom.xml (renamed from java/pom.xml) | 0 |
27 files changed, 11 insertions, 7 deletions
diff --git a/java/dec/BUILD b/java/org/brotli/dec/BUILD index 8b1c9f3..8b1c9f3 100755 --- a/java/dec/BUILD +++ b/java/org/brotli/dec/BUILD diff --git a/java/dec/BitReader.java b/java/org/brotli/dec/BitReader.java index 13ab9c4..13ab9c4 100755 --- a/java/dec/BitReader.java +++ b/java/org/brotli/dec/BitReader.java diff --git a/java/dec/BitReaderTest.java b/java/org/brotli/dec/BitReaderTest.java index 9577c62..9577c62 100755 --- a/java/dec/BitReaderTest.java +++ b/java/org/brotli/dec/BitReaderTest.java diff --git a/java/dec/BrotliInputStream.java b/java/org/brotli/dec/BrotliInputStream.java index 9117d9b..9117d9b 100755 --- a/java/dec/BrotliInputStream.java +++ b/java/org/brotli/dec/BrotliInputStream.java diff --git a/java/dec/BrotliRuntimeException.java b/java/org/brotli/dec/BrotliRuntimeException.java index 8e0d4a4..8e0d4a4 100755 --- a/java/dec/BrotliRuntimeException.java +++ b/java/org/brotli/dec/BrotliRuntimeException.java diff --git a/java/dec/Context.java b/java/org/brotli/dec/Context.java index a604f7c..a604f7c 100755 --- a/java/dec/Context.java +++ b/java/org/brotli/dec/Context.java diff --git a/java/dec/Decode.java b/java/org/brotli/dec/Decode.java index d7d3bf0..d7d3bf0 100755 --- a/java/dec/Decode.java +++ b/java/org/brotli/dec/Decode.java diff --git a/java/dec/DecodeTest.java b/java/org/brotli/dec/DecodeTest.java index 18546c1..18546c1 100755 --- a/java/dec/DecodeTest.java +++ b/java/org/brotli/dec/DecodeTest.java diff --git a/java/dec/Dictionary.java b/java/org/brotli/dec/Dictionary.java index a7f13ce..a7f13ce 100755 --- a/java/dec/Dictionary.java +++ b/java/org/brotli/dec/Dictionary.java diff --git a/java/dec/DictionaryTest.java b/java/org/brotli/dec/DictionaryTest.java index eb0b46e..eb0b46e 100755 --- a/java/dec/DictionaryTest.java +++ b/java/org/brotli/dec/DictionaryTest.java diff --git a/java/dec/Huffman.java b/java/org/brotli/dec/Huffman.java index e6aceef..e6aceef 100755 --- a/java/dec/Huffman.java +++ b/java/org/brotli/dec/Huffman.java diff --git a/java/dec/HuffmanTreeGroup.java b/java/org/brotli/dec/HuffmanTreeGroup.java index 3b1c82f..3b1c82f 100755 --- a/java/dec/HuffmanTreeGroup.java +++ b/java/org/brotli/dec/HuffmanTreeGroup.java diff --git a/java/dec/Prefix.java b/java/org/brotli/dec/Prefix.java index 6ca0758..6ca0758 100755 --- a/java/dec/Prefix.java +++ b/java/org/brotli/dec/Prefix.java diff --git a/java/dec/RunningState.java b/java/org/brotli/dec/RunningState.java index 4fe22be..4fe22be 100755 --- a/java/dec/RunningState.java +++ b/java/org/brotli/dec/RunningState.java diff --git a/java/dec/State.java b/java/org/brotli/dec/State.java index 3da3358..3da3358 100755 --- a/java/dec/State.java +++ b/java/org/brotli/dec/State.java diff --git a/java/dec/SynthTest.java b/java/org/brotli/dec/SynthTest.java index e4b065d..e4b065d 100755 --- a/java/dec/SynthTest.java +++ b/java/org/brotli/dec/SynthTest.java diff --git a/java/dec/Transform.java b/java/org/brotli/dec/Transform.java index ecfef45..ecfef45 100755 --- a/java/dec/Transform.java +++ b/java/org/brotli/dec/Transform.java diff --git a/java/dec/TransformTest.java b/java/org/brotli/dec/TransformTest.java index f83d4b4..f83d4b4 100755 --- a/java/dec/TransformTest.java +++ b/java/org/brotli/dec/TransformTest.java diff --git a/java/dec/Utils.java b/java/org/brotli/dec/Utils.java index b2eb2e8..b2eb2e8 100755 --- a/java/dec/Utils.java +++ b/java/org/brotli/dec/Utils.java diff --git a/java/dec/WordTransformType.java b/java/org/brotli/dec/WordTransformType.java index 357b978..357b978 100755 --- a/java/dec/WordTransformType.java +++ b/java/org/brotli/dec/WordTransformType.java diff --git a/java/dec/pom.xml b/java/org/brotli/dec/pom.xml index 4d4935c..36a9069 100755 --- a/java/dec/pom.xml +++ b/java/org/brotli/dec/pom.xml @@ -14,18 +14,21 @@ <name>${project.groupId}:${project.artifactId}</name> <build> - <sourceDirectory>.</sourceDirectory> - <testSourceDirectory>.</testSourceDirectory> + <sourceDirectory>../../..</sourceDirectory> + <testSourceDirectory>../../..</testSourceDirectory> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> + <includes> + <include>**/dec/*.java</include> + </includes> <excludes> <exclude>**/*Test*.java</exclude> </excludes> <testIncludes> - <include>**/*Test*.java</include> + <include>**/dec/*Test*.java</include> </testIncludes> </configuration> </plugin> @@ -42,7 +45,7 @@ </goals> <configuration> <includes> - <include>**/*.java</include> + <include>**/dec/*.java</include> </includes> <excludes> <exclude>**/*Test*.java</exclude> @@ -63,6 +66,7 @@ <goal>jar</goal> </goals> <configuration> + <sourcepath>.</sourcepath> <sourceFileExcludes> <exclude>**/*Test*.java</exclude> </sourceFileExcludes> diff --git a/java/integration/BUILD b/java/org/brotli/integration/BUILD index 9171e9e..6c1bc48 100755 --- a/java/integration/BUILD +++ b/java/org/brotli/integration/BUILD @@ -4,7 +4,7 @@ java_library( name = "bundle_checker_lib", srcs = ["BundleChecker.java"], - deps = ["//java/dec:lib"], + deps = ["//java/org/brotli/dec:lib"], ) java_binary( @@ -15,7 +15,7 @@ java_binary( java_test( name = "bundle_checker_data_test", - args = ["java/integration/test_data.zip"], + args = ["java/org/brotli/integration/test_data.zip"], data = ["test_data.zip"], main_class = "org.brotli.integration.BundleChecker", use_testrunner = 0, @@ -26,7 +26,7 @@ java_test( name = "bundle_checker_fuzz_test", args = [ "-s", - "java/integration/fuzz_data.zip" + "java/org/brotli/integration/fuzz_data.zip" ], data = ["fuzz_data.zip"], main_class = "org.brotli.integration.BundleChecker", diff --git a/java/integration/BundleChecker.java b/java/org/brotli/integration/BundleChecker.java index 435773f..435773f 100755 --- a/java/integration/BundleChecker.java +++ b/java/org/brotli/integration/BundleChecker.java diff --git a/java/integration/fuzz_data.zip b/java/org/brotli/integration/fuzz_data.zip Binary files differindex 7a7eeda..7a7eeda 100755 --- a/java/integration/fuzz_data.zip +++ b/java/org/brotli/integration/fuzz_data.zip diff --git a/java/integration/pom.xml b/java/org/brotli/integration/pom.xml index 2858a12..2858a12 100755 --- a/java/integration/pom.xml +++ b/java/org/brotli/integration/pom.xml diff --git a/java/integration/test_data.zip b/java/org/brotli/integration/test_data.zip Binary files differindex b31ccce..b31ccce 100755 --- a/java/integration/test_data.zip +++ b/java/org/brotli/integration/test_data.zip diff --git a/java/pom.xml b/java/org/brotli/pom.xml index bb4a5a3..bb4a5a3 100755 --- a/java/pom.xml +++ b/java/org/brotli/pom.xml |