264 files changed, 67 insertions, 285 deletions

diff --git a/.gitignore b/.gitignore
index 6e6eb1b..53b715d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
 *pyc
-hdf-data
 *~
-build
 ebus-xml/build
-ebus.egg-info/
diff --git a/arduinoAnalogStomp/.gitignore b/arduino/arduinoAnalogStomp/.gitignore
index d900568..d900568 100644
--- a/arduinoAnalogStomp/.gitignore
+++ b/arduino/arduinoAnalogStomp/.gitignore
diff --git a/arduinoAnalogStomp/Arduino.mk b/arduino/arduinoAnalogStomp/Arduino.mk
index 09819ac..09819ac 100755
--- a/arduinoAnalogStomp/Arduino.mk
+++ b/arduino/arduinoAnalogStomp/Arduino.mk
diff --git a/arduinoAnalogStomp/Makefile b/arduino/arduinoAnalogStomp/Makefile
index e273ddf..e273ddf 100755
--- a/arduinoAnalogStomp/Makefile
+++ b/arduino/arduinoAnalogStomp/Makefile
diff --git a/arduinoAnalogStomp/analogethernet.ino b/arduino/arduinoAnalogStomp/analogethernet.ino
index feefbd8..feefbd8 100755
--- a/arduinoAnalogStomp/analogethernet.ino
+++ b/arduino/arduinoAnalogStomp/analogethernet.ino
diff --git a/arduinoAnalogStomp/bin/ard-parse-boards b/arduino/arduinoAnalogStomp/bin/ard-parse-boards
index e2de71b..e2de71b 100755
--- a/arduinoAnalogStomp/bin/ard-parse-boards
+++ b/arduino/arduinoAnalogStomp/bin/ard-parse-boards
diff --git a/arduinoAnalogStomp/bin/ard-reset-arduino b/arduino/arduinoAnalogStomp/bin/ard-reset-arduino
index 22c7109..22c7109 100755
--- a/arduinoAnalogStomp/bin/ard-reset-arduino
+++ b/arduino/arduinoAnalogStomp/bin/ard-reset-arduino
diff --git a/arduinoAnalogStomp/schaltung/Untitled Sketch.fzz b/arduino/arduinoAnalogStomp/schaltung/Untitled Sketch.fzz
index a324e62..a324e62 100644
--- a/arduinoAnalogStomp/schaltung/Untitled Sketch.fzz
+++ b/arduino/arduinoAnalogStomp/schaltung/Untitled Sketch.fzz
diff --git a/arduinoAnalogStomp/schaltung/Untitled Sketch_Leiterplatte.pdf b/arduino/arduinoAnalogStomp/schaltung/Untitled Sketch_Leiterplatte.pdf
index 013da3c..013da3c 100644
--- a/arduinoAnalogStomp/schaltung/Untitled Sketch_Leiterplatte.pdf
+++ b/arduino/arduinoAnalogStomp/schaltung/Untitled Sketch_Leiterplatte.pdf
diff --git a/arduinoAnalogStomp/schaltung/Untitled Sketch_Schaltplan.pdf b/arduino/arduinoAnalogStomp/schaltung/Untitled Sketch_Schaltplan.pdf
index f504844..f504844 100644
--- a/arduinoAnalogStomp/schaltung/Untitled Sketch_Schaltplan.pdf
+++ b/arduino/arduinoAnalogStomp/schaltung/Untitled Sketch_Schaltplan.pdf
diff --git a/arduinoAnalogStomp/schaltung/Untitled Sketch_Steckplatine.pdf b/arduino/arduinoAnalogStomp/schaltung/Untitled Sketch_Steckplatine.pdf
index 2b974da..2b974da 100644
--- a/arduinoAnalogStomp/schaltung/Untitled Sketch_Steckplatine.pdf
+++ b/arduino/arduinoAnalogStomp/schaltung/Untitled Sketch_Steckplatine.pdf
diff --git a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_copper_bottom.pdf b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_copper_bottom.pdf
index b3fb204..b3fb204 100644
--- a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_copper_bottom.pdf
+++ b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_copper_bottom.pdf
diff --git a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_copper_bottom_mirror.pdf b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_copper_bottom_mirror.pdf
index 9e43de3..9e43de3 100644
--- a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_copper_bottom_mirror.pdf
+++ b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_copper_bottom_mirror.pdf
diff --git a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_copper_top.pdf b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_copper_top.pdf
index 9ab5881..9ab5881 100644
--- a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_copper_top.pdf
+++ b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_copper_top.pdf
diff --git a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_copper_top_mirror.pdf b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_copper_top_mirror.pdf
index 09bccb5..09bccb5 100644
--- a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_copper_top_mirror.pdf
+++ b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_copper_top_mirror.pdf
diff --git a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_mask_bottom.pdf b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_mask_bottom.pdf
index 11329ce..11329ce 100644
--- a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_mask_bottom.pdf
+++ b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_mask_bottom.pdf
diff --git a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_mask_bottom_mirror.pdf b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_mask_bottom_mirror.pdf
index 02a92f3..02a92f3 100644
--- a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_mask_bottom_mirror.pdf
+++ b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_mask_bottom_mirror.pdf
diff --git a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_mask_top.pdf b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_mask_top.pdf
index 11329ce..11329ce 100644
--- a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_mask_top.pdf
+++ b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_mask_top.pdf
diff --git a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_mask_top_mirror.pdf b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_mask_top_mirror.pdf
index 02a92f3..02a92f3 100644
--- a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_mask_top_mirror.pdf
+++ b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_mask_top_mirror.pdf
diff --git a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_paste_mask_bottom.pdf b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_paste_mask_bottom.pdf
index 479b7f1..479b7f1 100644
--- a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_paste_mask_bottom.pdf
+++ b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_paste_mask_bottom.pdf
diff --git a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_paste_mask_bottom_mirror.pdf b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_paste_mask_bottom_mirror.pdf
index 479b7f1..479b7f1 100644
--- a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_paste_mask_bottom_mirror.pdf
+++ b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_paste_mask_bottom_mirror.pdf
diff --git a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_paste_mask_top.pdf b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_paste_mask_top.pdf
index 479b7f1..479b7f1 100644
--- a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_paste_mask_top.pdf
+++ b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_paste_mask_top.pdf
diff --git a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_paste_mask_top_mirror.pdf b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_paste_mask_top_mirror.pdf
index 479b7f1..479b7f1 100644
--- a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_paste_mask_top_mirror.pdf
+++ b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_paste_mask_top_mirror.pdf
diff --git a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_silk_top.pdf b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_silk_top.pdf
index e4f9090..e4f9090 100644
--- a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_silk_top.pdf
+++ b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_silk_top.pdf
diff --git a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_silk_top_mirror.pdf b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_silk_top_mirror.pdf
index e9558ba..e9558ba 100644
--- a/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_silk_top_mirror.pdf
+++ b/arduino/arduinoAnalogStomp/schaltung/ätzen/Untitled Sketch_etch_silk_top_mirror.pdf
diff --git a/bin/web_dev.py b/bin/web_dev.py
deleted file mode 100755
index 8c45f0b..0000000
--- a/bin/web_dev.py
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-import bottle
-from ebus import webhdf
-
-if __name__ == "__main__":
-    bottle.debug(True)
-
-    bottle.run(webhdf.app, host="0.0.0.0", port=8080, reloader=True)
diff --git a/bin/ebus b/heap/bin/ebus
index 1232ff3..1232ff3 120000
--- a/bin/ebus
+++ b/heap/bin/ebus
diff --git a/bin/ebus_app.py b/heap/bin/ebus_app.py
index c9b89f6..c9b89f6 100755
--- a/bin/ebus_app.py
+++ b/heap/bin/ebus_app.py
diff --git a/bin/ebus_dump.py b/heap/bin/ebus_dump.py
index c170849..c170849 100755
--- a/bin/ebus_dump.py
+++ b/heap/bin/ebus_dump.py
diff --git a/heap/bin/web_dev.py b/heap/bin/web_dev.py
new file mode 100755
index 0000000..ea51519
--- /dev/null
+++ b/heap/bin/web_dev.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+# coding: utf-8
+import bottle
+from ebus import webhdf
+
+from pympler.web import start_in_background
+
+if __name__ == "__main__":
+    start_in_background(host="0.0.0.0",port=8090)
+
+    bottle.debug(True)
+
+    bottle.run(webhdf.app, host="0.0.0.0", port=8000, reloader=True)
diff --git a/bin/web_prod.py b/heap/bin/web_prod.py
index 97bf39c..e6c35fc 100755
--- a/bin/web_prod.py
+++ b/heap/bin/web_prod.py
@@ -6,4 +6,4 @@ from ebus import webhdf
 if __name__ == "__main__":
     bottle.debug(False)
 
-    bottle.run(webhdf.app, host="0.0.0.0", port=8000, reloader=False)
+    bottle.run(webhdf.app, host="0.0.0.0", port=8000, reloader=False, server="waitress")
diff --git a/bin/wettermichel.py b/heap/bin/wettermichel.py
index 57b517a..4c0af6c 100755
--- a/bin/wettermichel.py
+++ b/heap/bin/wettermichel.py
@@ -5,12 +5,13 @@ from StringIO import StringIO
 
 from lxml import objectify
 
+"""
 from sqlalchemy import create_engine, text
 from sqlalchemy.ext.sqlsoup import SqlSoup
 
 soup = SqlSoup(
     create_engine("postgresql://ebus:ebus@10.2.2.26:5432/ebus") )
-
+"""
 def read():
     conn = httplib.HTTPConnection("www.wettermichel.de")
     conn.request("GET", "/weatherdata/params3.xml")
