rework of loading libs, to make shaded libs possible and having more …

…fin granular controll and enable ARM support
nixxcode · Mar 15, 2016 · 89ed940 · 89ed940
1 parent 9e5e66f
commit 89ed940
Show file tree

Hide file tree

Showing 36 changed files with 85 additions and 141 deletions.
diff --git a/README.md b/README.md
@@ -83,7 +83,7 @@ For a list of supported platforms, look for released ```jbrotli-native-*``` arti
 ##### Example of regular BrotliCompressor with custom dictionary
 
 ```java
-NativeLoader.loadLibrary("brotli");
+BrotliLibraryLoader.loadBrotli();
 
 byte[] inBuf = "Brotli: a new compression algorithm for the internet. Now available for Java!".getBytes();
 byte[] compressedBuf = new byte[2048];
@@ -95,7 +95,7 @@ int outLength = compressor.compress(Brotli.DEFAULT_PARAMETER, inBuf, compressedB
 ##### Example of BrotliStreamCompressor using default dictionary
 
 ```java
-NativeLoader.loadLibrary("brotli");
+BrotliLibraryLoader.loadBrotli();
 
 byte[] inBuf = "Brotli: a new compression algorithm for the internet. Now available for Java!".getBytes();
 boolean doFlush = true;

diff --git a/jbrotli-native/darwin/build.sh → jbrotli-native/darwin-x86-amd64/build.sh b/jbrotli-native/darwin/build.sh → jbrotli-native/darwin-x86-amd64/build.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 CURPATH=$(pwd)
-TARGET_CLASSES_PATH="target/classes"
+TARGET_CLASSES_PATH="target/classes/lib/darwin-x86-amd64"
 TARGET_PATH="target"
 
 function exitWithError() {

diff --git a/jbrotli-native/darwin/pom.xml → jbrotli-native/darwin-x86-amd64/pom.xml b/jbrotli-native/darwin/pom.xml → jbrotli-native/darwin-x86-amd64/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.meteogroup.jbrotli</groupId>
-  <artifactId>jbrotli-native-darwin</artifactId>
+  <artifactId>jbrotli-native-darwin-x86-amd64</artifactId>
   <packaging>jar</packaging>
   <version>0.3.1-SNAPSHOT</version>
 
@@ -20,13 +20,6 @@
 
   <dependencies>
 
-    <dependency>
-      <groupId>org.scijava</groupId>
-      <artifactId>native-lib-loader</artifactId>
-      <version>2.1.3</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>

diff --git a/...teogroup/jbrotli/jni/LoadLibraryTest.java → ...teogroup/jbrotli/jni/LoadLibraryTest.java b/...teogroup/jbrotli/jni/LoadLibraryTest.java → ...teogroup/jbrotli/jni/LoadLibraryTest.java
@@ -16,13 +16,15 @@
 
 package org.meteogroup.jbrotli.jni;
 
-import org.scijava.nativelib.NativeLoader;
 import org.testng.annotations.Test;
 
+import java.net.URL;
+
 public class LoadLibraryTest {
 
   @Test
   public void the_library_can_be_loaded() throws Exception {
-    NativeLoader.loadLibrary("brotli");
+    URL resource = this.getClass().getResource("/lib/darwin-x86-amd64/brotli.dylib");
+    Runtime.getRuntime().load(resource.getFile());
   }
 }
diff --git a/jbrotli-native/linux-arm32-vfp-hflt/pom.xml b/jbrotli-native/linux-arm32-vfp-hflt/pom.xml
@@ -20,13 +20,6 @@
 
   <dependencies>
 
-    <dependency>
-      <groupId>org.scijava</groupId>
-      <artifactId>native-lib-loader</artifactId>
-      <version>2.1.3</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>

diff --git a/...native/linux-arm32-vfp-hflt/src/test/java/org/meteogroup/jbrotli/jni/LoadLibraryTest.java b/...native/linux-arm32-vfp-hflt/src/test/java/org/meteogroup/jbrotli/jni/LoadLibraryTest.java
@@ -16,7 +16,6 @@
 
 package org.meteogroup.jbrotli.jni;
 
-import org.scijava.nativelib.NativeLoader;
 import org.testng.annotations.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -26,6 +25,8 @@ public class LoadLibraryTest {
   @Test
   public void the_library_can_be_loaded() throws Exception {
     // because of cross compiling, we can't test here.
+//        URL resource = this.getClass().getResource("/lib/linux-x86-amd64/libbrotli.so");
+//        Runtime.getRuntime().load(resource.getFile());
     assertThat(true).isTrue();
   }
 }
diff --git a/jbrotli-native/linux-x86-amd64/build.sh b/jbrotli-native/linux-x86-amd64/build.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 CURPATH=$(pwd)
-TARGET_CLASSES_PATH="target/classes"
+TARGET_CLASSES_PATH="target/classes/lib/linux-x86-amd64"
 TARGET_PATH="target"
 
 exitWithError() {

diff --git a/jbrotli-native/linux-x86-amd64/pom.xml b/jbrotli-native/linux-x86-amd64/pom.xml
@@ -20,13 +20,6 @@
 
   <dependencies>
 
-    <dependency>
-      <groupId>org.scijava</groupId>
-      <artifactId>native-lib-loader</artifactId>
-      <version>2.1.3</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>

diff --git a/jbrotli-native/linux-x86-amd64/src/test/java/org/meteogroup/jbrotli/jni/LoadLibraryTest.java b/jbrotli-native/linux-x86-amd64/src/test/java/org/meteogroup/jbrotli/jni/LoadLibraryTest.java
@@ -16,13 +16,15 @@
 
 package org.meteogroup.jbrotli.jni;
 
-import org.scijava.nativelib.NativeLoader;
 import org.testng.annotations.Test;
 
+import java.net.URL;
+
 public class LoadLibraryTest {
 
   @Test
   public void the_library_can_be_loaded() throws Exception {
-    NativeLoader.loadLibrary("brotli");
+    URL resource = this.getClass().getResource("/lib/linux-x86-amd64/libbrotli.so");
+    Runtime.getRuntime().load(resource.getFile());
   }
 }
diff --git a/jbrotli-native/pom.xml b/jbrotli-native/pom.xml
@@ -43,14 +43,14 @@
     </profile>
 
     <profile>
-      <id>darwin</id>
+      <id>darwin-x86-amd64</id>
       <activation>
         <os>
           <family>mac</family>
         </os>
       </activation>
       <modules>
-        <module>darwin</module>
+        <module>darwin-x86-amd64</module>
       </modules>
     </profile>
 

diff --git a/jbrotli-native/win32-x86-amd64/build.bat b/jbrotli-native/win32-x86-amd64/build.bat
@@ -16,7 +16,9 @@ cd "%~dp0"
 :PREPARE_FOLDERS
 if not exist "%~dp0target" mkdir "%~dp0target"
 if not exist "%~dp0target\classes" mkdir "%~dp0target\classes"
-SET TARGET_CLASSES_PATH=%~dp0target\classes
+if not exist "%~dp0target\classes\lib" mkdir "%~dp0target\classes\lib"
+SET TARGET_CLASSES_PATH=%~dp0target\classes\lib\win32-x86-amd64
+if not exist "%TARGET_CLASSES_PATH%" mkdir "%TARGET_CLASSES_PATH%"
 
 :PREPARE_MAKEFILES
 cd "%~dp0target"
@@ -27,7 +29,7 @@ cd "%~dp0target"
 nmake || goto ERROR
 
 :COPY_DLL_FOR_MAVEN_PACKAGING
-copy /Y "%~dp0target\brotli.dll" "%TARGET_CLASSES_PATH%" || goto ERROR 
+copy /Y "%~dp0target\brotli.dll" "%TARGET_CLASSES_PATH%" || goto ERROR
 
 :ENSURE_WORKING_DIRECTORY
 cd %~dp0

diff --git a/jbrotli-native/win32-x86-amd64/pom.xml b/jbrotli-native/win32-x86-amd64/pom.xml
@@ -20,13 +20,6 @@
 
   <dependencies>
 
-    <dependency>
-      <groupId>org.scijava</groupId>
-      <artifactId>native-lib-loader</artifactId>
-      <version>2.1.3</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>

diff --git a/jbrotli-native/win32-x86/build.bat b/jbrotli-native/win32-x86/build.bat
@@ -7,7 +7,7 @@ REM Requirements
 REM --------------
 REM  o  Java 1.8 JDK installed, needs JAVA_HOME set
 REM  o  cmake 3.0 + installed and available via PATH
-REM  o  nmake installed (comes e.g. with Visual Studio), call "vcvarsall.bat x86" before to activate 64bit tools
+REM  o  nmake installed (comes e.g. with Visual Studio), call "vcvarsall.bat x86" before to activate 32bit tools
 REM
 
 :ENSURE_WORKING_DIRECTORY
@@ -16,7 +16,9 @@ cd "%~dp0"
 :PREPARE_FOLDERS
 if not exist "%~dp0target" mkdir "%~dp0target"
 if not exist "%~dp0target\classes" mkdir "%~dp0target\classes"
-SET TARGET_CLASSES_PATH=%~dp0target\classes
+if not exist "%~dp0target\classes\lib" mkdir "%~dp0target\classes\lib"
+SET TARGET_CLASSES_PATH=%~dp0target\classes\lib\win32-x86
+if not exist "%TARGET_CLASSES_PATH%" mkdir "%TARGET_CLASSES_PATH%"
 
 :PREPARE_MAKEFILES
 cd "%~dp0target"
@@ -27,7 +29,7 @@ cd "%~dp0target"
 nmake || goto ERROR
 
 :COPY_DLL_FOR_MAVEN_PACKAGING
-copy /Y "%~dp0target\brotli.dll" "%TARGET_CLASSES_PATH%" || goto ERROR 
+copy /Y "%~dp0target\brotli.dll" "%TARGET_CLASSES_PATH%" || goto ERROR
 
 :ENSURE_WORKING_DIRECTORY
 cd %~dp0

diff --git a/jbrotli-native/win32-x86/pom.xml b/jbrotli-native/win32-x86/pom.xml
@@ -20,13 +20,6 @@
 
   <dependencies>
 
-    <dependency>
-      <groupId>org.scijava</groupId>
-      <artifactId>native-lib-loader</artifactId>
-      <version>2.1.3</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>

diff --git a/jbrotli-native/win32-x86/src/test/java/org/meteogroup/jbrotli/jni/LoadLibraryTest.java b/jbrotli-native/win32-x86/src/test/java/org/meteogroup/jbrotli/jni/LoadLibraryTest.java
@@ -16,13 +16,15 @@
 
 package org.meteogroup.jbrotli.jni;
 
-import org.scijava.nativelib.NativeLoader;
 import org.testng.annotations.Test;
 
+import java.net.URL;
+
 public class LoadLibraryTest {
 
   @Test
   public void the_library_can_be_loaded() throws Exception {
-    NativeLoader.loadLibrary("brotli");
+    URL resource = this.getClass().getResource("/lib/win32-x86/brotli.dll");
+    Runtime.getRuntime().load(resource.getFile());
   }
 }
diff --git a/...erformance/src/main/java/org/meteogroup/jbrotli/performance/Brotli_vs_Gzip_Benchmark.java b/...erformance/src/main/java/org/meteogroup/jbrotli/performance/Brotli_vs_Gzip_Benchmark.java
@@ -19,6 +19,7 @@
 import org.meteogroup.jbrotli.Brotli;
 import org.meteogroup.jbrotli.BrotliCompressor;
 import org.meteogroup.jbrotli.BrotliStreamCompressor;
+import org.meteogroup.jbrotli.libloader.BrotliLibraryLoader;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.Setup;
@@ -27,7 +28,6 @@
 import org.openjdk.jmh.runner.RunnerException;
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
-import org.scijava.nativelib.NativeLoader;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -49,7 +49,7 @@ public class Brotli_vs_Gzip_Benchmark {
 
   @Setup
   public void init() throws IOException {
-    NativeLoader.loadLibrary("brotli");
+    BrotliLibraryLoader.loadBrotli();
 
     brotliParameter = new Brotli.Parameter(Brotli.Mode.GENERIC, 5, Brotli.DEFAULT_LGWIN, Brotli.DEFAULT_LGBLOCK);
 

diff --git a/jbrotli-servlet/src/main/java/org/meteogroup/jbrotli/servlet/BrotliServletFilter.java b/jbrotli-servlet/src/main/java/org/meteogroup/jbrotli/servlet/BrotliServletFilter.java
@@ -17,7 +17,7 @@
 package org.meteogroup.jbrotli.servlet;
 
 import org.meteogroup.jbrotli.Brotli;
-import org.scijava.nativelib.NativeLoader;
+import org.meteogroup.jbrotli.libloader.BrotliLibraryLoader;
 
 import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
@@ -51,8 +51,8 @@ public class BrotliServletFilter implements Filter {
   @Override
   public void init(FilterConfig filterConfig) throws ServletException {
     try {
-      NativeLoader.loadLibrary("brotli");
-    } catch (IOException e) {
+      BrotliLibraryLoader.loadBrotli();
+    } catch (UnsatisfiedLinkError | IllegalStateException | SecurityException e) {
       throw new ServletException(e);
     }
     applyFilterConfig(filterConfig);

diff --git a/...i-servlet/src/test/java/org/meteogroup/jbrotli/servlet/BrotliServletOutputStreamTest.java b/...i-servlet/src/test/java/org/meteogroup/jbrotli/servlet/BrotliServletOutputStreamTest.java
@@ -18,7 +18,7 @@
 
 import org.meteogroup.jbrotli.Brotli;
 import org.meteogroup.jbrotli.BrotliDeCompressor;
-import org.scijava.nativelib.NativeLoader;
+import org.meteogroup.jbrotli.libloader.BrotliLibraryLoader;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
@@ -35,7 +35,7 @@ public class BrotliServletOutputStreamTest {
 
   @BeforeClass
   public void loadLibrary() throws Exception {
-    NativeLoader.loadLibrary("brotli");
+    BrotliLibraryLoader.loadBrotli();
   }
 
   @BeforeMethod

diff --git a/...ervlet/src/test/java/org/meteogroup/jbrotli/servlet/BrotliServletResponseWrapperTest.java b/...ervlet/src/test/java/org/meteogroup/jbrotli/servlet/BrotliServletResponseWrapperTest.java
@@ -17,7 +17,7 @@
 package org.meteogroup.jbrotli.servlet;
 
 import org.meteogroup.jbrotli.Brotli;
-import org.scijava.nativelib.NativeLoader;
+import org.meteogroup.jbrotli.libloader.BrotliLibraryLoader;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -36,7 +36,7 @@ public class BrotliServletResponseWrapperTest {
 
   @BeforeClass
   public void loadLibrary() throws Exception {
-    NativeLoader.loadLibrary("brotli");
+    BrotliLibraryLoader.loadBrotli();
   }
 
   @BeforeMethod

diff --git a/jbrotli/pom.xml b/jbrotli/pom.xml
@@ -72,7 +72,7 @@
     </profile>
 
     <profile>
-      <id>darwin</id>
+      <id>darwin-x86-amd64</id>
       <activation>
         <os>
           <family>mac</family>
@@ -81,7 +81,7 @@
       <dependencies>
         <dependency>
           <groupId>org.meteogroup.jbrotli</groupId>
-          <artifactId>jbrotli-native-darwin</artifactId>
+          <artifactId>jbrotli-native-darwin-x86-amd64</artifactId>
           <version>${version.jbrotli.native}</version>
         </dependency>
       </dependencies>
@@ -192,12 +192,6 @@
 
   <dependencies>
 
-    <dependency>
-      <groupId>org.scijava</groupId>
-      <artifactId>native-lib-loader</artifactId>
-      <version>2.1.3</version>
-    </dependency>
-
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>

diff --git a/jbrotli/src/main/java/org/meteogroup/jbrotli/libloader/BrotliLibraryLoader.java b/jbrotli/src/main/java/org/meteogroup/jbrotli/libloader/BrotliLibraryLoader.java
@@ -16,12 +16,6 @@
 
 package org.meteogroup.jbrotli.libloader;
 
-import org.meteogroup.jbrotli.Brotli;
-import org.meteogroup.jbrotli.BrotliStreamCompressor;
-
-import java.io.*;
-import java.nio.file.Files;
-
 public class BrotliLibraryLoader {
 
   private static final String BROTLI_LIB_NAME = "brotli";
@@ -35,7 +29,6 @@ public class BrotliLibraryLoader {
    */
   public static synchronized void loadBrotli() throws UnsatisfiedLinkError, IllegalStateException, SecurityException {
     LibraryLoader libraryLoader = new LibraryLoader(BROTLI_LIB_NAME);
-    if (libraryLoader.tryAlreadyLoaded()) return;
     if (libraryLoader.trySystemLibraryLoading()) return;
     if (libraryLoader.tryLoadingFromTemporaryFolder()) return;
     String details = libraryLoader.getResult().asFormattedString();