diff --git a/plugins/hal-mqtt/src/se/hal/plugin/mqtt/plugin.json b/plugins/hal-mqtt/src/se/hal/plugin/mqtt/plugin.json index ef2f0051..c3af9969 100644 --- a/plugins/hal-mqtt/src/se/hal/plugin/mqtt/plugin.json +++ b/plugins/hal-mqtt/src/se/hal/plugin/mqtt/plugin.json @@ -1,5 +1,5 @@ { - "version": 1.0, + "version": 0.1, "name": "Hal-MQTT", "interfaces": [ {"se.hal.intf.HalAutoScannableController": "se.hal.plugin.mqtt.HalMqttController"} diff --git a/plugins/hal-raspberry/src/se/hal/plugin/raspberry/plugin.json b/plugins/hal-raspberry/src/se/hal/plugin/raspberry/plugin.json index 0a3a7ca8..8a0359ed 100644 --- a/plugins/hal-raspberry/src/se/hal/plugin/raspberry/plugin.json +++ b/plugins/hal-raspberry/src/se/hal/plugin/raspberry/plugin.json @@ -1,5 +1,5 @@ { - "version": 1.1, + "version": 1.0, "name": "Hal-RaspberryPi Sensors", "interfaces": [ {"se.hal.intf.HalSensorConfig": "se.hal.plugin.raspberry.RPiPowerConsumptionSensor"}, diff --git a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/plugin.json b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/plugin.json index d8c4ee66..4ddef4d2 100755 --- a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/plugin.json +++ b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/plugin.json @@ -1,5 +1,5 @@ { - "version": 1.0, + "version": 0.1, "name": "Hal-Zigbee", "interfaces": [ {"se.hal.intf.HalAutoScannableController": "se.hal.plugin.zigbee.HalDeconzZigbeeController"} diff --git a/plugins/hal-zwave/src/se/hal/plugin/zwave/plugin.json b/plugins/hal-zwave/src/se/hal/plugin/zwave/plugin.json index 560ce9fe..29ad9401 100644 --- a/plugins/hal-zwave/src/se/hal/plugin/zwave/plugin.json +++ b/plugins/hal-zwave/src/se/hal/plugin/zwave/plugin.json @@ -1,5 +1,5 @@ { - "version": 1.0, + "version": 0.1, "name": "Hal-ZWwave", "interfaces": [ ] diff --git a/src/se/hal/intf/HalJsonPage.java b/src/se/hal/intf/HalJsonPage.java index 107693af..b02433f9 100755 --- a/src/se/hal/intf/HalJsonPage.java +++ b/src/se/hal/intf/HalJsonPage.java @@ -37,7 +37,7 @@ public abstract class HalJsonPage extends HalWebPage { JSONWriter writer = new JSONWriter(out); try{ writer.write( - jsonRespond(out, headers, session, cookie, request)); + jsonRespond(session, cookie, request)); } catch (Exception e){ logger.log(Level.SEVERE, null, e); DataNode root = new DataNode(DataNode.DataType.Map); @@ -58,8 +58,6 @@ public abstract class HalJsonPage extends HalWebPage { protected abstract DataNode jsonRespond( - HttpPrintStream out, - HttpHeader headers, Map session, Map cookie, Map request) throws Exception; diff --git a/src/se/hal/page/MapJsonPage.java b/src/se/hal/page/MapJsonPage.java index bbb07ccb..c6e3ceb3 100755 --- a/src/se/hal/page/MapJsonPage.java +++ b/src/se/hal/page/MapJsonPage.java @@ -27,11 +27,11 @@ public class MapJsonPage extends HalJsonPage { @Override - public DataNode jsonRespond(HttpPrintStream out, - HttpHeader headers, - Map session, - Map cookie, - Map request) throws Exception { + public DataNode jsonRespond( + Map session, + Map cookie, + Map request) throws Exception { + DBConnection db = HalContext.getDB(); DataNode root = new DataNode(DataNode.DataType.Map); diff --git a/src/se/hal/page/SensorJsonPage.java b/src/se/hal/page/SensorJsonPage.java index 356e8743..2d71bdb4 100755 --- a/src/se/hal/page/SensorJsonPage.java +++ b/src/se/hal/page/SensorJsonPage.java @@ -39,8 +39,6 @@ public class SensorJsonPage extends HalJsonPage { @Override public DataNode jsonRespond( - HttpPrintStream out, - HttpHeader headers, Map session, Map cookie, Map request) throws Exception{