@@ -55,8 +56,10 @@ def insert(sensor_name,value_int=None, value_float=None, value_string=None):
 xml = read()
 for keyval in xml.xpath("/data/*"):
     if keyval.tag == "entry":
-        continue
+	continue
 
+    print type(keyval), keyval.tag, keyval.text
+    continue
     if isinstance(keyval, objectify.IntElement):
         insert("de.wettermichel.%s"%keyval.tag,
                value_int=int(keyval.text))
@@ -64,6 +67,8 @@ for keyval in xml.xpath("/data/*"):
         insert("de.wettermichel.%s"%keyval.tag,
                value_float=float(keyval.text))
     elif isinstance(keyval, objectify.StringElement):
+	     
+	pass
         insert("de.wettermichel.%s"%keyval.tag,
                value_string=keyval.text)
     else:
diff --git a/datastore/.gitignore b/heap/datastore/.gitignore
index f3d74a9..f3d74a9 100644
--- a/datastore/.gitignore
+++ b/heap/datastore/.gitignore
diff --git a/datastore/DEP b/heap/datastore/DEP
index f9f913f..f9f913f 100644
--- a/datastore/DEP
+++ b/heap/datastore/DEP
diff --git a/datastore/config.py b/heap/datastore/config.py
index cd85f02..cd85f02 100644
--- a/datastore/config.py
+++ b/heap/datastore/config.py
diff --git a/datastore/dump.py b/heap/datastore/dump.py
index ac7ec29..ac7ec29 100644
--- a/datastore/dump.py
+++ b/heap/datastore/dump.py
diff --git a/datastore/interactive.py b/heap/datastore/interactive.py
index 76a9636..76a9636 100644
--- a/datastore/interactive.py
+++ b/heap/datastore/interactive.py
diff --git a/datastore/server.py b/heap/datastore/server.py
index 8b9ca4e..8b9ca4e 100644
--- a/datastore/server.py
+++ b/heap/datastore/server.py
diff --git a/datastore/store/__init__.py b/heap/datastore/store/__init__.py
index 792d600..792d600 100644
--- a/datastore/store/__init__.py
+++ b/heap/datastore/store/__init__.py
diff --git a/datastore/store/channel.py b/heap/datastore/store/channel.py
index 1e083b5..1e083b5 100644
--- a/datastore/store/channel.py
+++ b/heap/datastore/store/channel.py
diff --git a/datastore/store/controller.py b/heap/datastore/store/controller.py
index 0d694d1..0d694d1 100644
--- a/datastore/store/controller.py
+++ b/heap/datastore/store/controller.py
diff --git a/datastore/store/processor.py b/heap/datastore/store/processor.py
index 9d39d9a..9d39d9a 100644
--- a/datastore/store/processor.py
+++ b/heap/datastore/store/processor.py
diff --git a/datastore/store/timeseries.py b/heap/datastore/store/timeseries.py
index 8e30e4e..8e30e4e 100644
--- a/datastore/store/timeseries.py
+++ b/heap/datastore/store/timeseries.py
diff --git a/ebus-scala/.ensime b/heap/ebus-scala/.ensime
index 414848a..414848a 100644
--- a/ebus-scala/.ensime
+++ b/heap/ebus-scala/.ensime
diff --git a/ebus-scala/.gitignore b/heap/ebus-scala/.gitignore
index 5b82eed..5b82eed 100644
--- a/ebus-scala/.gitignore
+++ b/heap/ebus-scala/.gitignore
diff --git a/ebus-scala/README b/heap/ebus-scala/README
index f2e3923..f2e3923 100644
--- a/ebus-scala/README
+++ b/heap/ebus-scala/README
diff --git a/ebus-scala/src/main/scala/org/xapek/ebus/Ebus.scala b/heap/ebus-scala/src/main/scala/org/xapek/ebus/Ebus.scala
index 5b61a5b..5b61a5b 100755
--- a/ebus-scala/src/main/scala/org/xapek/ebus/Ebus.scala
+++ b/heap/ebus-scala/src/main/scala/org/xapek/ebus/Ebus.scala
diff --git a/ebus-scala/src/main/scala/org/xapek/ebus/Layer2.scala b/heap/ebus-scala/src/main/scala/org/xapek/ebus/Layer2.scala
index 7c0f1c6..7c0f1c6 100644
--- a/ebus-scala/src/main/scala/org/xapek/ebus/Layer2.scala
+++ b/heap/ebus-scala/src/main/scala/org/xapek/ebus/Layer2.scala
diff --git a/ebus-scala/src/main/scala/org/xapek/ebus/Main.scala b/heap/ebus-scala/src/main/scala/org/xapek/ebus/Main.scala
index 4643bcd..4643bcd 100644
--- a/ebus-scala/src/main/scala/org/xapek/ebus/Main.scala
+++ b/heap/ebus-scala/src/main/scala/org/xapek/ebus/Main.scala
diff --git a/ebus/__init__.py b/heap/ebus/__init__.py
index 8d4e6ac..8d4e6ac 100644
--- a/ebus/__init__.py
+++ b/heap/ebus/__init__.py
diff --git a/ebus/datastore.py b/heap/ebus/datastore.py
index 3ac63e1..66303f3 100644
--- a/ebus/datastore.py
+++ b/heap/ebus/datastore.py
@@ -26,7 +26,7 @@ class Datastore(object):
 
         # list all table in a dictionary { path.dot.name : object }
         def listTables(self):
-                return dict(map(lambda e: (e.title, e), self.file.root))
+                return dict(map(lambda e: (e.title, e), self.files.root))
 
         def __enter__(self):
                 self.fileLock.__enter__()
@@ -61,16 +61,12 @@ class Datastore(object):
                                                         filters=tables.Filters(complevel=1),
                                                         createparents=True)
                                         t.cols.timestamp.createCSIndex()
-					self.files[name].close()
-
-					self.files[name] = tables.openFile(path, "a", title = "eBus Datastore")
-					t = self.files[name].getNode("/"+name)
 
                                 self.tables[name] = t
 
                         return self.tables[name]
 
-        def addValue(self, name, ts, value, klass,flush=False):
+        def addValue(self, name, ts, value, klass):
                 t = self.getTable(name, klass)
 		if klass != None:
 		    assert klass.columns['value'].type == t.cols.value.type, "Type check failed"
@@ -79,9 +75,6 @@ class Datastore(object):
                         t.row['timestamp'] = ts
                         t.row['value'] = value
                         t.row.append()
-                        if flush: 
-				t.flush()
-				t.flushRowsToIndex()
 
         def addValueInt(self, name, ts, value): self.addValue(name, ts, value, ValueInt)
         def addValueString(self, name, ts, value): self.addValue(name, ts, value, ValueString)
@@ -90,8 +83,31 @@ class Datastore(object):
         def flush(self):
                 with self.fileLock:
                         for file in self.files.values():
+				logging.debug("flush file: %s" % file.filename)
                                 file.flush()
 
+        def flush_table(self,name,table,close=False,index=False):
+		if close or table.cols.timestamp.index.nelements == 0:
+			logging.debug("close table: %s" % table.name)
+			name = name.replace(".","_")
+			#close file after first insert
+			#to force a index build on re-open
+			self.tables.pop(name).close()
+			self.files.pop(name).close()
+		elif 'row' in table.__dict__:
+			logging.debug("flush buffer {name}".format(name=name))
+			table.row._flushBufferedRows()
+
+			if index and table.indexed and table.autoIndex:
+				logging.debug("index {name}".format(name=name))
+			       # Flush any unindexed row
+				rowsadded = table.flushRowsToIndex(_lastrow=True)
+				if table._dirtyindexes:
+					# Finally, re-index any dirty column
+					table.reIndexDirty()
+
+
+
         def close(self):
                 with self.fileLock:
                         for file in self.files.values():
