jetty-repacked:9.4.7.v20171121

bravostudiodev · Feb 28, 2018 · 045ef0d · 045ef0d
1 parent 5856ef0
commit 045ef0d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/selenium-bravo-servlet/build.gradle b/selenium-bravo-servlet/build.gradle
@@ -23,7 +23,7 @@ repositories {
 dependencies {
     compile 'com.google.guava:guava:23.0'
     compile 'io.sterodium:sterodium-rmi:0.3'
-    compile 'org.seleniumhq.selenium:jetty-repacked:9.4.5.v20170502'
+    compile 'org.seleniumhq.selenium:jetty-repacked:9.4.7.v20171121'
     compile 'commons-io:commons-io:2.5'
     compile 'org.slf4j:slf4j-api:1.7.12'
     compile 'org.slf4j:slf4j-simple:1.7.12'

diff --git a/selenium-bravo-servlet/src/main/java/com/bravostudiodev/selenium/RuntimeJar.java b/selenium-bravo-servlet/src/main/java/com/bravostudiodev/selenium/RuntimeJar.java
@@ -8,9 +8,12 @@
 import java.net.URLClassLoader;
 import java.util.Arrays;
 import java.util.function.BiConsumer;
+import java.util.logging.Logger;
 
 public class RuntimeJar {
-    BiConsumer<String, Object> addToRmiFacade = null;
+    private static final Logger LOGGER = Logger.getLogger(SikuliScreen.class.getName());
+
+    private BiConsumer<String, Object> addToRmiFacade = null;
     public RuntimeJar(BiConsumer<String, Object> addToRmiFacade) {
         this.addToRmiFacade = addToRmiFacade;
     }
@@ -20,6 +23,7 @@ public RuntimeJar(BiConsumer<String, Object> addToRmiFacade) {
      * if the library is already loaded.
      */
     private synchronized void loadModule(String jarPath) throws TypeNotPresentException {
+        LOGGER.info("Loading module " + jarPath);
         File jar = new File(jarPath);
         try {
             /*We are using reflection here to circumvent encapsulation; addURL is not public*/
@@ -33,6 +37,7 @@ private synchronized void loadModule(String jarPath) throws TypeNotPresentExcept
             Method method = URLClassLoader.class.getDeclaredMethod("addURL", new Class[]{java.net.URL.class});
             method.setAccessible(true); /*promote the method to public access*/
             method.invoke(loader, new Object[]{url});
+            LOGGER.info("... loaded module " + jarPath);
         } catch (final NoSuchMethodException | IllegalAccessException
                 | MalformedURLException | InvocationTargetException e){
             throw new TypeNotPresentException("FAILED loading module ", e);
@@ -41,7 +46,9 @@ private synchronized void loadModule(String jarPath) throws TypeNotPresentExcept
 
     public void addRemoteInstance(String jarPath, String remoteId, String className) throws ClassNotFoundException, IllegalAccessException, InstantiationException {
         loadModule(jarPath);
+        LOGGER.info("Creating object of class " + className);
         Object obj = Class.forName(className).newInstance();
+        LOGGER.info("Registering object " + className);
         addToRmiFacade.accept(remoteId, obj);
     }
 }