diff --git a/inc/libplugin.h b/inc/libplugin.h index 6f2959d..90c61c5 100644 --- a/inc/libplugin.h +++ b/inc/libplugin.h @@ -5,7 +5,7 @@ #define DEBUG 1 -#ifdef DEBUG +#if DEBUG == 1 #define DEB(A) std::cout << A << std::endl #else #define DEB(A) ; diff --git a/runall.sh b/runall.sh index 0c8a61b..9bd6f61 100755 --- a/runall.sh +++ b/runall.sh @@ -19,9 +19,7 @@ fi make installplugins #prepare server -mkdir -p testserver/plugins/CppPlugins cp target/Cppplugin-0.1-SNAPSHOT-final.jar testserver/plugins/ -cp target/libplugin.so testserver/plugins/CppPlugins #start server cd testserver diff --git a/src/main/cpp/src/libplugin.cpp b/src/main/cpp/src/libplugin.cpp index 7d09b13..8b3e920 100644 --- a/src/main/cpp/src/libplugin.cpp +++ b/src/main/cpp/src/libplugin.cpp @@ -76,7 +76,7 @@ void load(JNIEnv* env, long data) { if(((!CPPPLUGINCLASS) + (!EVENTCLASS) + (!MAPCLASS) + (!LISTENERCLASS) //wenn eins == nullptr ist -> wird zu 1 -> endergebniss != 0 -> fehler + (!EVENTDATAF) + (!EVENTNAMEF) + (!PLUGINIDF) - + (!MAPGET) + (!MAPPUT) + (!MAPCLEAR) + (!LISTENERCONTR) + (!LISTENERSMALLCONTR)) == 0) { + + (!MAPGET) + (!MAPPUT) + (!MAPCLEAR) + (!LISTENERCONTR) + (!LISTENERSMALLCONTR)) != 0) { DEB("Error loading a information: "); DEB("find classes: " << (!!CPPPLUGINCLASS) << (!!EVENTCLASS) << (!!MAPCLASS) << (!!LISTENERCLASS)); diff --git a/src/main/java/de/mrbesen/cppplugins/CppLoader.java b/src/main/java/de/mrbesen/cppplugins/CppLoader.java index f06841c..e0155e9 100644 --- a/src/main/java/de/mrbesen/cppplugins/CppLoader.java +++ b/src/main/java/de/mrbesen/cppplugins/CppLoader.java @@ -44,7 +44,7 @@ public class CppLoader implements PluginLoader { @Override public Plugin loadPlugin(File file) throws InvalidPluginException, UnknownDependencyException { - log.info("try to load: " + file.getName()); + log.info("Loading " + file.getName()); return new CppPlugin(file, this); } diff --git a/src/main/java/de/mrbesen/cppplugins/CppPlugin.java b/src/main/java/de/mrbesen/cppplugins/CppPlugin.java index f8cae69..cf932f0 100644 --- a/src/main/java/de/mrbesen/cppplugins/CppPlugin.java +++ b/src/main/java/de/mrbesen/cppplugins/CppPlugin.java @@ -54,12 +54,8 @@ public class CppPlugin implements Plugin { } protected boolean init() { - File folder = CppPlugins.getInstance().getDataFolder(); - folder.mkdirs(); - String path = folder.getAbsolutePath() + "/libplugin.so"; - getLogger().info("load library from: " + path); try { - System.load(path); + System.loadLibrary("plugin"); //loads libplugin.so from System.getProperty("java.library.path") return init_(); } catch(UnsatisfiedLinkError e) { e.printStackTrace();