Merge pull request #391 from DropSnorz/chore/default-scanner

DropSnorz · web-flow · commit ff5ff31e46b3 · 2025-11-04T18:10:47.000+01:00
Enable OwlPlug Scanner loader by default
diff --git a/owlplug-client/src/main/java/com/owlplug/plugin/services/NativeHostService.java b/owlplug-client/src/main/java/com/owlplug/plugin/services/NativeHostService.java
@@ -45,8 +45,8 @@ public class NativeHostService extends BaseService {
 
   @PostConstruct
   private void init() {
-    pluginLoaders.add(JNINativePluginLoader.getInstance());
     pluginLoaders.add(EmbeddedScannerPluginLoader.getInstance());
+    pluginLoaders.add(JNINativePluginLoader.getInstance());
     this.fallbackLoader = DummyPluginLoader.getInstance();
     pluginLoaders.add(fallbackLoader);
 
diff --git a/owlplug-host/src/main/java/com/owlplug/host/io/ClassPathVersionUtils.java b/owlplug-host/src/main/java/com/owlplug/host/io/ClassPathVersionUtils.java
@@ -1,3 +1,21 @@
+/* OwlPlug
+ * Copyright (C) 2021 Arthur <dropsnorz@gmail.com>
+ *
+ * This file is part of OwlPlug.
+ *
+ * OwlPlug is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3
+ * as published by the Free Software Foundation.
+ *
+ * OwlPlug 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with OwlPlug.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.owlplug.host.io;
 
 import java.io.IOException;
diff --git a/owlplug-host/src/main/java/com/owlplug/host/loaders/EmbeddedScannerPluginLoader.java b/owlplug-host/src/main/java/com/owlplug/host/loaders/EmbeddedScannerPluginLoader.java
@@ -76,16 +76,6 @@ private EmbeddedScannerPluginLoader() {
     scannerId = DEFAULT_SCANNER_ID;
   }
 
-  public EmbeddedScannerPluginLoader usingScannerPath(String path) {
-    this.scannerDirectory = path;
-    return this;
-  }
-
-  public EmbeddedScannerPluginLoader usingScannerId(String scannerId) {
-    this.scannerId = scannerId;
-    return this;
-  }
-
   @Override
   public void init() {
 
@@ -135,7 +125,7 @@ public List<NativePlugin> loadPlugin(String path) {
     try {
       CommandRunner commandRunner = new CommandRunner();
       commandRunner.setTimeoutActivated(true);
-      commandRunner.setTimeout(30000); // 30 seconds timeout
+      commandRunner.setTimeout(10000); // 10 seconds timeout
       CommandResult result = commandRunner.run(scannerDirectory + SEPARATOR +  scannerId, path);
       log.debug("Response received from scanner");
       log.debug(result.getOutput());
diff --git a/owlplug-host/src/main/java/com/owlplug/host/loaders/jni/JNINativePluginLoader.java b/owlplug-host/src/main/java/com/owlplug/host/loaders/jni/JNINativePluginLoader.java
@@ -71,7 +71,7 @@ public String getName() {
 
   @Override
   public String getId() {
-    return "owlplug-jni";
+    return "owlplug-jni-legacy";
   }
 
   @Override
diff --git a/owlplug-host/src/main/java/com/owlplug/host/model/OS.java b/owlplug-host/src/main/java/com/owlplug/host/model/OS.java
@@ -1,3 +1,21 @@
+/* OwlPlug
+ * Copyright (C) 2021 Arthur <dropsnorz@gmail.com>
+ *
+ * This file is part of OwlPlug.
+ *
+ * OwlPlug is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3
+ * as published by the Free Software Foundation.
+ *
+ * OwlPlug 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with OwlPlug.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.owlplug.host.model;
 
 import java.util.Objects;

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public String getName() {`
`71`	`71`
`72`	`72`	`@Override`
`73`	`73`	`public String getId() {`
`74`		`- return "owlplug-jni";`
	`74`	`+ return "owlplug-jni-legacy";`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`@Override`