Fixes issue #77 #77

Author: miho

VRL/src/eu/mihosoft/vrl/io/VJarUtil.java

@@ -57,7 +57,9 @@
 package eu.mihosoft.vrl.io;
 
 import eu.mihosoft.vrl.system.Constants;
+import eu.mihosoft.vrl.system.PluginConfigurator;
 import eu.mihosoft.vrl.system.VParamUtil;
+import eu.mihosoft.vrl.system.WithJarFileLocationInfo;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

VRL/src/eu/mihosoft/vrl/resources/changelog/changelog.txt

@@ -1,3 +1,17 @@
+-----------------------------------------------
+Version:	v0.4.4.0.1
+Date:		Tue, 30 Oct 2018 22:33:18 +0100
+-----------------------------------------------
+
+      pluign content installation should work on linux again
+
+-----------------------------------------------
+Version:	v0.4.4.0.0
+Date:		Mon, 29 Oct 2018 14:48:57 +0100
+-----------------------------------------------
+
+      deployment prepared for release
+
 -----------------------------------------------
 Version:	v0.4.3.2.4
 Date:		Sat, 21 Apr 2018 19:42:27 +0200

VRL/src/eu/mihosoft/vrl/system/Constants.java

@@ -76,7 +76,7 @@ public class Constants {
     /**
      * VRL version number that indicates major and minor changes.
      */
-    public static final String VERSION_BASE = VERSION_MAJOR + ".0.2";
+    public static final String VERSION_BASE = VERSION_MAJOR + ".0.3";
     // "-HEAD" or "-unstable" or "" for release etc.
     public static final String VERSION_SUFFIX = "";
     // full version (base+suffix+date)

VRL/src/eu/mihosoft/vrl/system/PluginCacheEntry.java

@@ -82,7 +82,7 @@ public PluginCacheEntry() {
 
     public PluginCacheEntry(PluginConfigurator pConf) {
         configuratorClass = pConf.getClass().getName();
-        File f = VJarUtil.getClassLocation(pConf.getClass());
+        File f = VRL.getPluginJarFileLocation(pConf);
 
         jarFile = f.getName();
 

VRL/src/eu/mihosoft/vrl/system/PluginConfigurator.java

@@ -57,6 +57,7 @@
 
 import eu.mihosoft.vrl.reflection.VisualCanvas;
 import java.awt.image.BufferedImage;
+import java.io.File;
 import java.util.function.BooleanSupplier;
 
 /**
@@ -67,7 +68,7 @@
  * @see eu.mihosoft.vrl.reflection.TypeRepresentationFactory
  * @author Michael Hoffer <info@michaelhoffer.de>
  */
-public interface PluginConfigurator {
+public interface PluginConfigurator extends WithJarFileLocationInfo {
 
     /**
      * Key for accessing the "installed" property of the plugin config.
@@ -205,5 +206,6 @@ public default InitFailure checkFailure(InitPluginAPI iApi) {
      * @param message message/reason
      */
     public void failsInitIf(BooleanSupplier condition, String message);
+    
 
 }

VRL/src/eu/mihosoft/vrl/system/VPluginConfigurator.java

@@ -159,6 +159,8 @@ public abstract class VPluginConfigurator implements PluginConfigurator {
 
     private BooleanSupplier failureCondition = () -> false;
     private String failureReason = "";
+    
+    private File jarFileLocation;
 
     public VPluginConfigurator() {
     }
@@ -537,6 +539,17 @@ public void failsInitIf(BooleanSupplier condition, String message) {
         failureCondition = condition;
         failureReason = message;
     }
+    
+    @Override
+    public File getJarFileLocation() {
+        return this.jarFileLocation;
+    }
+    
+
+    @Override
+    public void setJarFileLocation(File f) {
+        this.jarFileLocation = f;
+    }
 }
 
 class AccessPolicyImpl implements AccessPolicy {
@@ -632,4 +645,5 @@ public void setAllowAll(boolean allowAll) {
     public void addClass(String className) {
         classNames.add(className);
     }
+    
 }

VRL/src/eu/mihosoft/vrl/system/VRL.java

@@ -743,7 +743,7 @@ private static boolean needsInstall(
         String installedTimestamp = config.getProperty(
                 PluginConfigurator.TIMESTAMP_KEY);
 
-        File pluginLocation = VJarUtil.getClassLocation(p.getClass());
+        File pluginLocation = getPluginJarFileLocation(p);
 
         String currentTimestamp = "" + pluginLocation.lastModified();
 
@@ -761,6 +761,27 @@ private static boolean needsInstall(
         return needsInstall;
     }
 
+    /**
+     * Returns the jar file locatino of the specified plugin. First, this 
+     * method tries to locate the plugin via {@code p.getJarFileLocation()}. If
+     * that doesn't work, the class is used to locate the jar file via
+     * {@code VJarUtil.getClassLocation(p.getClass)}.
+     * 
+     * @param p plugin
+     * @return plugin location or {@code null} if the location cannot be found
+     */
+    public static File getPluginJarFileLocation(PluginConfigurator p){
+        File pluginLocation = p.getJarFileLocation();
+        if(pluginLocation==null) {
+            try {
+                pluginLocation = VJarUtil.getClassLocation(p.getClass());
+            } catch(Exception ex) {
+                ex.printStackTrace(System.err);
+            }
+        }
+        return pluginLocation;
+    }
+
     /**
      * Calls the
      * {@link PluginConfigurator#install(eu.mihosoft.vrl.system.InitPluginAPI) }
@@ -779,7 +800,7 @@ private static boolean performConfiguratorInstall(
                 = " --> " + p.getIdentifier().getName()
                 + ": installing/updating:";
 
-        File pluginLocation = VJarUtil.getClassLocation(p.getClass());
+        File pluginLocation = getPluginJarFileLocation(p);
 
         System.out.println(msg);
 
@@ -869,7 +890,7 @@ private static void performContentInstall(String contentName,
         String archiveName = contentName + ".zip";
         File contentFolder = pD.getContentFolderByName(contentName);
 
-        File pluginLocation = VJarUtil.getClassLocation(p.getClass());
+        File pluginLocation = getPluginJarFileLocation(p);
 
         // native install
         if (needsInstall(p, pD)
@@ -1364,9 +1385,12 @@ static void addPlugin(final PluginConfigurator plugin, File f) {
         allPlugins.add(plugin);
 
         if (registeredPlugin != null) {
+            
+            File regPFile = getPluginJarFileLocation(registeredPlugin);
+            File pFile = getPluginJarFileLocation(plugin);
 
-            String regPluginPath = VJarUtil.getClassLocation(registeredPlugin.getClass()).getAbsolutePath();
-            String pluginPath = VJarUtil.getClassLocation(plugin.getClass()).getAbsolutePath();
+            String regPluginPath = regPFile==null?"<path not found>":regPFile.getAbsolutePath();
+            String pluginPath = pFile==null?"<pasth not found>":pFile.getAbsolutePath();
 
             if (regPluginPath.equals(pluginPath)) {
 //              TODO
@@ -1387,9 +1411,9 @@ static void addPlugin(final PluginConfigurator plugin, File f) {
                         + registeredPlugin.getIdentifier()
                         + "\". <br>"
                         + "Please see <br>\""
-                        + VJarUtil.getClassLocation(plugin.getClass()).getAbsolutePath()
+                        + pluginPath
                         + "\" and <br> \""
-                        + VJarUtil.getClassLocation(registeredPlugin.getClass()).getAbsolutePath()
+                        + regPluginPath
                         + "\".";
 
                 if (registrationError != null) {
@@ -1535,6 +1559,13 @@ private static void loadPlugin(File f, PluginLoadAction pA,
 
                             PluginConfigurator pC
                                     = (PluginConfigurator) cls.newInstance();
+                            
+                            try {
+                                // File jarfoileLocation = VJarUtil.getClassLocation(cls);
+                                pC.setJarFileLocation(f);
+                            } catch (Exception ex) {
+                                throw new RuntimeException("Cannot locate jar file", ex);
+                            }
 
                             if (platformSupported) {
                                 pA.loaded(pC);
@@ -1715,8 +1746,9 @@ static File addNativesPath(
             PluginConfigurator p,
             PluginDataController dC,
             boolean disableLibLoad) {
+        
 
-        File f = VJarUtil.getClassLocation(p.getClass());
+        File f = getPluginJarFileLocation(p);
 
         if (!providesContent(PluginDataController.NATIVELIB, f)) {
             return null;

VRL/src/eu/mihosoft/vrl/system/WithJarFileLocationInfo.java

@@ -0,0 +1,84 @@
+/* 
+ * WithJarFileLocationInfo.java
+ * 
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2007–2018 by Michael Hoffer,
+ * Copyright (c) 2015–2018 G-CSC, Uni Frankfurt,
+ * Copyright (c) 2009–2015 Steinbeis Forschungszentrum (STZ Ölbronn)
+ * 
+ * This file is part of Visual Reflection Library (VRL).
+ *
+ * VRL is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * as published by the Free Software Foundation.
+ * 
+ * see: http://opensource.org/licenses/LGPL-3.0
+ *      file://path/to/VRL/src/eu/mihosoft/vrl/resources/license/lgplv3.txt
+ *
+ * VRL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * This version of VRL includes copyright notice and attribution requirements.
+ * According to the LGPL this information must be displayed even if you modify
+ * the source code of VRL. Neither the VRL Canvas attribution icon nor any
+ * copyright statement/attribution may be removed.
+ *
+ * Attribution Requirements:
+ *
+ * If you create derived work you must do three things regarding copyright
+ * notice and author attribution.
+ *
+ * First, the following text must be displayed on the Canvas:
+ * "based on VRL source code". In this case the VRL canvas icon must be removed.
+ * 
+ * Second, the copyright notice must remain. It must be reproduced in any
+ * program that uses VRL.
+ *
+ * Third, add an additional notice, stating that you modified VRL. A suitable
+ * notice might read
+ * "VRL source code modified by YourName 2012".
+ * 
+ * Note, that these requirements are in full accordance with the LGPL v3
+ * (see 7. Additional Terms, b).
+ *
+ * Please cite the publication(s) listed below.
+ *
+ * Publications:
+ *
+ * M. Hoffer, C. Poliwoda, & G. Wittum. (2013). Visual reflection library:
+ * a framework for declarative GUI programming on the Java platform.
+ * Computing and Visualization in Science, 2013, 16(4),
+ * 181–192. http://doi.org/10.1007/s00791-014-0230-y
+ */
+package eu.mihosoft.vrl.system;
+
+import java.io.File;
+
+/**
+ *
+ * @author Michael Hoffer <info@michaelhoffer.de>
+ */
+public interface WithJarFileLocationInfo {
+    
+    /**
+     * Retuens the Jar file location of this plugin (only works if the plugin 
+     * has been loaded from the local file system).
+     * 
+     * @return jar file location
+     */
+    default File getJarFileLocation() {
+        return null;
+    }
+    
+    /**
+     * Sets the jar file location of this plugin 
+     * (this method shouldn't be called by the plugin itself)
+     * @param f file to set
+     */
+    default void setJarFileLocation(File f) {
+        throw new UnsupportedOperationException("setPluginJarLocation is not supported.");
+    }
+}