src/wa/server/plugin/apache/ApacheInstaller.java

@@ -30,14 +30,15 @@ import zutil.osal.OSAbstractionLayer;
  * Created by Ziver on 2014-11-09.
  */
 public class ApacheInstaller implements WAInstaller {
+    private static final String PACKAGES = "apache php5 php5-mcrypt php5-gd imagemagick";
 
     @Override
     public void install() {
-        AptGet.install("apache php5 php5-mcrypt php5-gd imagemagick");
+        AptGet.install(PACKAGES);
     }
 
     @Override
     public void uninstall() {
-        AptGet.purge("apache php5 php5-mcrypt php5-gd imagemagick");
+        AptGet.purge(PACKAGES);
     }
 }

src/wa/server/plugin/apache/ApacheService.java

@@ -22,7 +22,10 @@
 
 package wa.server.plugin.apache;
 
+import wa.server.plugin.WAInstaller;
 import wa.server.plugin.WAService;
+import wa.server.plugin.WAServiceStatus;
+import wa.server.util.AptGet;
 import wa.server.util.Ps;
 import zutil.io.file.FileUtil;
 import zutil.log.LogUtil;
@@ -39,35 +42,25 @@ import java.util.logging.Logger;
 public class ApacheService implements WAService {
     private static Logger log = LogUtil.getLogger();
 
-    private static OSAbstractionLayer os = OSAbstractionLayer.getInstance();
-    private static final String PID_FILE = "/var/run/apache2.pid";
+    private ApacheStatus status;
+    private ApacheInstaller installer;
 
     @Override
     public String getName() {
         return "Apache2";
     }
 
-    @Override
-    public void start() {
-        os.runCommand("service apache2 start");
-    }
-
-    @Override
-    public void stop() {
-        os.runCommand("service apache2 stop");
-    }
-
     @Override
     public WAServiceStatus getStatus() {
-        try {
-            int pid = Integer.parseInt(
-                    FileUtil.getContent(new File(PID_FILE)));
-            if(Ps.isRunning(pid))
-                return WAServiceStatus.RUNNING;
-            return WAServiceStatus.UNAVAILABLE;
-        }catch(IOException e){
-            log.log(Level.WARNING, null, e);
-        }
-        return WAServiceStatus.UNKNOWN;
+        if(status == null)
+            status = new ApacheStatus();
+        return status;
+    }
+
+    @Override
+    public WAInstaller getInstaller() {
+        if(installer == null)
+            installer = new ApacheInstaller();
+        return installer;
     }
 }

src/wa/server/plugin/apache/ApacheStatus.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2015 Ziver
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package wa.server.plugin.apache;
+
+import wa.server.plugin.WAServiceStatus;
+import wa.server.util.Ps;
+import zutil.io.file.FileUtil;
+import zutil.log.LogUtil;
+import zutil.osal.OSAbstractionLayer;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class ApacheStatus implements WAServiceStatus {
+    private static final Logger log = LogUtil.getLogger();
+    private static OSAbstractionLayer os = OSAbstractionLayer.getInstance();
+    private static final String PID_FILE = "/var/run/apache2.pid";
+
+    @Override
+    public void start() {
+        os.runCommand("service apache2 start");
+    }
+
+    @Override
+    public void stop() {
+        os.runCommand("service apache2 stop");
+    }
+
+    @Override
+    public ServiceStatusType getStatus() {
+        try {
+            int pid = Integer.parseInt(
+                    FileUtil.getContent(new File(PID_FILE)));
+            if(Ps.isRunning(pid))
+                return ServiceStatusType.RUNNING;
+            return ServiceStatusType.UNAVAILABLE;
+        }catch(IOException e){
+            log.log(Level.WARNING, null, e);
+        }
+        return ServiceStatusType.UNKNOWN;
+    }
+}

src/wa/server/plugin/apache/plugin.json

@@ -2,8 +2,6 @@
 	"version": "1.0",
 	"name": "Apache Web Server",
 	"interfaces": {
-		"wa.server.plugin.WAInstaller": "wa.server.plugin.apache.ApacheInstaller",
-		"wa.server.plugin.WAConfigurator": "wa.server.plugin.apache.ApacheConfigurator",
 		"wa.server.plugin.WAService": "wa.server.plugin.apache.ApacheService"
 	}
 }