From b67842ead55c91ce37dc27c48769e4b7e7c643a6 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Tue, 8 Dec 2015 21:51:28 +0100
Subject: [PATCH] Zuitil updates

---
 src/wa/server/page/ConfigPage.java                       | 4 +---
 src/wa/server/plugin/apache/ApacheConfigVirtualHost.java | 8 ++++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/wa/server/page/ConfigPage.java b/src/wa/server/page/ConfigPage.java
index b53f370..9b247ef 100755
--- a/src/wa/server/page/ConfigPage.java
+++ b/src/wa/server/page/ConfigPage.java
@@ -25,14 +25,12 @@ package wa.server.page;
 import wa.server.WAContext;
 import wa.server.plugin.WAConfigEntry;
 import wa.server.plugin.WAServiceConfig;
-import wa.server.plugin.apache.ApacheConfigVirtualHost;
-import zutil.db.bean.Configurator;
-import zutil.db.bean.DBBean;
 import zutil.io.file.FileUtil;
 import zutil.log.LogUtil;
 import zutil.net.http.HttpHeaderParser;
 import zutil.parser.DataNode;
 import zutil.parser.Templator;
+import zutil.ui.Configurator;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/src/wa/server/plugin/apache/ApacheConfigVirtualHost.java b/src/wa/server/plugin/apache/ApacheConfigVirtualHost.java
index 38c68b0..6a25cb2 100755
--- a/src/wa/server/plugin/apache/ApacheConfigVirtualHost.java
+++ b/src/wa/server/plugin/apache/ApacheConfigVirtualHost.java
@@ -5,10 +5,10 @@ import wa.server.plugin.WAConfigEntry;
 import wa.server.plugin.WAServiceConfig;
 import wa.server.util.ConfigFileUtil;
 import zutil.db.DBConnection;
-import zutil.db.bean.Configurator.Configurable;
 import zutil.db.bean.DBBean;
 import zutil.db.bean.DBBean.DBTable;
 import zutil.io.IOUtil;
+import zutil.ui.Configurator;
 
 import java.io.*;
 import java.util.ArrayList;
@@ -69,12 +69,12 @@ public class ApacheConfigVirtualHost implements WAServiceConfig{
 
     @DBTable(WAConstants.DB_TABLE_PREFIX + "_apache_vhost")
     public static class ApacheVirtualHostEntry extends WAConfigEntry {
-        @Configurable("Domain")
+        @Configurator.Configurable("Domain")
         protected String domain;
         protected transient String domain_old;
-        @Configurable("DocRoot")
+        @Configurator.Configurable("DocRoot")
         protected String path;
-        @Configurable("SSL")
+        @Configurator.Configurable("SSL")
         protected boolean ssl;