diff --git a/ebus/ebus_specification.xml b/heap/ebus/ebus_specification.xml
index 2f497c1..2f497c1 100644
--- a/ebus/ebus_specification.xml
+++ b/heap/ebus/ebus_specification.xml
diff --git a/ebus/model/__init__.py b/heap/ebus/model/__init__.py
index f6a44b9..f6a44b9 100644
--- a/ebus/model/__init__.py
+++ b/heap/ebus/model/__init__.py
diff --git a/ebus/model/sql.py b/heap/ebus/model/sql.py
index 75ebd0c..75ebd0c 100644
--- a/ebus/model/sql.py
+++ b/heap/ebus/model/sql.py
diff --git a/ebus/sql/__init__.py b/heap/ebus/sql/__init__.py
index e69de29..e69de29 100644
--- a/ebus/sql/__init__.py
+++ b/heap/ebus/sql/__init__.py
diff --git a/ebus/sql/model.py b/heap/ebus/sql/model.py
index 7e21e82..7e21e82 100644
--- a/ebus/sql/model.py
+++ b/heap/ebus/sql/model.py
diff --git a/ebus/webapp/__init__.py b/heap/ebus/webapp/__init__.py
index 9c98ac3..9c98ac3 100644
--- a/ebus/webapp/__init__.py
+++ b/heap/ebus/webapp/__init__.py
diff --git a/ebus/webapp/soup_plugin.py b/heap/ebus/webapp/soup_plugin.py
index e85d0b0..e85d0b0 100644
--- a/ebus/webapp/soup_plugin.py
+++ b/heap/ebus/webapp/soup_plugin.py
diff --git a/ebus/webapp/static/control.html b/heap/ebus/webapp/static/control.html
index db9e7b8..db9e7b8 100644
--- a/ebus/webapp/static/control.html
+++ b/heap/ebus/webapp/static/control.html
diff --git a/ebus/webapp/static/css/stylesheet.css b/heap/ebus/webapp/static/css/stylesheet.css
index fdd704e..fdd704e 100644
--- a/ebus/webapp/static/css/stylesheet.css
+++ b/heap/ebus/webapp/static/css/stylesheet.css
diff --git a/ebus/webapp/static/draw.svg b/heap/ebus/webapp/static/draw.svg
index e3c46b5..e3c46b5 100644
--- a/ebus/webapp/static/draw.svg
+++ b/heap/ebus/webapp/static/draw.svg
diff --git a/ebus/webapp/static/index.html b/heap/ebus/webapp/static/index.html
index 04ecc15..04ecc15 100644
--- a/ebus/webapp/static/index.html
+++ b/heap/ebus/webapp/static/index.html
diff --git a/ebus/webapp/static/lib/d3-v2.6.1/d3.js b/heap/ebus/webapp/static/lib/d3-v2.6.1/d3.js
index d71f57d..d71f57d 100644
--- a/ebus/webapp/static/lib/d3-v2.6.1/d3.js
+++ b/heap/ebus/webapp/static/lib/d3-v2.6.1/d3.js
diff --git a/ebus/webapp/static/lib/d3-v2.6.1/d3.time.js b/heap/ebus/webapp/static/lib/d3-v2.6.1/d3.time.js
index 4c1cda4..4c1cda4 100644
--- a/ebus/webapp/static/lib/d3-v2.6.1/d3.time.js
+++ b/heap/ebus/webapp/static/lib/d3-v2.6.1/d3.time.js
diff --git a/ebus/webapp/static/lib/flot-0.7/API.txt b/heap/ebus/webapp/static/lib/flot-0.7/API.txt
index 8a8dbc2..8a8dbc2 100644
--- a/ebus/webapp/static/lib/flot-0.7/API.txt
+++ b/heap/ebus/webapp/static/lib/flot-0.7/API.txt
diff --git a/ebus/webapp/static/lib/flot-0.7/FAQ.txt b/heap/ebus/webapp/static/lib/flot-0.7/FAQ.txt
index e02b761..e02b761 100644
--- a/ebus/webapp/static/lib/flot-0.7/FAQ.txt
+++ b/heap/ebus/webapp/static/lib/flot-0.7/FAQ.txt
diff --git a/ebus/webapp/static/lib/flot-0.7/LICENSE.txt b/heap/ebus/webapp/static/lib/flot-0.7/LICENSE.txt
index 07d5b20..07d5b20 100644
--- a/ebus/webapp/static/lib/flot-0.7/LICENSE.txt
+++ b/heap/ebus/webapp/static/lib/flot-0.7/LICENSE.txt
diff --git a/ebus/webapp/static/lib/flot-0.7/Makefile b/heap/ebus/webapp/static/lib/flot-0.7/Makefile
index b300f1a..b300f1a 100644
--- a/ebus/webapp/static/lib/flot-0.7/Makefile
+++ b/heap/ebus/webapp/static/lib/flot-0.7/Makefile
diff --git a/ebus/webapp/static/lib/flot-0.7/NEWS.txt b/heap/ebus/webapp/static/lib/flot-0.7/NEWS.txt
index 5f8e1a0..5f8e1a0 100644
--- a/ebus/webapp/static/lib/flot-0.7/NEWS.txt
+++ b/heap/ebus/webapp/static/lib/flot-0.7/NEWS.txt
diff --git a/ebus/webapp/static/lib/flot-0.7/PLUGINS.txt b/heap/ebus/webapp/static/lib/flot-0.7/PLUGINS.txt
index af3d90b..af3d90b 100644
--- a/ebus/webapp/static/lib/flot-0.7/PLUGINS.txt
+++ b/heap/ebus/webapp/static/lib/flot-0.7/PLUGINS.txt
diff --git a/ebus/webapp/static/lib/flot-0.7/README.txt b/heap/ebus/webapp/static/lib/flot-0.7/README.txt
index 1e49787..1e49787 100644
--- a/ebus/webapp/static/lib/flot-0.7/README.txt
+++ b/heap/ebus/webapp/static/lib/flot-0.7/README.txt
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/ajax.html b/heap/ebus/webapp/static/lib/flot-0.7/examples/ajax.html
index 9b5ec85..9b5ec85 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/ajax.html
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/ajax.html
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/annotating.html b/heap/ebus/webapp/static/lib/flot-0.7/examples/annotating.html
index 72c212b..72c212b 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/annotating.html
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/annotating.html
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/arrow-down.gif b/heap/ebus/webapp/static/lib/flot-0.7/examples/arrow-down.gif
index e239d11..e239d11 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/arrow-down.gif
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/arrow-down.gif
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/arrow-left.gif b/heap/ebus/webapp/static/lib/flot-0.7/examples/arrow-left.gif
index 93ffd5a..93ffd5a 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/arrow-left.gif
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/arrow-left.gif
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/arrow-right.gif b/heap/ebus/webapp/static/lib/flot-0.7/examples/arrow-right.gif
index 5fd0530..5fd0530 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/arrow-right.gif
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/arrow-right.gif
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/arrow-up.gif b/heap/ebus/webapp/static/lib/flot-0.7/examples/arrow-up.gif
index 7d19626..7d19626 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/arrow-up.gif
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/arrow-up.gif
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/basic.html b/heap/ebus/webapp/static/lib/flot-0.7/examples/basic.html
index b116d94..b116d94 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/basic.html
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/basic.html
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/data-eu-gdp-growth-1.json b/heap/ebus/webapp/static/lib/flot-0.7/examples/data-eu-gdp-growth-1.json
index 51952cf..51952cf 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/data-eu-gdp-growth-1.json
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/data-eu-gdp-growth-1.json
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/data-eu-gdp-growth-2.json b/heap/ebus/webapp/static/lib/flot-0.7/examples/data-eu-gdp-growth-2.json
index 82004d6..82004d6 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/data-eu-gdp-growth-2.json
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/data-eu-gdp-growth-2.json
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/data-eu-gdp-growth-3.json b/heap/ebus/webapp/static/lib/flot-0.7/examples/data-eu-gdp-growth-3.json
index 8684479..8684479 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/data-eu-gdp-growth-3.json
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/data-eu-gdp-growth-3.json
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/data-eu-gdp-growth-4.json b/heap/ebus/webapp/static/lib/flot-0.7/examples/data-eu-gdp-growth-4.json
index b363578..b363578 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/data-eu-gdp-growth-4.json
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/data-eu-gdp-growth-4.json
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/data-eu-gdp-growth-5.json b/heap/ebus/webapp/static/lib/flot-0.7/examples/data-eu-gdp-growth-5.json
index a7e1e13..a7e1e13 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/data-eu-gdp-growth-5.json
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/data-eu-gdp-growth-5.json
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/data-eu-gdp-growth.json b/heap/ebus/webapp/static/lib/flot-0.7/examples/data-eu-gdp-growth.json
index a7e1e13..a7e1e13 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/data-eu-gdp-growth.json
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/data-eu-gdp-growth.json
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/data-japan-gdp-growth.json b/heap/ebus/webapp/static/lib/flot-0.7/examples/data-japan-gdp-growth.json
index 855477c..855477c 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/data-japan-gdp-growth.json
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/data-japan-gdp-growth.json
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/data-usa-gdp-growth.json b/heap/ebus/webapp/static/lib/flot-0.7/examples/data-usa-gdp-growth.json
index 33f66c6..33f66c6 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/data-usa-gdp-growth.json
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/data-usa-gdp-growth.json
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/graph-types.html b/heap/ebus/webapp/static/lib/flot-0.7/examples/graph-types.html
index dd21a31..dd21a31 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/graph-types.html
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/graph-types.html
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/hs-2004-27-a-large_web.jpg b/heap/ebus/webapp/static/lib/flot-0.7/examples/hs-2004-27-a-large_web.jpg
index a1d5c05..a1d5c05 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/hs-2004-27-a-large_web.jpg
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/hs-2004-27-a-large_web.jpg
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/image.html b/heap/ebus/webapp/static/lib/flot-0.7/examples/image.html
index 073ad43..073ad43 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/image.html
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/image.html
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/index.html b/heap/ebus/webapp/static/lib/flot-0.7/examples/index.html
index f24f750..f24f750 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/index.html
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/index.html
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/interacting-axes.html b/heap/ebus/webapp/static/lib/flot-0.7/examples/interacting-axes.html
index 5b6e3bb..5b6e3bb 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/interacting-axes.html
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/interacting-axes.html
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/interacting.html b/heap/ebus/webapp/static/lib/flot-0.7/examples/interacting.html
index d04eedd..d04eedd 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/interacting.html
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/interacting.html
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/layout.css b/heap/ebus/webapp/static/lib/flot-0.7/examples/layout.css
index 7ef7dd4..7ef7dd4 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/layout.css
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/layout.css
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/multiple-axes.html b/heap/ebus/webapp/static/lib/flot-0.7/examples/multiple-axes.html
index 4b32e64..4b32e64 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/multiple-axes.html
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/multiple-axes.html
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/navigate.html b/heap/ebus/webapp/static/lib/flot-0.7/examples/navigate.html
index c916ef2..c916ef2 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/navigate.html
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/navigate.html
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/percentiles.html b/heap/ebus/webapp/static/lib/flot-0.7/examples/percentiles.html
index 9f2ba3a..9f2ba3a 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/percentiles.html
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/percentiles.html
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/pie.html b/heap/ebus/webapp/static/lib/flot-0.7/examples/pie.html
index 8f51411..8f51411 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/pie.html
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/pie.html
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/realtime.html b/heap/ebus/webapp/static/lib/flot-0.7/examples/realtime.html
index 3b427e1..3b427e1 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/realtime.html
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/realtime.html
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/resize.html b/heap/ebus/webapp/static/lib/flot-0.7/examples/resize.html
index d1e18c3..d1e18c3 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/resize.html
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/resize.html
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/selection.html b/heap/ebus/webapp/static/lib/flot-0.7/examples/selection.html
index 1646f5a..1646f5a 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/selection.html
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/selection.html
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/setting-options.html b/heap/ebus/webapp/static/lib/flot-0.7/examples/setting-options.html
index 8d1967e..8d1967e 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/setting-options.html
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/setting-options.html
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/stacking.html b/heap/ebus/webapp/static/lib/flot-0.7/examples/stacking.html
index b7de391..b7de391 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/stacking.html
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/stacking.html
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/symbols.html b/heap/ebus/webapp/static/lib/flot-0.7/examples/symbols.html
index e71b1aa..e71b1aa 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/symbols.html
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/symbols.html
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/thresholding.html b/heap/ebus/webapp/static/lib/flot-0.7/examples/thresholding.html
index f10144a..f10144a 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/thresholding.html
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/thresholding.html
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/time.html b/heap/ebus/webapp/static/lib/flot-0.7/examples/time.html
index da62347..da62347 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/time.html
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/time.html
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/tracking.html b/heap/ebus/webapp/static/lib/flot-0.7/examples/tracking.html
index c116159..c116159 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/tracking.html
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/tracking.html
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/turning-series.html b/heap/ebus/webapp/static/lib/flot-0.7/examples/turning-series.html
index bc6fd9f..bc6fd9f 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/turning-series.html
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/turning-series.html
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/visitors.html b/heap/ebus/webapp/static/lib/flot-0.7/examples/visitors.html
index 8a9d4d7..8a9d4d7 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/visitors.html
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/visitors.html
diff --git a/ebus/webapp/static/lib/flot-0.7/examples/zooming.html b/heap/ebus/webapp/static/lib/flot-0.7/examples/zooming.html
index 9a4ef22..9a4ef22 100644
--- a/ebus/webapp/static/lib/flot-0.7/examples/zooming.html
+++ b/heap/ebus/webapp/static/lib/flot-0.7/examples/zooming.html
diff --git a/ebus/webapp/static/lib/flot-0.7/excanvas.js b/heap/ebus/webapp/static/lib/flot-0.7/excanvas.js
index c40d6f7..c40d6f7 100644
--- a/ebus/webapp/static/lib/flot-0.7/excanvas.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/excanvas.js
diff --git a/ebus/webapp/static/lib/flot-0.7/excanvas.min.js b/heap/ebus/webapp/static/lib/flot-0.7/excanvas.min.js
index 12c74f7..12c74f7 100644
--- a/ebus/webapp/static/lib/flot-0.7/excanvas.min.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/excanvas.min.js
diff --git a/ebus/webapp/static/lib/flot-0.7/jquery.colorhelpers.js b/heap/ebus/webapp/static/lib/flot-0.7/jquery.colorhelpers.js
index d3524d7..d3524d7 100644
--- a/ebus/webapp/static/lib/flot-0.7/jquery.colorhelpers.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/jquery.colorhelpers.js
diff --git a/ebus/webapp/static/lib/flot-0.7/jquery.colorhelpers.min.js b/heap/ebus/webapp/static/lib/flot-0.7/jquery.colorhelpers.min.js
index 7f44c57..7f44c57 100644
--- a/ebus/webapp/static/lib/flot-0.7/jquery.colorhelpers.min.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/jquery.colorhelpers.min.js
diff --git a/ebus/webapp/static/lib/flot-0.7/jquery.flot.crosshair.js b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.crosshair.js
index 1d433f0..1d433f0 100644
--- a/ebus/webapp/static/lib/flot-0.7/jquery.flot.crosshair.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.crosshair.js
diff --git a/ebus/webapp/static/lib/flot-0.7/jquery.flot.crosshair.min.js b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.crosshair.min.js
index ccaf240..ccaf240 100644
--- a/ebus/webapp/static/lib/flot-0.7/jquery.flot.crosshair.min.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.crosshair.min.js
diff --git a/ebus/webapp/static/lib/flot-0.7/jquery.flot.fillbetween.js b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.fillbetween.js
index 69700e7..69700e7 100644
--- a/ebus/webapp/static/lib/flot-0.7/jquery.flot.fillbetween.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.fillbetween.js
diff --git a/ebus/webapp/static/lib/flot-0.7/jquery.flot.fillbetween.min.js b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.fillbetween.min.js
index 47f3dfb..47f3dfb 100644
--- a/ebus/webapp/static/lib/flot-0.7/jquery.flot.fillbetween.min.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.fillbetween.min.js
diff --git a/ebus/webapp/static/lib/flot-0.7/jquery.flot.image.js b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.image.js
index 29ccb12..29ccb12 100644
--- a/ebus/webapp/static/lib/flot-0.7/jquery.flot.image.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.image.js
diff --git a/ebus/webapp/static/lib/flot-0.7/jquery.flot.image.min.js b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.image.min.js
index 9480c1e..9480c1e 100644
--- a/ebus/webapp/static/lib/flot-0.7/jquery.flot.image.min.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.image.min.js
diff --git a/ebus/webapp/static/lib/flot-0.7/jquery.flot.js b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.js
index aabc544..aabc544 100644
--- a/ebus/webapp/static/lib/flot-0.7/jquery.flot.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.js
diff --git a/ebus/webapp/static/lib/flot-0.7/jquery.flot.min.js b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.min.js
index 4467fc5..4467fc5 100644
--- a/ebus/webapp/static/lib/flot-0.7/jquery.flot.min.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.min.js
diff --git a/ebus/webapp/static/lib/flot-0.7/jquery.flot.navigate.js b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.navigate.js
index f2b9760..f2b9760 100644
--- a/ebus/webapp/static/lib/flot-0.7/jquery.flot.navigate.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.navigate.js
diff --git a/ebus/webapp/static/lib/flot-0.7/jquery.flot.navigate.min.js b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.navigate.min.js
index ecf63c9..ecf63c9 100644
--- a/ebus/webapp/static/lib/flot-0.7/jquery.flot.navigate.min.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.navigate.min.js
diff --git a/ebus/webapp/static/lib/flot-0.7/jquery.flot.pie.js b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.pie.js
index 70941dd..70941dd 100644
--- a/ebus/webapp/static/lib/flot-0.7/jquery.flot.pie.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.pie.js
diff --git a/ebus/webapp/static/lib/flot-0.7/jquery.flot.pie.min.js b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.pie.min.js
index b7bf870..b7bf870 100644
--- a/ebus/webapp/static/lib/flot-0.7/jquery.flot.pie.min.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.pie.min.js
diff --git a/ebus/webapp/static/lib/flot-0.7/jquery.flot.resize.js b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.resize.js
index 69dfb24..69dfb24 100644
--- a/ebus/webapp/static/lib/flot-0.7/jquery.flot.resize.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.resize.js
diff --git a/ebus/webapp/static/lib/flot-0.7/jquery.flot.resize.min.js b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.resize.min.js
index 1fa0771..1fa0771 100644
--- a/ebus/webapp/static/lib/flot-0.7/jquery.flot.resize.min.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.resize.min.js
diff --git a/ebus/webapp/static/lib/flot-0.7/jquery.flot.selection.js b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.selection.js
index 7f7b326..7f7b326 100644
--- a/ebus/webapp/static/lib/flot-0.7/jquery.flot.selection.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.selection.js
diff --git a/ebus/webapp/static/lib/flot-0.7/jquery.flot.selection.min.js b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.selection.min.js
index badc005..badc005 100644
--- a/ebus/webapp/static/lib/flot-0.7/jquery.flot.selection.min.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.selection.min.js
diff --git a/ebus/webapp/static/lib/flot-0.7/jquery.flot.stack.js b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.stack.js
index a31d5dc..a31d5dc 100644
--- a/ebus/webapp/static/lib/flot-0.7/jquery.flot.stack.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.stack.js
diff --git a/ebus/webapp/static/lib/flot-0.7/jquery.flot.stack.min.js b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.stack.min.js
index bba2a0e..bba2a0e 100644
--- a/ebus/webapp/static/lib/flot-0.7/jquery.flot.stack.min.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.stack.min.js
diff --git a/ebus/webapp/static/lib/flot-0.7/jquery.flot.symbol.js b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.symbol.js
index a32fe31..a32fe31 100644
--- a/ebus/webapp/static/lib/flot-0.7/jquery.flot.symbol.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.symbol.js
diff --git a/ebus/webapp/static/lib/flot-0.7/jquery.flot.symbol.min.js b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.symbol.min.js
index 272e003..272e003 100644
--- a/ebus/webapp/static/lib/flot-0.7/jquery.flot.symbol.min.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.symbol.min.js
diff --git a/ebus/webapp/static/lib/flot-0.7/jquery.flot.threshold.js b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.threshold.js
index 0b2e7ac..0b2e7ac 100644
--- a/ebus/webapp/static/lib/flot-0.7/jquery.flot.threshold.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.threshold.js
diff --git a/ebus/webapp/static/lib/flot-0.7/jquery.flot.threshold.min.js b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.threshold.min.js
index d8b79df..d8b79df 100644
--- a/ebus/webapp/static/lib/flot-0.7/jquery.flot.threshold.min.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/jquery.flot.threshold.min.js
diff --git a/ebus/webapp/static/lib/flot-0.7/jquery.js b/heap/ebus/webapp/static/lib/flot-0.7/jquery.js
index 78fcfa4..78fcfa4 100644
--- a/ebus/webapp/static/lib/flot-0.7/jquery.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/jquery.js
diff --git a/ebus/webapp/static/lib/flot-0.7/jquery.min.js b/heap/ebus/webapp/static/lib/flot-0.7/jquery.min.js
index 6422523..6422523 100644
--- a/ebus/webapp/static/lib/flot-0.7/jquery.min.js
+++ b/heap/ebus/webapp/static/lib/flot-0.7/jquery.min.js
diff --git a/ebus/webapp/static/lib/jquery-1.6.2/jquery-1.6.2.js b/heap/ebus/webapp/static/lib/jquery-1.6.2/jquery-1.6.2.js
index f3201aa..f3201aa 100644
--- a/ebus/webapp/static/lib/jquery-1.6.2/jquery-1.6.2.js
+++ b/heap/ebus/webapp/static/lib/jquery-1.6.2/jquery-1.6.2.js
diff --git a/ebus/webapp/static/lib/jquery-1.6.2/jquery-1.6.2.min.js b/heap/ebus/webapp/static/lib/jquery-1.6.2/jquery-1.6.2.min.js
index 48590ec..48590ec 100644
--- a/ebus/webapp/static/lib/jquery-1.6.2/jquery-1.6.2.min.js
+++ b/heap/ebus/webapp/static/lib/jquery-1.6.2/jquery-1.6.2.min.js
diff --git a/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_flat_0_aaaaaa_40x100.png b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_flat_0_aaaaaa_40x100.png
index 5b5dab2..5b5dab2 100644
--- a/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_flat_0_aaaaaa_40x100.png
+++ b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_flat_75_ffffff_40x100.png b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_flat_75_ffffff_40x100.png
index ac8b229..ac8b229 100644
--- a/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_flat_75_ffffff_40x100.png
+++ b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_55_fbf9ee_1x400.png b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_55_fbf9ee_1x400.png
index ad3d634..ad3d634 100644
--- a/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_55_fbf9ee_1x400.png
+++ b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_65_ffffff_1x400.png b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_65_ffffff_1x400.png
index 42ccba2..42ccba2 100644
--- a/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_65_ffffff_1x400.png
+++ b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_dadada_1x400.png b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_dadada_1x400.png
index 5a46b47..5a46b47 100644
--- a/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_dadada_1x400.png
+++ b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_e6e6e6_1x400.png b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_e6e6e6_1x400.png
index 86c2baa..86c2baa 100644
--- a/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_e6e6e6_1x400.png
+++ b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_95_fef1ec_1x400.png b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_95_fef1ec_1x400.png
index 4443fdc..4443fdc 100644
--- a/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_95_fef1ec_1x400.png
+++ b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_highlight-soft_75_cccccc_1x100.png
index 7c9fa6c..7c9fa6c 100644
--- a/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+++ b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-icons_222222_256x240.png b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-icons_222222_256x240.png
index b273ff1..b273ff1 100644
--- a/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-icons_222222_256x240.png
+++ b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-icons_222222_256x240.png
diff --git a/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-icons_2e83ff_256x240.png b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-icons_2e83ff_256x240.png
index 09d1cdc..09d1cdc 100644
--- a/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-icons_2e83ff_256x240.png
+++ b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-icons_2e83ff_256x240.png
diff --git a/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-icons_454545_256x240.png b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-icons_454545_256x240.png
index 59bd45b..59bd45b 100644
--- a/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-icons_454545_256x240.png
+++ b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-icons_454545_256x240.png
diff --git a/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-icons_888888_256x240.png b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-icons_888888_256x240.png
index 6d02426..6d02426 100644
--- a/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-icons_888888_256x240.png
+++ b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-icons_888888_256x240.png
diff --git a/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-icons_cd0a0a_256x240.png b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-icons_cd0a0a_256x240.png
index 2ab019b..2ab019b 100644
--- a/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-icons_cd0a0a_256x240.png
+++ b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/images/ui-icons_cd0a0a_256x240.png
diff --git a/ebus/webapp/static/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.css b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.css
index ad212da..ad212da 100644
--- a/ebus/webapp/static/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.css
+++ b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.css
diff --git a/ebus/webapp/static/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.min.js b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.min.js
index f9e4f1e..f9e4f1e 100644
--- a/ebus/webapp/static/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.min.js
+++ b/heap/ebus/webapp/static/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.min.js
diff --git a/ebus/webapp/static/src/d3.control.js b/heap/ebus/webapp/static/src/d3.control.js
index 489edea..489edea 100644
--- a/ebus/webapp/static/src/d3.control.js
+++ b/heap/ebus/webapp/static/src/d3.control.js
diff --git a/ebus/webapp/static/src/d3.plot.js b/heap/ebus/webapp/static/src/d3.plot.js
index d9a7d04..d9a7d04 100644
--- a/ebus/webapp/static/src/d3.plot.js
+++ b/heap/ebus/webapp/static/src/d3.plot.js
diff --git a/ebus/webapp/static/src/ebus.js b/heap/ebus/webapp/static/src/ebus.js
index 4bf3b8b..4bf3b8b 100644
--- a/ebus/webapp/static/src/ebus.js
+++ b/heap/ebus/webapp/static/src/ebus.js
diff --git a/ebus/webhdf/__init__.py b/heap/ebus/webhdf/__init__.py
index f661800..44b5ab4 100644
--- a/ebus/webhdf/__init__.py
+++ b/heap/ebus/webhdf/__init__.py
@@ -4,6 +4,7 @@ import json
 import datetime
 import time
 import itertools
