From 5b7f60e3c2d17e362d05453005ac38f7a8f76c25 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Mon, 5 Oct 2020 01:31:47 +0200
Subject: [PATCH] Updated Zutil changes

---
 WebAdmin.iml                              | 3 ++-
 src/wa/server/WAConstants.java            | 7 +++----
 src/wa/server/WAContext.java              | 3 +++
 src/wa/server/page/ServiceStatusPage.java | 3 ++-
 src/wa/server/page/WAPage.java            | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/WebAdmin.iml b/WebAdmin.iml
index bd86e14..2d866e1 100755
--- a/WebAdmin.iml
+++ b/WebAdmin.iml
@@ -12,7 +12,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="Zutil" exported="" />
     <orderEntry type="module-library">
       <library name="lib">
         <CLASSES>
@@ -26,5 +25,7 @@
         <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
       </library>
     </orderEntry>
+    <orderEntry type="library" name="Maven: se.koc:zutil:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="module" module-name="Zutil.main" />
   </component>
 </module>
\ No newline at end of file
diff --git a/src/wa/server/WAConstants.java b/src/wa/server/WAConstants.java
index 2e9d548..e5aa931 100755
--- a/src/wa/server/WAConstants.java
+++ b/src/wa/server/WAConstants.java
@@ -1,6 +1,5 @@
 package wa.server;
 
-import zutil.db.DBConnection;
 import zutil.osal.OSAbstractionLayer;
 import zutil.osal.OSAbstractionLayer.OSType;
 
@@ -12,9 +11,9 @@ public class WAConstants {
     public static final String DB_DEFAULT_FILE = "webadmin_default.db";
 	public static final String DB_TABLE_PREFIX = "wa";
 
-	public static final String WA_ROOT_PATH_LINUX   = "/";
-	public static final String WA_ROOT_PATH_WINDOWS = "C:\\webadmin\\";
-	public static final String WA_BASE_CONFIG_PATH   = "etc/webadmin/";
+	public static final String WA_ROOT_PATH_LINUX   = "./";
+	public static final String WA_ROOT_PATH_WINDOWS = "./";  //C:\\webadmin\\";
+	public static final String WA_BASE_CONFIG_PATH  = "./";  //"etc/webadmin/";
     private static final File configPath;
 
 	public static final String WA_SSL_CERT = "cert/server.crt";
diff --git a/src/wa/server/WAContext.java b/src/wa/server/WAContext.java
index 99961a9..5c62d79 100755
--- a/src/wa/server/WAContext.java
+++ b/src/wa/server/WAContext.java
@@ -95,11 +95,14 @@ public class WAContext {
             File defDbFile = WAConstants.getConfigFile(WAConstants.DB_DEFAULT_FILE);
             if (!defDbFile.exists())
                 throw new NoSuchFileException("Deafult DB missing: "+defDbFile.getAbsolutePath());
+
             db = new DBConnection(DBConnection.DBMS.SQLite, dbFile.getAbsolutePath());
             DBConnection defaultDB = new DBConnection(DBConnection.DBMS.SQLite, defDbFile.getAbsolutePath());
+
             int defaultDBVersion = Integer.parseInt(getConfig(defaultDB, CONFIG_DB_VERSION));
             int dbVersion = Integer.parseInt(getConfig(db, CONFIG_DB_VERSION));
             logger.info("DB version: "+ dbVersion);
+
             if(defaultDBVersion > dbVersion ) {
                 logger.info("Starting DB upgrade...");
                 if (dbFile != null) {
diff --git a/src/wa/server/page/ServiceStatusPage.java b/src/wa/server/page/ServiceStatusPage.java
index defaecf..da3ede1 100755
--- a/src/wa/server/page/ServiceStatusPage.java
+++ b/src/wa/server/page/ServiceStatusPage.java
@@ -33,6 +33,7 @@ import zutil.ui.Navigation;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -47,7 +48,7 @@ public class ServiceStatusPage extends WAPage {
     public static final String NAVIGATION_NAME = "Service Status";
     private static final String TMPL_FILE = "WebContent/page/ServiceStatusPage.tmpl";
 
-    private ArrayList<WAServiceStatus> services;
+    private List<WAServiceStatus> services;
 
 
 
diff --git a/src/wa/server/page/WAPage.java b/src/wa/server/page/WAPage.java
index a174c0a..e26f1b3 100755
--- a/src/wa/server/page/WAPage.java
+++ b/src/wa/server/page/WAPage.java
@@ -134,7 +134,7 @@ public abstract class WAPage implements HttpPage{
 
 
     public static void initialize() {
-        for (Iterator<WAPage> it = WAContext.getPluginManager().getObjectIterator(WAPage.class); it.hasNext(); ){
+        for (Iterator<WAPage> it = WAContext.getPluginManager().getSingletonIterator(WAPage.class); it.hasNext(); ){
             WAContext.registerWaPage(it.next());
         }
     }