Fixed zutil changes

WebAdmin.iml

@@ -12,7 +12,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library" exported="">
+    <orderEntry type="module" module-name="Zutil" exported="" />
+    <orderEntry type="module-library">
       <library name="lib">
         <CLASSES>
           <root url="file://$MODULE_DIR$/lib" />
@@ -25,6 +26,5 @@
         <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
       </library>
     </orderEntry>
-    <orderEntry type="module" module-name="Zutil" exported="" />
   </component>
 </module>

resources/WebContent/page/index.tmpl

@@ -30,21 +30,21 @@
 	<a class="navbar-brand" href="#">{{title}}</a>
 	<ul class="nav navbar-nav navbar-left">
 		{{#top-nav}}
-		{{^.subNav.length}}
+		{{^.getSubNavs().length}}
-		<li><a href="{{.url}}">{{.name}}</a></li>
+		<li><a href="{{.getUrl()}}">{{.getName()}}</a></li>
-		{{/.subNav.length}}
+		{{/.getSubNavs().length}}
-		{{#.subNav.length}}
+		{{#.getSubNavs().length}}
 		<li class="dropdown">
 			<a href="#" class="dropdown-toggle" data-toggle="dropdown">
-				{{.name}} <b class="caret"></b>
+				{{.getName()}} <b class="caret"></b>
 			</a>
 			<ul class="dropdown-menu">
-				{{#.subNav}}
+				{{#.getSubNavs()}}
-				<li><a href="{{.url}}">{{.name}}</a></li>
+				<li><a href="{{.getUrl()}}">{{.getName()}}</a></li>
-				{{/.subNav}}
+				{{/.getSubNavs()}}
 			</ul>
 		</li>
-		{{/.subNav.length}}
+		{{/.getSubNavs().length}}
 		{{/top-nav}}
 	</ul>
     <!-- Top-Left nav -->
@@ -94,21 +94,21 @@
 	<div id="side-bar" class="col-md-2">
 		<ul class="side-menu nav nav-pills nav-stacked">
 			{{#side-nav}}
-			{{^.subNav.length}}
+			{{^.getSubNavs().length}}
-			<li><a href="{{.url}}">{{.name}}</a></li>
+			<li><a href="{{.getUrl()}}">{{.getName()}}</a></li>
-			{{/.subNav.length}}
+			{{/.getSubNavs().length}}
-			{{#.subNav.length}}
+			{{#.getSubNavs().length}}
 			<li class="">
-				<a data-toggle="collapse" data-parent="#side-bar" href="#{{.name}}_collapse">
+				<a data-toggle="collapse" data-parent="#side-bar" href="#{{.getName()}}_collapse">
-					{{.name}} <b class="caret"></b>
+					{{.getName()}} <b class="caret"></b>
 				</a>
 				<ul id="{{.name}}_collapse" class="side-sub-menu collapse nav nav-pills nav-stacked ">
-					{{#.subNav}}
+					{{#.getSubNavs()}}
-					<li><a href="{{.url}}">{{.name}}</a></li>
+					<li><a href="{{.url}}">{{.getName()}}</a></li>
-					{{/.subNav}}
+					{{/.getSubNavs()}}
 				</ul>
 			</li>
-			{{/.subNav.length}}
+			{{/.getSubNavs().length}}
 			{{/side-nav}}
 		</ul>
 	</div>
@@ -120,7 +120,7 @@
 		<div class="row">
 			<ol class="breadcrumb">
 				{{#breadcrumb}}
-				<li><a href="{{.url}}">{{.name}}</a></li>
+				<li><a href="{{.getUrl()}}">{{.getName()}}</a></li>
 				{{/breadcrumb}}
 			</ol>
 		</div>

src/wa/server/page/WALogPage.java

@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2015 ezivkoc
+ *
+ * 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.page;
+
+import zutil.net.http.HttpHeader;
+import zutil.net.http.HttpHeaderParser;
+import zutil.net.http.HttpPage;
+import zutil.net.http.HttpPrintStream;
+import zutil.parser.DataNode;
+import zutil.parser.json.JSONWriter;
+import zutil.struct.CircularBuffer;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.logging.Handler;
+import java.util.logging.LogRecord;
+
+/**
+ * Created by Ziver on 2015-09-22.
+ */
+public class WALogPage extends Handler implements HttpPage {
+    private CircularBuffer<LogRecord> logBuffer;
+
+    @Override
+    public void publish(LogRecord record) {
+        if(super.isLoggable(record)){
+            logBuffer.add(record);
+        }
+    }
+
+
+    @Override
+    public void flush() {}
+    @Override
+    public void close() throws SecurityException {
+        throw new UnsupportedOperationException ();
+    }
+
+
+    @Override
+    public void respond(HttpPrintStream out,
+                        HttpHeader client_info,
+                        Map<String, Object> session,
+                        Map<String, String> cookie,
+                        Map<String, String> request) throws IOException {
+
+        DataNode logNode = new DataNode(DataNode.DataType.List);
+        Iterator<LogRecord> it = logBuffer.iterator();
+        for(int i=0; i<20 && it.hasNext(); ++i){
+            LogRecord record = it.next();
+            DataNode node = new DataNode(DataNode.DataType.Map);
+            node.set("timestamp", record.getMillis());
+            node.set("source", record.getLoggerName());
+            node.set("msg", record.getMessage());
+            logNode.add(node);
+        }
+
+        DataNode root = new DataNode(DataNode.DataType.Map);
+        root.add(logNode);
+        JSONWriter writer = new JSONWriter(out);
+        writer.write(root);
+        writer.close();
+    }
+}

src/wa/server/page/struct/WANavigation.java

@@ -80,6 +80,9 @@ public class WANavigation implements Iterable{
     public String getName(){
         return name;
     }
+    public String getUrl(){
+        return url;
+    }
     public Object getResource(){
         return resource;
     }

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

@@ -1,8 +1,8 @@
 {
 	"version": "1.0",
 	"name": "Apache Web Server",
-	"interfaces": {
+	"interfaces": [
-		"wa.server.plugin.WAService": "wa.server.plugin.apache.ApacheService",
+		{"wa.server.plugin.WAService": "wa.server.plugin.apache.ApacheService"},
-		"wa.server.plugin.WAServiceStatus": "wa.server.plugin.apache.ApacheStatus"
+		{"wa.server.plugin.WAServiceStatus": "wa.server.plugin.apache.ApacheStatus"}
-	}
+	]
 }

src/wa/server/plugin/hwstatus/HDDStatus.tmpl

@@ -8,30 +8,6 @@
 
 <div id="hdd-container"></div>
 
-<div id="template" class="hidden">
-    <div id="" class="col-md-4"><div class="panel panel-default">
-        <div class="panel-heading hdd-title">HDD: {{.mount}} ({{.size_total}})</div>
-        <div class="panel-body">
-            <center><img src="img/hdd_ok.png" /></center><br>
-            <div class="progress">
-                <div class="progress-bar hdd-used" role="progressbar"></div>
-                <center class="hdd-free">{{.size_free}}</center>
-            </div>
-            <table class="table small hdd-detail">
-                <thead><tr>
-                    <th data-field="mount">Mount</th>
-                    <th data-field="type" >Type</th>
-                </tr></thead>
-                <tr>
-                    <td class="hdd-mount"></td>
-                    <td class="hdd-filesystem"></td>
-                </tr>
-            </table>
-            <!--<div><canvas id="hdd-io" height="400"></canvas></div>-->
-        </div>
-    </div></div>
-</div>
-
 
 
 <script language="javascript" type="text/javascript">
@@ -40,7 +16,7 @@ $(function() {
 });
 
 function updateHdd(){
-    $.getJSON("{{nav.url}}&json&hdd", function( data ) {
+    $.getJSON("{{nav.getUrl()}}&json&hdd", function( data ) {
         $.each(data['hdd'], function( index, hdd ){
             var element = null;
             var html_id = "hdd-id-" + hdd.id;
@@ -78,3 +54,27 @@ function byteToString(value){
     return value+" "+sizes[total];
 }
 </script>
+
+<div id="template" class="hidden">
+    <div id="" class="col-md-4"><div class="panel panel-default">
+        <div class="panel-heading hdd-title">HDD: {{.mount}} ({{.size_total}})</div>
+        <div class="panel-body">
+            <center><img src="img/hdd_ok.png" /></center><br>
+            <div class="progress">
+                <div class="progress-bar hdd-used" role="progressbar"></div>
+                <center class="hdd-free">{{.size_free}}</center>
+            </div>
+            <table class="table small hdd-detail">
+                <thead><tr>
+                    <th data-field="mount">Mount</th>
+                    <th data-field="type" >Type</th>
+                </tr></thead>
+                <tr>
+                    <td class="hdd-mount"></td>
+                    <td class="hdd-filesystem"></td>
+                </tr>
+            </table>
+            <!--<div><canvas id="hdd-io" height="400"></canvas></div>-->
+        </div>
+    </div></div>
+</div>

src/wa/server/plugin/hwstatus/HwStatus.tmpl

@@ -54,7 +54,7 @@ var cpu_data = {
 };
 
 function updateCpuChart(){
-    $.getJSON("{{nav.url}}&json&cpu", function( data ) {
+    $.getJSON("{{nav.getUrl()}}&json&cpu", function( data ) {
         // Setup graph
         if(cpu_chart == null){
             // Fill in cpus
@@ -102,7 +102,7 @@ var mem_data = [
 ];
 
 function updateMemChart(){
-    $.getJSON("{{nav.url}}&json&memory", function( data ) {
+    $.getJSON("{{nav.getUrl()}}&json&memory", function( data ) {
         if(mem_chart == null){
             var ctx = $("#mem-chart").get(0).getContext("2d");
             mem_chart = new Chart(ctx).Doughnut(mem_data, {
@@ -123,7 +123,7 @@ function updateMemChart(){
 
 
 function updateProcTable(){
-    $.getJSON("{{nav.url}}&json&proc", function( data ) {
+    $.getJSON("{{nav.getUrl()}}&json&proc", function( data ) {
         $('#proc-list').bootstrapTable({
             data: data['proc']
         });

src/wa/server/plugin/hwstatus/NetStatus.tmpl

@@ -73,7 +73,7 @@ var net_chart_data = {
 };
 
 function updateNet(){
-    $.getJSON("{{nav.url}}&json&net", function( data ) {
+    $.getJSON("{{nav.getUrl()}}&json&net", function( data ) {
         $.each(data['net'], function( index, net ){
             var element = null;
             var html_id = "net-" + net.id;

src/wa/server/plugin/tomcat/plugin.json

@@ -1,6 +1,6 @@
 {
 	"version": "1.0",
-	"name": "Apache Tomcat",
+	"name": "Tomcat",
 	"interfaces": {
 		"wa.server.plugin.WAService": "wa.server.plugin.apache.TomcatService",
 		"wa.server.plugin.WAServiceStatus": "wa.server.plugin.tomcat.TomcatStatus"