+import traceback
 import logging
 logging.basicConfig(level=logging.DEBUG)
 
@@ -16,7 +17,13 @@ import ebus.datastore
 datastore = ebus.datastore.Datastore("hdf-data")
 app = bottle.Bottle("ebus")
 
-lastflush = -1
+lastflushes = dict()
+
+def get_lastflush(name):
+    if name not in lastflushes:
+        lastflushes[name] = -1
+
+    return lastflushes[name]
 
 @app.route('/')
 def index_file():
@@ -40,7 +47,7 @@ def sensor_data_get(name):
 @app.put('/sensor/:name')
 @app.put('/sensor/:name/:timestamp')
 def sensor_data_put(name,timestamp=None):
-    FLUSH_INTERVAL=30 #sec
+    FLUSH_INTERVAL=240 #sec
     global lastflush
 
     if not timestamp: timestamp = int(time.time())
@@ -62,15 +69,17 @@ def sensor_data_put(name,timestamp=None):
 	msg = "Storing {0} of type {1} with timestamp {2} to {3}".format(value,type,timestamp,name)
 	logging.info(msg)
 
-        datastore.addValue(name, timestamp, value, klass, flush=False)
+        datastore.addValue(name, timestamp, value, klass)
 
-        if time.time() - FLUSH_INTERVAL > lastflush:
-	    logging.info("call datastore.flush()")
-            datastore.flush()
-	    lastflush = time.time()
+        if time.time() - FLUSH_INTERVAL > get_lastflush(name):
+	    table = datastore.getTable(name)
+            with datastore.fileLock:
+                datastore.flush_table(name,table,close=False,index=True)
+	    lastflushes[name] = time.time()
 
         return {'error':None,'msg':msg}
     except Exception,e:
+	traceback.print_exc()
 	logging.error("Error: " + "{0} name={1} value={2} type={3}".format(e, name, value, type))
         return {'error':str(e),'msg':str(e)}
 
diff --git a/ebus/webhdf/static/control.html b/heap/ebus/webhdf/static/control.html
index db9e7b8..db9e7b8 100644
--- a/ebus/webhdf/static/control.html
+++ b/heap/ebus/webhdf/static/control.html
diff --git a/ebus/webhdf/static/css/stylesheet.css b/heap/ebus/webhdf/static/css/stylesheet.css
index a3b876c..a3b876c 100644
--- a/ebus/webhdf/static/css/stylesheet.css
+++ b/heap/ebus/webhdf/static/css/stylesheet.css
diff --git a/ebus/webhdf/static/draw.svg b/heap/ebus/webhdf/static/draw.svg
index e3c46b5..e3c46b5 100644
--- a/ebus/webhdf/static/draw.svg
+++ b/heap/ebus/webhdf/static/draw.svg
diff --git a/ebus/webhdf/static/index.html b/heap/ebus/webhdf/static/index.html
index 53f103e..53f103e 100644
--- a/ebus/webhdf/static/index.html
+++ b/heap/ebus/webhdf/static/index.html
diff --git a/ebus/webhdf/static/lib/d3-v2.6.1/d3.js b/heap/ebus/webhdf/static/lib/d3-v2.6.1/d3.js
index d71f57d..d71f57d 100644
--- a/ebus/webhdf/static/lib/d3-v2.6.1/d3.js
+++ b/heap/ebus/webhdf/static/lib/d3-v2.6.1/d3.js
diff --git a/ebus/webhdf/static/lib/d3-v2.6.1/d3.time.js b/heap/ebus/webhdf/static/lib/d3-v2.6.1/d3.time.js
index 4c1cda4..4c1cda4 100644
--- a/ebus/webhdf/static/lib/d3-v2.6.1/d3.time.js
+++ b/heap/ebus/webhdf/static/lib/d3-v2.6.1/d3.time.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/API.txt b/heap/ebus/webhdf/static/lib/flot-0.7/API.txt
index 8a8dbc2..8a8dbc2 100644
--- a/ebus/webhdf/static/lib/flot-0.7/API.txt
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/API.txt
diff --git a/ebus/webhdf/static/lib/flot-0.7/FAQ.txt b/heap/ebus/webhdf/static/lib/flot-0.7/FAQ.txt
index e02b761..e02b761 100644
--- a/ebus/webhdf/static/lib/flot-0.7/FAQ.txt
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/FAQ.txt
diff --git a/ebus/webhdf/static/lib/flot-0.7/LICENSE.txt b/heap/ebus/webhdf/static/lib/flot-0.7/LICENSE.txt
index 07d5b20..07d5b20 100644
--- a/ebus/webhdf/static/lib/flot-0.7/LICENSE.txt
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/LICENSE.txt
diff --git a/ebus/webhdf/static/lib/flot-0.7/Makefile b/heap/ebus/webhdf/static/lib/flot-0.7/Makefile
index b300f1a..b300f1a 100644
--- a/ebus/webhdf/static/lib/flot-0.7/Makefile
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/Makefile
diff --git a/ebus/webhdf/static/lib/flot-0.7/NEWS.txt b/heap/ebus/webhdf/static/lib/flot-0.7/NEWS.txt
index 5f8e1a0..5f8e1a0 100644
--- a/ebus/webhdf/static/lib/flot-0.7/NEWS.txt
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/NEWS.txt
diff --git a/ebus/webhdf/static/lib/flot-0.7/PLUGINS.txt b/heap/ebus/webhdf/static/lib/flot-0.7/PLUGINS.txt
index af3d90b..af3d90b 100644
--- a/ebus/webhdf/static/lib/flot-0.7/PLUGINS.txt
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/PLUGINS.txt
diff --git a/ebus/webhdf/static/lib/flot-0.7/README.txt b/heap/ebus/webhdf/static/lib/flot-0.7/README.txt
index 1e49787..1e49787 100644
--- a/ebus/webhdf/static/lib/flot-0.7/README.txt
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/README.txt
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/ajax.html b/heap/ebus/webhdf/static/lib/flot-0.7/examples/ajax.html
index 9b5ec85..9b5ec85 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/ajax.html
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/ajax.html
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/annotating.html b/heap/ebus/webhdf/static/lib/flot-0.7/examples/annotating.html
index 72c212b..72c212b 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/annotating.html
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/annotating.html
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/arrow-down.gif b/heap/ebus/webhdf/static/lib/flot-0.7/examples/arrow-down.gif
index e239d11..e239d11 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/arrow-down.gif
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/arrow-down.gif
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/arrow-left.gif b/heap/ebus/webhdf/static/lib/flot-0.7/examples/arrow-left.gif
index 93ffd5a..93ffd5a 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/arrow-left.gif
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/arrow-left.gif
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/arrow-right.gif b/heap/ebus/webhdf/static/lib/flot-0.7/examples/arrow-right.gif
index 5fd0530..5fd0530 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/arrow-right.gif
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/arrow-right.gif
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/arrow-up.gif b/heap/ebus/webhdf/static/lib/flot-0.7/examples/arrow-up.gif
index 7d19626..7d19626 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/arrow-up.gif
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/arrow-up.gif
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/basic.html b/heap/ebus/webhdf/static/lib/flot-0.7/examples/basic.html
index b116d94..b116d94 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/basic.html
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/basic.html
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/data-eu-gdp-growth-1.json b/heap/ebus/webhdf/static/lib/flot-0.7/examples/data-eu-gdp-growth-1.json
index 51952cf..51952cf 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/data-eu-gdp-growth-1.json
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/data-eu-gdp-growth-1.json
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/data-eu-gdp-growth-2.json b/heap/ebus/webhdf/static/lib/flot-0.7/examples/data-eu-gdp-growth-2.json
index 82004d6..82004d6 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/data-eu-gdp-growth-2.json
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/data-eu-gdp-growth-2.json
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/data-eu-gdp-growth-3.json b/heap/ebus/webhdf/static/lib/flot-0.7/examples/data-eu-gdp-growth-3.json
index 8684479..8684479 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/data-eu-gdp-growth-3.json
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/data-eu-gdp-growth-3.json
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/data-eu-gdp-growth-4.json b/heap/ebus/webhdf/static/lib/flot-0.7/examples/data-eu-gdp-growth-4.json
index b363578..b363578 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/data-eu-gdp-growth-4.json
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/data-eu-gdp-growth-4.json
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/data-eu-gdp-growth-5.json b/heap/ebus/webhdf/static/lib/flot-0.7/examples/data-eu-gdp-growth-5.json
index a7e1e13..a7e1e13 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/data-eu-gdp-growth-5.json
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/data-eu-gdp-growth-5.json
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/data-eu-gdp-growth.json b/heap/ebus/webhdf/static/lib/flot-0.7/examples/data-eu-gdp-growth.json
index a7e1e13..a7e1e13 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/data-eu-gdp-growth.json
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/data-eu-gdp-growth.json
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/data-japan-gdp-growth.json b/heap/ebus/webhdf/static/lib/flot-0.7/examples/data-japan-gdp-growth.json
index 855477c..855477c 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/data-japan-gdp-growth.json
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/data-japan-gdp-growth.json
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/data-usa-gdp-growth.json b/heap/ebus/webhdf/static/lib/flot-0.7/examples/data-usa-gdp-growth.json
index 33f66c6..33f66c6 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/data-usa-gdp-growth.json
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/data-usa-gdp-growth.json
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/graph-types.html b/heap/ebus/webhdf/static/lib/flot-0.7/examples/graph-types.html
index dd21a31..dd21a31 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/graph-types.html
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/graph-types.html
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/hs-2004-27-a-large_web.jpg b/heap/ebus/webhdf/static/lib/flot-0.7/examples/hs-2004-27-a-large_web.jpg
index a1d5c05..a1d5c05 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/hs-2004-27-a-large_web.jpg
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/hs-2004-27-a-large_web.jpg
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/image.html b/heap/ebus/webhdf/static/lib/flot-0.7/examples/image.html
index 073ad43..073ad43 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/image.html
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/image.html
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/index.html b/heap/ebus/webhdf/static/lib/flot-0.7/examples/index.html
index f24f750..f24f750 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/index.html
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/index.html
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/interacting-axes.html b/heap/ebus/webhdf/static/lib/flot-0.7/examples/interacting-axes.html
index 5b6e3bb..5b6e3bb 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/interacting-axes.html
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/interacting-axes.html
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/interacting.html b/heap/ebus/webhdf/static/lib/flot-0.7/examples/interacting.html
index d04eedd..d04eedd 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/interacting.html
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/interacting.html
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/layout.css b/heap/ebus/webhdf/static/lib/flot-0.7/examples/layout.css
index 7ef7dd4..7ef7dd4 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/layout.css
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/layout.css
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/multiple-axes.html b/heap/ebus/webhdf/static/lib/flot-0.7/examples/multiple-axes.html
index 4b32e64..4b32e64 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/multiple-axes.html
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/multiple-axes.html
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/navigate.html b/heap/ebus/webhdf/static/lib/flot-0.7/examples/navigate.html
index c916ef2..c916ef2 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/navigate.html
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/navigate.html
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/percentiles.html b/heap/ebus/webhdf/static/lib/flot-0.7/examples/percentiles.html
index 9f2ba3a..9f2ba3a 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/percentiles.html
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/percentiles.html
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/pie.html b/heap/ebus/webhdf/static/lib/flot-0.7/examples/pie.html
index 8f51411..8f51411 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/pie.html
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/pie.html
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/realtime.html b/heap/ebus/webhdf/static/lib/flot-0.7/examples/realtime.html
index 3b427e1..3b427e1 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/realtime.html
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/realtime.html
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/resize.html b/heap/ebus/webhdf/static/lib/flot-0.7/examples/resize.html
index d1e18c3..d1e18c3 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/resize.html
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/resize.html
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/selection.html b/heap/ebus/webhdf/static/lib/flot-0.7/examples/selection.html
index 1646f5a..1646f5a 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/selection.html
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/selection.html
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/setting-options.html b/heap/ebus/webhdf/static/lib/flot-0.7/examples/setting-options.html
index 8d1967e..8d1967e 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/setting-options.html
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/setting-options.html
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/stacking.html b/heap/ebus/webhdf/static/lib/flot-0.7/examples/stacking.html
index b7de391..b7de391 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/stacking.html
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/stacking.html
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/symbols.html b/heap/ebus/webhdf/static/lib/flot-0.7/examples/symbols.html
index e71b1aa..e71b1aa 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/symbols.html
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/symbols.html
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/thresholding.html b/heap/ebus/webhdf/static/lib/flot-0.7/examples/thresholding.html
index f10144a..f10144a 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/thresholding.html
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/thresholding.html
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/time.html b/heap/ebus/webhdf/static/lib/flot-0.7/examples/time.html
index da62347..da62347 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/time.html
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/time.html
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/tracking.html b/heap/ebus/webhdf/static/lib/flot-0.7/examples/tracking.html
index c116159..c116159 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/tracking.html
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/tracking.html
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/turning-series.html b/heap/ebus/webhdf/static/lib/flot-0.7/examples/turning-series.html
index bc6fd9f..bc6fd9f 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/turning-series.html
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/turning-series.html
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/visitors.html b/heap/ebus/webhdf/static/lib/flot-0.7/examples/visitors.html
index 8a9d4d7..8a9d4d7 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/visitors.html
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/visitors.html
diff --git a/ebus/webhdf/static/lib/flot-0.7/examples/zooming.html b/heap/ebus/webhdf/static/lib/flot-0.7/examples/zooming.html
index 9a4ef22..9a4ef22 100644
--- a/ebus/webhdf/static/lib/flot-0.7/examples/zooming.html
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/examples/zooming.html
diff --git a/ebus/webhdf/static/lib/flot-0.7/excanvas.js b/heap/ebus/webhdf/static/lib/flot-0.7/excanvas.js
index c40d6f7..c40d6f7 100644
--- a/ebus/webhdf/static/lib/flot-0.7/excanvas.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/excanvas.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/excanvas.min.js b/heap/ebus/webhdf/static/lib/flot-0.7/excanvas.min.js
index 12c74f7..12c74f7 100644
--- a/ebus/webhdf/static/lib/flot-0.7/excanvas.min.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/excanvas.min.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/jquery.colorhelpers.js b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.colorhelpers.js
index d3524d7..d3524d7 100644
--- a/ebus/webhdf/static/lib/flot-0.7/jquery.colorhelpers.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.colorhelpers.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/jquery.colorhelpers.min.js b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.colorhelpers.min.js
index 7f44c57..7f44c57 100644
--- a/ebus/webhdf/static/lib/flot-0.7/jquery.colorhelpers.min.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.colorhelpers.min.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.crosshair.js b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.crosshair.js
index 1d433f0..1d433f0 100644
--- a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.crosshair.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.crosshair.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.crosshair.min.js b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.crosshair.min.js
index ccaf240..ccaf240 100644
--- a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.crosshair.min.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.crosshair.min.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.fillbetween.js b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.fillbetween.js
index 69700e7..69700e7 100644
--- a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.fillbetween.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.fillbetween.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.fillbetween.min.js b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.fillbetween.min.js
index 47f3dfb..47f3dfb 100644
--- a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.fillbetween.min.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.fillbetween.min.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.image.js b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.image.js
index 29ccb12..29ccb12 100644
--- a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.image.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.image.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.image.min.js b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.image.min.js
index 9480c1e..9480c1e 100644
--- a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.image.min.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.image.min.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.js b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.js
index aabc544..aabc544 100644
--- a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.min.js b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.min.js
index 4467fc5..4467fc5 100644
--- a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.min.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.min.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.navigate.js b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.navigate.js
index f2b9760..f2b9760 100644
--- a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.navigate.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.navigate.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.navigate.min.js b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.navigate.min.js
index ecf63c9..ecf63c9 100644
--- a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.navigate.min.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.navigate.min.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.pie.js b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.pie.js
index 70941dd..70941dd 100644
--- a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.pie.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.pie.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.pie.min.js b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.pie.min.js
index b7bf870..b7bf870 100644
--- a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.pie.min.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.pie.min.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.resize.js b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.resize.js
index 69dfb24..69dfb24 100644
--- a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.resize.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.resize.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.resize.min.js b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.resize.min.js
index 1fa0771..1fa0771 100644
--- a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.resize.min.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.resize.min.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.selection.js b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.selection.js
index 7f7b326..7f7b326 100644
--- a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.selection.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.selection.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.selection.min.js b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.selection.min.js
index badc005..badc005 100644
--- a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.selection.min.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.selection.min.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.stack.js b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.stack.js
index a31d5dc..a31d5dc 100644
--- a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.stack.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.stack.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.stack.min.js b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.stack.min.js
index bba2a0e..bba2a0e 100644
--- a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.stack.min.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.stack.min.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.symbol.js b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.symbol.js
index a32fe31..a32fe31 100644
--- a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.symbol.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.symbol.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.symbol.min.js b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.symbol.min.js
index 272e003..272e003 100644
--- a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.symbol.min.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.symbol.min.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.threshold.js b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.threshold.js
index 0b2e7ac..0b2e7ac 100644
--- a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.threshold.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.threshold.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.threshold.min.js b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.threshold.min.js
index d8b79df..d8b79df 100644
--- a/ebus/webhdf/static/lib/flot-0.7/jquery.flot.threshold.min.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.flot.threshold.min.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/jquery.js b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.js
index 78fcfa4..78fcfa4 100644
--- a/ebus/webhdf/static/lib/flot-0.7/jquery.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.js
diff --git a/ebus/webhdf/static/lib/flot-0.7/jquery.min.js b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.min.js
index 6422523..6422523 100644
--- a/ebus/webhdf/static/lib/flot-0.7/jquery.min.js
+++ b/heap/ebus/webhdf/static/lib/flot-0.7/jquery.min.js
diff --git a/ebus/webhdf/static/lib/jquery-1.6.2/jquery-1.6.2.js b/heap/ebus/webhdf/static/lib/jquery-1.6.2/jquery-1.6.2.js
index f3201aa..f3201aa 100644
--- a/ebus/webhdf/static/lib/jquery-1.6.2/jquery-1.6.2.js
+++ b/heap/ebus/webhdf/static/lib/jquery-1.6.2/jquery-1.6.2.js
diff --git a/ebus/webhdf/static/lib/jquery-1.6.2/jquery-1.6.2.min.js b/heap/ebus/webhdf/static/lib/jquery-1.6.2/jquery-1.6.2.min.js
index 48590ec..48590ec 100644
--- a/ebus/webhdf/static/lib/jquery-1.6.2/jquery-1.6.2.min.js
+++ b/heap/ebus/webhdf/static/lib/jquery-1.6.2/jquery-1.6.2.min.js
diff --git a/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_flat_0_aaaaaa_40x100.png b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_flat_0_aaaaaa_40x100.png
index 5b5dab2..5b5dab2 100644
--- a/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_flat_0_aaaaaa_40x100.png
+++ b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_flat_75_ffffff_40x100.png b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_flat_75_ffffff_40x100.png
index ac8b229..ac8b229 100644
--- a/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_flat_75_ffffff_40x100.png
+++ b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_55_fbf9ee_1x400.png b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_55_fbf9ee_1x400.png
index ad3d634..ad3d634 100644
--- a/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_55_fbf9ee_1x400.png
+++ b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_65_ffffff_1x400.png b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_65_ffffff_1x400.png
index 42ccba2..42ccba2 100644
--- a/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_65_ffffff_1x400.png
+++ b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_dadada_1x400.png b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_dadada_1x400.png
index 5a46b47..5a46b47 100644
--- a/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_dadada_1x400.png
+++ b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_e6e6e6_1x400.png b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_e6e6e6_1x400.png
index 86c2baa..86c2baa 100644
--- a/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_e6e6e6_1x400.png
+++ b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_95_fef1ec_1x400.png b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_95_fef1ec_1x400.png
index 4443fdc..4443fdc 100644
--- a/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_95_fef1ec_1x400.png
+++ b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_highlight-soft_75_cccccc_1x100.png
index 7c9fa6c..7c9fa6c 100644
--- a/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+++ b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-icons_222222_256x240.png b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-icons_222222_256x240.png
index b273ff1..b273ff1 100644
--- a/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-icons_222222_256x240.png
+++ b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-icons_222222_256x240.png
diff --git a/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-icons_2e83ff_256x240.png b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-icons_2e83ff_256x240.png
index 09d1cdc..09d1cdc 100644
--- a/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-icons_2e83ff_256x240.png
+++ b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-icons_2e83ff_256x240.png
diff --git a/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-icons_454545_256x240.png b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-icons_454545_256x240.png
index 59bd45b..59bd45b 100644
--- a/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-icons_454545_256x240.png
+++ b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-icons_454545_256x240.png
diff --git a/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-icons_888888_256x240.png b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-icons_888888_256x240.png
index 6d02426..6d02426 100644
--- a/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-icons_888888_256x240.png
+++ b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-icons_888888_256x240.png
diff --git a/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-icons_cd0a0a_256x240.png b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-icons_cd0a0a_256x240.png
index 2ab019b..2ab019b 100644
--- a/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-icons_cd0a0a_256x240.png
+++ b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/images/ui-icons_cd0a0a_256x240.png
diff --git a/ebus/webhdf/static/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.css b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.css
index ad212da..ad212da 100644
--- a/ebus/webhdf/static/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.css
+++ b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.css
diff --git a/ebus/webhdf/static/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.min.js b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.min.js
index f9e4f1e..f9e4f1e 100644
--- a/ebus/webhdf/static/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.min.js
+++ b/heap/ebus/webhdf/static/lib/jquery-ui-1.8.14/jquery-ui-1.8.14.custom.min.js
diff --git a/ebus/webhdf/static/src/d3.control.js b/heap/ebus/webhdf/static/src/d3.control.js
index 489edea..489edea 100644
--- a/ebus/webhdf/static/src/d3.control.js
+++ b/heap/ebus/webhdf/static/src/d3.control.js
diff --git a/ebus/webhdf/static/src/d3.plot.js b/heap/ebus/webhdf/static/src/d3.plot.js
index d9a7d04..d9a7d04 100644
--- a/ebus/webhdf/static/src/d3.plot.js
+++ b/heap/ebus/webhdf/static/src/d3.plot.js
diff --git a/ebus/webhdf/static/src/ebus.js b/heap/ebus/webhdf/static/src/ebus.js
index 5256288..611c65b 100644
--- a/ebus/webhdf/static/src/ebus.js
+++ b/heap/ebus/webhdf/static/src/ebus.js
@@ -36,6 +36,11 @@ $(document).ready(function(){
 		 "description":"Aussentemperatur",
 		 "show":false, 
 		 "color":"#84b500"},
+                {"sensorname":"dockstar.load1",
+		 "description":"System Load (1m, *10)",
+		 "show":false,
+		 "color":"blue",
+		 "mapFunc":function(d){return [d[0],d[1]*10]}},
                 {"sensorname":"dockstar.load5",
 		 "description":"System Load (5m, *10)",
 		 "show":false,
diff --git a/sql/chart.r b/heap/sql/chart.r
index 5575293..5575293 100755
--- a/sql/chart.r
+++ b/heap/sql/chart.r
diff --git a/sql/populate_cache.sql b/heap/sql/populate_cache.sql
index 2733cbb..2733cbb 100644
--- a/sql/populate_cache.sql
+++ b/heap/sql/populate_cache.sql
diff --git a/sql/refresh_cache.sql b/heap/sql/refresh_cache.sql
index 8734348..8734348 100644
--- a/sql/refresh_cache.sql
+++ b/heap/sql/refresh_cache.sql
diff --git a/sql/schema_ddl.sql b/heap/sql/schema_ddl.sql
index 15f969b..15f969b 100644
--- a/sql/schema_ddl.sql
+++ b/heap/sql/schema_ddl.sql
diff --git a/sql/trigger.sql b/heap/sql/trigger.sql
index 2191ca0..2191ca0 100644
--- a/sql/trigger.sql
+++ b/heap/sql/trigger.sql
diff --git a/importtest.py b/importtest.py
deleted file mode 100644
index c51aab9..0000000
--- a/importtest.py
+++ /dev/null
@@ -1,216 +0,0 @@
-# -*- coding: utf-8 -*-
-import sys
-import time
-import psycopg2
-from ebus.datastore import Datastore
-from subprocess import Popen,PIPE
-
-
-conn = psycopg2.connect("dbname=ebus user=ebus")
-cur = conn.cursor()
-sql = """SELECT * from sensor"""
-cur.execute(sql)
-sensors = cur.fetchall()
-sensors = map(lambda a: (a[0], a[1]), sensors)
-sensors = dict(sensors)
-cur.close()
-conn.close()
-
-d = Datastore("testhdffiles")
-
-
-pg_dump = Popen(["psql"], stdin=PIPE, stdout=PIPE)
-pg_dump.stdin.write("COPY value TO stdout WITH DELIMITER '|' NULL AS '';\n")
-
-c=0
-for line in pg_dump.stdout.xreadlines():
-     (oid, timestamp, sensor_id, type, value_float, value_int, value_string) = line.split("|")
-     name = sensors[int(sensor_id)]
- #     if value_float == "\N": value_float = None
- #     else: value_float = float(value_float)
- #     if value_int == "\N": value_int = None
- #     else: value_int = int(value_int)
- #     if value_string =="\N": value_string = None
- #
-
-     timestamp = time.strptime(timestamp.split(".")[0], "%Y-%m-%d %H:%M:%S")
-     timestamp = time.mktime(timestamp)
-
-     c += 1
-     if not c % 100000:
-         print c
-         d.flush()
- 
-     if value_int != '':
-         d.addValueInt(name, timestamp, int(value_int))
-     elif value_float != '':
-         d.addValueFloat(name, timestamp, float(value_float))
-     elif value_string != '':
-         d.addValueString(name, timestamp, value_string)
-     else:
-         print 'skip: %s' % (name, timestamp, value_int, value_float, value_string)
-
-d.close()
- 
- #@app.route('/sensor/:name')
- #def sensor_data(soup,name):
- #    try:
- #        sensor_id = soup.sensor.filter(soup.sensor.name == name).one().id
- #
- #        conn = soup.connection()
- #        sql = text("""SELECT timestamp, COALESCE(value_int, value_float) as "value_real"
- #                        FROM value
- #                       WHERE sensor_id = :sensor_id
- #                    ORDER BY timestamp DESC
-from sqlsoup import SQLSoup as SqlSoup
- #                       LIMIT 1""")
- #        value = conn.execute(sql, sensor_id=sensor_id).first()
- #
- #        return {'sensor':name,'data':[maketime(value.timestamp), float(value.value_real)], 'error':None}
- #    except Exception,e:
- #        return {'sensor':name,'data':None, 'error':str(e)}
- #
- #@app.route('/sensor/:name/:startdate/:enddate')
- #def sensor_data_fromto(soup,name,startdate,enddate):
- #    try:
- #        interval = float(enddate) - float(startdate)
- #        modulo = interval / 500 #500 values
- #
- #        startdate = datetime.datetime.fromtimestamp(float(startdate))
- #        enddate = datetime.datetime.fromtimestamp(float(enddate))
- #
- #        if interval <= 0: raise Exception("Invalid interval")
- #        if interval >= 14 * 24 * 60 * 60: raise Exception("interval too big")
- #
- #        sensor_id = soup.sensor.filter(soup.sensor.name == name).one().id
- #
- #        conn = soup.connection()
- #        sql = text("""
- #        SELECT to_timestamp( extract(epoch from timestamp)::int - extract(epoch from timestamp)::int % :modulo ) "round_timestamp", 
- #               AVG(COALESCE(value_int,value_float)) "value_real" 
- #         FROM value
- #        WHERE timestamp > :startdate
- #          AND timestamp < :enddate
- #          AND sensor_id = :sensor_id
- #        GROUP BY "round_timestamp"
- #        ORDER BY "round_timestamp"
- #        """)
- #
- #        values = conn.execute(sql,
- #                              sensor_id=sensor_id,
- #                              startdate=startdate, 
- #                              enddate=enddate, 
- #                              modulo=modulo).fetchall()
- #
- #        values = map(lambda row: (maketime(row.round_timestamp), row.value_real),
- #                     values)
- #
- #        return {'sensor':name,'data':values, 'error':None}
- #    except Exception,e:
- #        return {'sensor':name, 'data':None, 'error':str(e)}
- #
- #@app.route('/sensor_cached/:name/:timestamp_from')
- #def sensor_data_cached_fromto(soup, name, timestamp_from):
- #    try:
- #        timestamp_from = datetime.datetime.fromtimestamp(float(timestamp_from))
- #        sensor_id = soup.sensor.filter(soup.sensor.name == name).one().id
- #
- #        # select data from cache-view
- #        conn = soup.connection()
- #        sql = text("""SELECT timestamp, value_real AS "value_real"
- #                        FROM vi_value_cache 
- #                       WHERE timestamp >= :timestamp_from
- #                         AND sensor_id = :sensor_id
- #                    ORDER BY timestamp""")
- #        values = conn.execute(sql, timestamp_from=timestamp_from, sensor_id=sensor_id).fetchall()
- #        values = map(lambda row: (maketime(row.timestamp), row.value_real.__float__()),
- #                     values)
- #
- #        return {'sensor':name,'data':values, 'error':None}
- #    except Exception,e:
- #        return {'sensor':name, 'data':None, 'error':str(e)}
- #
- #import select
- #import psycopg2
- #
- #@app.route('/stream')
- #@app.route('/stream/:startdate')
- #def stream(soup, startdate=None):
- #    connection = soup.connection()
- #    conn = connection.connection
- #
- #    time_start = startdate != None and parsetime(float(startdate)) \
- #                 or now(connection)
- #
- #    
- #    conn.set_isolation_level(psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT)
- #
- #    cursor = conn.cursor()
- #    cursor.execute("LISTEN evt_ebus_value_insert;")
- #
- #    values = []
- #    fails = 0
- #    while fails < 5:
- #        if select.select([conn],[],[],10) == ([],[],[]):
- #            time_stop = now(connection)
- #            fails += 1
- #        else:
- #            conn.poll()
- #
- #            notify = conn.notifies.pop()
- #            if not notify:
- #                continue
- #
- #            time_stop = now(connection)
- #            print "time_stop %s"%time_stop
- #            sql = text("""SELECT sensor.name,
- #                                 value.timestamp,
- #                                 COALESCE(value.value_int,value.value_float) "value_real",
- #                                 value_string
- #                            FROM value, sensor
- #                           WHERE value.sensor_id = sensor.id
- #                             AND timestamp >= :time_start
- #                             AND timestamp < :time_stop""")
- #            values = map(lambda row: {
- #                "name":row.name,
- #                "timestamp":maketime(row.timestamp),
- #                "value_real":row.value_real != None and row.value_real.__float__() or None,
- #                "value_string":row.value_string
- #                },
- #                connection.execute(sql, time_start=time_start, time_stop=time_stop))
- #
- #            break
- #
- #    cursor.close()
- #    return {'time_start' : maketime(time_start), 'time_stop':maketime(time_stop),
- #            'data':values}
- #
- #@app.route("/all_values")
- #def all_values(soup):
- #    conn = soup.connection()
- #
- #    sql = text("""
- #    SELECT sensor.name,
- #           value.timestamp,
- #           COALESCE(value.value_int,value.value_float) "value_real",
- #           value_string
- #      FROM value, sensor, (SELECT MAX(timestamp) as timestamp,
- #                                  sensor_id
- #                             FROM value
- #                            WHERE timestamp > CURRENT_TIMESTAMP - '15 minutes'::interval
- #                         GROUP BY sensor_id) last_value
- #     WHERE value.timestamp = last_value.timestamp
- #       AND value.sensor_id = last_value.sensor_id
- #       AND value.sensor_id = sensor.id""")
- #
- #    time_stop = now(conn)
- #    values = map(lambda row: {
- #            "name":row.name,
- #            "timestamp":maketime(row.timestamp),
- #            "value_real":row.value_real != None and row.value_real.__float__() or None,
- #            "value_string":row.value_string},
- #                conn.execute(sql))
- #
- #    return {'data':values, 'time_stop':maketime(time_stop)}
- #                               
- ## vim: autoindent tabstop=4 shiftwidth=4 expandtab softtabstop=4 filetype=python
diff --git a/setup.py b/setup.py
deleted file mode 100644
index aa607ed..0000000
--- a/setup.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env python
-import subprocess
-from setuptools import setup, find_packages
-
-
-version = subprocess.Popen(["git", "describe", "--tags", "--long"],stdout=subprocess.PIPE).communicate()[0].strip()
-assert len(version) > 3
-
-
-setup(
-    name='ebus',
-    version=version,
-    description='Ebus over TCP Library',
-    author='xapek.org',
-    author_email='ebus@xapek.org',
-    url='http://xapek.org',
-    scripts=[
-        "bin/ebus_dump.py",
-        "bin/ebus_app.py",
-        "bin/web_prod.py",
-        "bin/web_dev.py",
-        ],
-    packages=find_packages(),
-    package_data={'doc':['*.txt'], 'xml':['*.xml']},
-    include_package_data = True,
-    long_description="""ebus library""",
-    classifiers=[
-        "Programming Language :: Python",
-        "Topic :: Software Development :: Libraries :: Python Modules",
-        "Intended Audience :: Developers",
-        ],
-    requires=[
-        "bottle",
-        "SQLAlchemy",
-        "psycopg2",
-        ],
-    )
-