();
-
- @Override
- public void init() throws ServletException {
- super.init();
-
- try {
- head = IOUtils.toString(getClass().getResourceAsStream("head.html"));
- bottom = IOUtils.toString(getClass().getResourceAsStream("bottom.html"));
- } catch (IOException e) {
- throw new ServletException(e);
- }
-
-/*
- mapping.put("queries", new QueryOverview());
- mapping.put("login", new Login());
- mapping.put("jvm", new JvmStats());
-*/
-
- // queries/select/1234
- // queries/page/2
- // queries/cancel
- // queries/select/1234/select/5432
-
- // queries/action=select/actionValue=1234
- // transactions/action=page&actionValue=3
- // settings
- }
-
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- String uri = req.getRequestURI();
-
-/*
- String [] parts = uri.split("\\/");
- int index = 0;
-
- if (parts.length > 0) {
- Page page = mapping.get(parts[index++]);
-
- while(index < (parts.length - 1)) {
- page = page.processGetRequest(parts[index++], parts[index++]);
- }
- }
-*/
-
- doPost(req, resp);
- }
-
- @Override
- protected void doPost(final HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- long nano = System.nanoTime();
-
-/*
- HttpSession session = req.getSession();
- boolean ajax = "true".equals(req.getParameter("ajax"));
-
- resp.setContentType("text/html");
-
- Page page = (Page)session.getAttribute("page");
- Page menu = (Page)session.getAttribute("menu");
-
- session.setMaxInactiveInterval(1800);
-
- if (menu == null) {
- menu = new Menu();
-
- session.setAttribute("menu", menu);
- }
-
- if (Settings.get().isSecure() && session.getAttribute("loggedin") == null && !(page instanceof Login)) {
- page = new Login();
- } else if (!(page instanceof Login)) {
- if (page == null || "menumain".equals(req.getParameter("action"))) {
- page = new QueryOverview();
- } else if ("menulive".equals(req.getParameter("action"))) {
- page = new LiveOverview();
- } else if ("menutransactions".equals(req.getParameter("action"))) {
- page = new TransactionOverview();
- } else if ("menusettings".equals(req.getParameter("action"))) {
- page = new SettingsOverview();
- } else if ("menuinfo".equals(req.getParameter("action"))) {
- page = new ServerInfo();
- } else if ("jvmstats".equals(req.getParameter("action"))) {
- page = new JvmStats();
- } else {
- page = page .processRequest(req);
- }
- } else {
- page = page .processRequest(req);
- }
-
- menu.processRequest(req);
-
- session.setAttribute("page", page);
-
- if (!ajax) {
- resp.getWriter().print(head);
- }
-
- resp.getWriter().print(menu.render(req));
-
- resp.getWriter().println("");
-
- resp.getWriter().print(Warnings.get(req).render(req));
-
- long time = System.nanoTime();
- resp.getWriter().print(page.render(req));
- resp.getWriter().println("
");
-
- if (!ajax) {
- resp.getWriter().print(bottom);
- }
-*/
-
- //logger.debug("Request ends, time=" + Util.formatNano(System.nanoTime() - nano) + ", page=" + page.getClass().getSimpleName());
- }
-
-}
diff --git a/.idea/ant.xml b/.idea/ant.xml
index 864bdba..48b830b 100644
--- a/.idea/ant.xml
+++ b/.idea/ant.xml
@@ -3,7 +3,6 @@
-
diff --git a/.idea/libraries/junit_4_5.xml b/.idea/libraries/junit_4_5.xml
deleted file mode 100644
index a3352c2..0000000
--- a/.idea/libraries/junit_4_5.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml
deleted file mode 100644
index 4992926..0000000
--- a/.idea/libraries/lib.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c490a2d..be607d9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,7 @@
http://www.w3.org/1999/xhtml
-
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 62d5a07..0e22cb8 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,7 +3,6 @@
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 8364c54..e9c8948 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,7 +2,6 @@
-
diff --git a/Simple-jdbc-statistics.iml b/Simple-jdbc-statistics.iml
index 584fd0a..ef15763 100644
--- a/Simple-jdbc-statistics.iml
+++ b/Simple-jdbc-statistics.iml
@@ -9,18 +9,19 @@
+
+
-
+
-
+
+
+
-
-
-
diff --git a/lib/ext/simple-web-0.1.jar b/lib/ext/simple-web-0.1.jar
index 28cb6a1..8d7da95 100644
--- a/lib/ext/simple-web-0.1.jar
+++ b/lib/ext/simple-web-0.1.jar
Binary files differ
diff --git a/lib/ext/ssr-0.5.jar b/lib/ext/ssr-0.5.jar
deleted file mode 100644
index dcd095d..0000000
--- a/lib/ext/ssr-0.5.jar
+++ /dev/null
Binary files differ
diff --git a/lib/servlet-api-2.5.jar b/lib/servlet-api-2.5.jar
deleted file mode 100644
index 20b5755..0000000
--- a/lib/servlet-api-2.5.jar
+++ /dev/null
Binary files differ
diff --git a/src/nl/astraeus/jdbc/Driver.java b/src/nl/astraeus/jdbc/Driver.java
index 7d4c505..afa0ba7 100644
--- a/src/nl/astraeus/jdbc/Driver.java
+++ b/src/nl/astraeus/jdbc/Driver.java
@@ -1,6 +1,5 @@
package nl.astraeus.jdbc;
-import nl.astraeus.http.SimpleWebServer;
import nl.astraeus.jdbc.web.JdbcStatsMappingProvider;
import nl.astraeus.jdbc.web.model.Settings;
import nl.astraeus.web.NanoHttpdSimpleWeb;
@@ -23,9 +22,9 @@
final private static String URL_SECURE_PREFIX = "jdbc:secstat:";
private static volatile boolean started = false;
- private static SimpleWebServer server = null;
+ private static NanoHttpdSimpleWeb server = null;
- public static SimpleWebServer getServer() {
+ public static NanoHttpdSimpleWeb getServer() {
return server;
}
diff --git a/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java b/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
deleted file mode 100644
index b3ea872..0000000
--- a/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package nl.astraeus.jdbc.web;
-
-import nl.astraeus.jdbc.util.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * User: rnentjes
- * Date: 3/28/12
- * Time: 3:05 PM
- */
-public class JdbcStatisticsServlet extends HttpServlet {
- private final static Logger logger = LoggerFactory.getLogger(JdbcStatisticsServlet.class);
-
- private String head;
- private String bottom;
-// private Map mapping = new HashMap();
-
- @Override
- public void init() throws ServletException {
- super.init();
-
- try {
- head = IOUtils.toString(getClass().getResourceAsStream("head.html"));
- bottom = IOUtils.toString(getClass().getResourceAsStream("bottom.html"));
- } catch (IOException e) {
- throw new ServletException(e);
- }
-
-/*
- mapping.put("queries", new QueryOverview());
- mapping.put("login", new Login());
- mapping.put("jvm", new JvmStats());
-*/
-
- // queries/select/1234
- // queries/page/2
- // queries/cancel
- // queries/select/1234/select/5432
-
- // queries/action=select/actionValue=1234
- // transactions/action=page&actionValue=3
- // settings
- }
-
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- String uri = req.getRequestURI();
-
-/*
- String [] parts = uri.split("\\/");
- int index = 0;
-
- if (parts.length > 0) {
- Page page = mapping.get(parts[index++]);
-
- while(index < (parts.length - 1)) {
- page = page.processGetRequest(parts[index++], parts[index++]);
- }
- }
-*/
-
- doPost(req, resp);
- }
-
- @Override
- protected void doPost(final HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- long nano = System.nanoTime();
-
-/*
- HttpSession session = req.getSession();
- boolean ajax = "true".equals(req.getParameter("ajax"));
-
- resp.setContentType("text/html");
-
- Page page = (Page)session.getAttribute("page");
- Page menu = (Page)session.getAttribute("menu");
-
- session.setMaxInactiveInterval(1800);
-
- if (menu == null) {
- menu = new Menu();
-
- session.setAttribute("menu", menu);
- }
-
- if (Settings.get().isSecure() && session.getAttribute("loggedin") == null && !(page instanceof Login)) {
- page = new Login();
- } else if (!(page instanceof Login)) {
- if (page == null || "menumain".equals(req.getParameter("action"))) {
- page = new QueryOverview();
- } else if ("menulive".equals(req.getParameter("action"))) {
- page = new LiveOverview();
- } else if ("menutransactions".equals(req.getParameter("action"))) {
- page = new TransactionOverview();
- } else if ("menusettings".equals(req.getParameter("action"))) {
- page = new SettingsOverview();
- } else if ("menuinfo".equals(req.getParameter("action"))) {
- page = new ServerInfo();
- } else if ("jvmstats".equals(req.getParameter("action"))) {
- page = new JvmStats();
- } else {
- page = page .processRequest(req);
- }
- } else {
- page = page .processRequest(req);
- }
-
- menu.processRequest(req);
-
- session.setAttribute("page", page);
-
- if (!ajax) {
- resp.getWriter().print(head);
- }
-
- resp.getWriter().print(menu.render(req));
-
- resp.getWriter().println("");
-
- resp.getWriter().print(Warnings.get(req).render(req));
-
- long time = System.nanoTime();
- resp.getWriter().print(page.render(req));
- resp.getWriter().println("
");
-
- if (!ajax) {
- resp.getWriter().print(bottom);
- }
-*/
-
- //logger.debug("Request ends, time=" + Util.formatNano(System.nanoTime() - nano) + ", page=" + page.getClass().getSimpleName());
- }
-
-}
diff --git a/src/nl/astraeus/jdbc/web/ResourceServlet.java b/src/nl/astraeus/jdbc/web/ResourceServlet.java
deleted file mode 100644
index 60e8af8..0000000
--- a/src/nl/astraeus/jdbc/web/ResourceServlet.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package nl.astraeus.jdbc.web;
-
-import nl.astraeus.jdbc.util.IOUtils;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * User: rnentjes
- * Date: 3/28/12
- * Time: 3:05 PM
- */
-public class ResourceServlet extends HttpServlet {
-
- private long startup = System.currentTimeMillis();
-
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- String uri = req.getRequestURI();
-
- uri = "nl/astraeus/jdbc/web" + uri;
- InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream(uri);
-
- if (in == null) {
- resp.sendError(404, "Cannot find resource '" + uri + "'.");
- } else {
- try {
- if (uri.endsWith("js")) {
- resp.setContentType("text/javascript");
- } else if (uri.endsWith("css")) {
- resp.setContentType("text/css");
- } else if (uri.endsWith("png")) {
- resp.setContentType("image/png");
- } else if (uri.endsWith("jpg")) {
- resp.setContentType("image/jpeg");
- } else if (uri.endsWith("gif")) {
- resp.setContentType("image/gif");
- }
-
- resp.setHeader("Cache-Control", "max-age=3600");
- resp.setHeader("ETag", Long.toHexString(startup));
-
- IOUtils.copy(in, resp.getOutputStream());
- } finally {
- in.close();
- }
- }
- }
-
-}
diff --git a/.idea/ant.xml b/.idea/ant.xml
index 864bdba..48b830b 100644
--- a/.idea/ant.xml
+++ b/.idea/ant.xml
@@ -3,7 +3,6 @@
-
diff --git a/.idea/libraries/junit_4_5.xml b/.idea/libraries/junit_4_5.xml
deleted file mode 100644
index a3352c2..0000000
--- a/.idea/libraries/junit_4_5.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml
deleted file mode 100644
index 4992926..0000000
--- a/.idea/libraries/lib.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c490a2d..be607d9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,7 @@
http://www.w3.org/1999/xhtml
-
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 62d5a07..0e22cb8 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,7 +3,6 @@
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 8364c54..e9c8948 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,7 +2,6 @@
-
diff --git a/Simple-jdbc-statistics.iml b/Simple-jdbc-statistics.iml
index 584fd0a..ef15763 100644
--- a/Simple-jdbc-statistics.iml
+++ b/Simple-jdbc-statistics.iml
@@ -9,18 +9,19 @@
+
+
-
+
-
+
+
+
-
-
-
diff --git a/lib/ext/simple-web-0.1.jar b/lib/ext/simple-web-0.1.jar
index 28cb6a1..8d7da95 100644
--- a/lib/ext/simple-web-0.1.jar
+++ b/lib/ext/simple-web-0.1.jar
Binary files differ
diff --git a/lib/ext/ssr-0.5.jar b/lib/ext/ssr-0.5.jar
deleted file mode 100644
index dcd095d..0000000
--- a/lib/ext/ssr-0.5.jar
+++ /dev/null
Binary files differ
diff --git a/lib/servlet-api-2.5.jar b/lib/servlet-api-2.5.jar
deleted file mode 100644
index 20b5755..0000000
--- a/lib/servlet-api-2.5.jar
+++ /dev/null
Binary files differ
diff --git a/src/nl/astraeus/jdbc/Driver.java b/src/nl/astraeus/jdbc/Driver.java
index 7d4c505..afa0ba7 100644
--- a/src/nl/astraeus/jdbc/Driver.java
+++ b/src/nl/astraeus/jdbc/Driver.java
@@ -1,6 +1,5 @@
package nl.astraeus.jdbc;
-import nl.astraeus.http.SimpleWebServer;
import nl.astraeus.jdbc.web.JdbcStatsMappingProvider;
import nl.astraeus.jdbc.web.model.Settings;
import nl.astraeus.web.NanoHttpdSimpleWeb;
@@ -23,9 +22,9 @@
final private static String URL_SECURE_PREFIX = "jdbc:secstat:";
private static volatile boolean started = false;
- private static SimpleWebServer server = null;
+ private static NanoHttpdSimpleWeb server = null;
- public static SimpleWebServer getServer() {
+ public static NanoHttpdSimpleWeb getServer() {
return server;
}
diff --git a/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java b/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
deleted file mode 100644
index b3ea872..0000000
--- a/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package nl.astraeus.jdbc.web;
-
-import nl.astraeus.jdbc.util.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * User: rnentjes
- * Date: 3/28/12
- * Time: 3:05 PM
- */
-public class JdbcStatisticsServlet extends HttpServlet {
- private final static Logger logger = LoggerFactory.getLogger(JdbcStatisticsServlet.class);
-
- private String head;
- private String bottom;
-// private Map mapping = new HashMap();
-
- @Override
- public void init() throws ServletException {
- super.init();
-
- try {
- head = IOUtils.toString(getClass().getResourceAsStream("head.html"));
- bottom = IOUtils.toString(getClass().getResourceAsStream("bottom.html"));
- } catch (IOException e) {
- throw new ServletException(e);
- }
-
-/*
- mapping.put("queries", new QueryOverview());
- mapping.put("login", new Login());
- mapping.put("jvm", new JvmStats());
-*/
-
- // queries/select/1234
- // queries/page/2
- // queries/cancel
- // queries/select/1234/select/5432
-
- // queries/action=select/actionValue=1234
- // transactions/action=page&actionValue=3
- // settings
- }
-
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- String uri = req.getRequestURI();
-
-/*
- String [] parts = uri.split("\\/");
- int index = 0;
-
- if (parts.length > 0) {
- Page page = mapping.get(parts[index++]);
-
- while(index < (parts.length - 1)) {
- page = page.processGetRequest(parts[index++], parts[index++]);
- }
- }
-*/
-
- doPost(req, resp);
- }
-
- @Override
- protected void doPost(final HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- long nano = System.nanoTime();
-
-/*
- HttpSession session = req.getSession();
- boolean ajax = "true".equals(req.getParameter("ajax"));
-
- resp.setContentType("text/html");
-
- Page page = (Page)session.getAttribute("page");
- Page menu = (Page)session.getAttribute("menu");
-
- session.setMaxInactiveInterval(1800);
-
- if (menu == null) {
- menu = new Menu();
-
- session.setAttribute("menu", menu);
- }
-
- if (Settings.get().isSecure() && session.getAttribute("loggedin") == null && !(page instanceof Login)) {
- page = new Login();
- } else if (!(page instanceof Login)) {
- if (page == null || "menumain".equals(req.getParameter("action"))) {
- page = new QueryOverview();
- } else if ("menulive".equals(req.getParameter("action"))) {
- page = new LiveOverview();
- } else if ("menutransactions".equals(req.getParameter("action"))) {
- page = new TransactionOverview();
- } else if ("menusettings".equals(req.getParameter("action"))) {
- page = new SettingsOverview();
- } else if ("menuinfo".equals(req.getParameter("action"))) {
- page = new ServerInfo();
- } else if ("jvmstats".equals(req.getParameter("action"))) {
- page = new JvmStats();
- } else {
- page = page .processRequest(req);
- }
- } else {
- page = page .processRequest(req);
- }
-
- menu.processRequest(req);
-
- session.setAttribute("page", page);
-
- if (!ajax) {
- resp.getWriter().print(head);
- }
-
- resp.getWriter().print(menu.render(req));
-
- resp.getWriter().println("");
-
- resp.getWriter().print(Warnings.get(req).render(req));
-
- long time = System.nanoTime();
- resp.getWriter().print(page.render(req));
- resp.getWriter().println("
");
-
- if (!ajax) {
- resp.getWriter().print(bottom);
- }
-*/
-
- //logger.debug("Request ends, time=" + Util.formatNano(System.nanoTime() - nano) + ", page=" + page.getClass().getSimpleName());
- }
-
-}
diff --git a/src/nl/astraeus/jdbc/web/ResourceServlet.java b/src/nl/astraeus/jdbc/web/ResourceServlet.java
deleted file mode 100644
index 60e8af8..0000000
--- a/src/nl/astraeus/jdbc/web/ResourceServlet.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package nl.astraeus.jdbc.web;
-
-import nl.astraeus.jdbc.util.IOUtils;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * User: rnentjes
- * Date: 3/28/12
- * Time: 3:05 PM
- */
-public class ResourceServlet extends HttpServlet {
-
- private long startup = System.currentTimeMillis();
-
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- String uri = req.getRequestURI();
-
- uri = "nl/astraeus/jdbc/web" + uri;
- InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream(uri);
-
- if (in == null) {
- resp.sendError(404, "Cannot find resource '" + uri + "'.");
- } else {
- try {
- if (uri.endsWith("js")) {
- resp.setContentType("text/javascript");
- } else if (uri.endsWith("css")) {
- resp.setContentType("text/css");
- } else if (uri.endsWith("png")) {
- resp.setContentType("image/png");
- } else if (uri.endsWith("jpg")) {
- resp.setContentType("image/jpeg");
- } else if (uri.endsWith("gif")) {
- resp.setContentType("image/gif");
- }
-
- resp.setHeader("Cache-Control", "max-age=3600");
- resp.setHeader("ETag", Long.toHexString(startup));
-
- IOUtils.copy(in, resp.getOutputStream());
- } finally {
- in.close();
- }
- }
- }
-
-}
diff --git a/src/nl/astraeus/jdbc/web/model/Settings.java b/src/nl/astraeus/jdbc/web/model/Settings.java
index ad17328..bea70e1 100644
--- a/src/nl/astraeus/jdbc/web/model/Settings.java
+++ b/src/nl/astraeus/jdbc/web/model/Settings.java
@@ -3,8 +3,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.http.Cookie;
-
/**
* User: rnentjes
* Date: 4/22/12
@@ -27,15 +25,6 @@
return instance;
}
- private Cookie createLongLivedCookie(String name, String value) {
- Cookie result = new Cookie(name, value);
-
- // 90 days
- result.setMaxAge(60 * 60 * 24 * 90);
-
- return result;
- }
-
private int numberOfQueries = 2500;
private boolean formattedQueries = true;
private boolean recordingStacktraces = true;
diff --git a/.idea/ant.xml b/.idea/ant.xml
index 864bdba..48b830b 100644
--- a/.idea/ant.xml
+++ b/.idea/ant.xml
@@ -3,7 +3,6 @@
-
diff --git a/.idea/libraries/junit_4_5.xml b/.idea/libraries/junit_4_5.xml
deleted file mode 100644
index a3352c2..0000000
--- a/.idea/libraries/junit_4_5.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml
deleted file mode 100644
index 4992926..0000000
--- a/.idea/libraries/lib.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c490a2d..be607d9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,7 @@
http://www.w3.org/1999/xhtml
-
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 62d5a07..0e22cb8 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,7 +3,6 @@
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 8364c54..e9c8948 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,7 +2,6 @@
-
diff --git a/Simple-jdbc-statistics.iml b/Simple-jdbc-statistics.iml
index 584fd0a..ef15763 100644
--- a/Simple-jdbc-statistics.iml
+++ b/Simple-jdbc-statistics.iml
@@ -9,18 +9,19 @@
+
+
-
+
-
+
+
+
-
-
-
diff --git a/lib/ext/simple-web-0.1.jar b/lib/ext/simple-web-0.1.jar
index 28cb6a1..8d7da95 100644
--- a/lib/ext/simple-web-0.1.jar
+++ b/lib/ext/simple-web-0.1.jar
Binary files differ
diff --git a/lib/ext/ssr-0.5.jar b/lib/ext/ssr-0.5.jar
deleted file mode 100644
index dcd095d..0000000
--- a/lib/ext/ssr-0.5.jar
+++ /dev/null
Binary files differ
diff --git a/lib/servlet-api-2.5.jar b/lib/servlet-api-2.5.jar
deleted file mode 100644
index 20b5755..0000000
--- a/lib/servlet-api-2.5.jar
+++ /dev/null
Binary files differ
diff --git a/src/nl/astraeus/jdbc/Driver.java b/src/nl/astraeus/jdbc/Driver.java
index 7d4c505..afa0ba7 100644
--- a/src/nl/astraeus/jdbc/Driver.java
+++ b/src/nl/astraeus/jdbc/Driver.java
@@ -1,6 +1,5 @@
package nl.astraeus.jdbc;
-import nl.astraeus.http.SimpleWebServer;
import nl.astraeus.jdbc.web.JdbcStatsMappingProvider;
import nl.astraeus.jdbc.web.model.Settings;
import nl.astraeus.web.NanoHttpdSimpleWeb;
@@ -23,9 +22,9 @@
final private static String URL_SECURE_PREFIX = "jdbc:secstat:";
private static volatile boolean started = false;
- private static SimpleWebServer server = null;
+ private static NanoHttpdSimpleWeb server = null;
- public static SimpleWebServer getServer() {
+ public static NanoHttpdSimpleWeb getServer() {
return server;
}
diff --git a/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java b/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
deleted file mode 100644
index b3ea872..0000000
--- a/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package nl.astraeus.jdbc.web;
-
-import nl.astraeus.jdbc.util.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * User: rnentjes
- * Date: 3/28/12
- * Time: 3:05 PM
- */
-public class JdbcStatisticsServlet extends HttpServlet {
- private final static Logger logger = LoggerFactory.getLogger(JdbcStatisticsServlet.class);
-
- private String head;
- private String bottom;
-// private Map mapping = new HashMap();
-
- @Override
- public void init() throws ServletException {
- super.init();
-
- try {
- head = IOUtils.toString(getClass().getResourceAsStream("head.html"));
- bottom = IOUtils.toString(getClass().getResourceAsStream("bottom.html"));
- } catch (IOException e) {
- throw new ServletException(e);
- }
-
-/*
- mapping.put("queries", new QueryOverview());
- mapping.put("login", new Login());
- mapping.put("jvm", new JvmStats());
-*/
-
- // queries/select/1234
- // queries/page/2
- // queries/cancel
- // queries/select/1234/select/5432
-
- // queries/action=select/actionValue=1234
- // transactions/action=page&actionValue=3
- // settings
- }
-
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- String uri = req.getRequestURI();
-
-/*
- String [] parts = uri.split("\\/");
- int index = 0;
-
- if (parts.length > 0) {
- Page page = mapping.get(parts[index++]);
-
- while(index < (parts.length - 1)) {
- page = page.processGetRequest(parts[index++], parts[index++]);
- }
- }
-*/
-
- doPost(req, resp);
- }
-
- @Override
- protected void doPost(final HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- long nano = System.nanoTime();
-
-/*
- HttpSession session = req.getSession();
- boolean ajax = "true".equals(req.getParameter("ajax"));
-
- resp.setContentType("text/html");
-
- Page page = (Page)session.getAttribute("page");
- Page menu = (Page)session.getAttribute("menu");
-
- session.setMaxInactiveInterval(1800);
-
- if (menu == null) {
- menu = new Menu();
-
- session.setAttribute("menu", menu);
- }
-
- if (Settings.get().isSecure() && session.getAttribute("loggedin") == null && !(page instanceof Login)) {
- page = new Login();
- } else if (!(page instanceof Login)) {
- if (page == null || "menumain".equals(req.getParameter("action"))) {
- page = new QueryOverview();
- } else if ("menulive".equals(req.getParameter("action"))) {
- page = new LiveOverview();
- } else if ("menutransactions".equals(req.getParameter("action"))) {
- page = new TransactionOverview();
- } else if ("menusettings".equals(req.getParameter("action"))) {
- page = new SettingsOverview();
- } else if ("menuinfo".equals(req.getParameter("action"))) {
- page = new ServerInfo();
- } else if ("jvmstats".equals(req.getParameter("action"))) {
- page = new JvmStats();
- } else {
- page = page .processRequest(req);
- }
- } else {
- page = page .processRequest(req);
- }
-
- menu.processRequest(req);
-
- session.setAttribute("page", page);
-
- if (!ajax) {
- resp.getWriter().print(head);
- }
-
- resp.getWriter().print(menu.render(req));
-
- resp.getWriter().println("");
-
- resp.getWriter().print(Warnings.get(req).render(req));
-
- long time = System.nanoTime();
- resp.getWriter().print(page.render(req));
- resp.getWriter().println("
");
-
- if (!ajax) {
- resp.getWriter().print(bottom);
- }
-*/
-
- //logger.debug("Request ends, time=" + Util.formatNano(System.nanoTime() - nano) + ", page=" + page.getClass().getSimpleName());
- }
-
-}
diff --git a/src/nl/astraeus/jdbc/web/ResourceServlet.java b/src/nl/astraeus/jdbc/web/ResourceServlet.java
deleted file mode 100644
index 60e8af8..0000000
--- a/src/nl/astraeus/jdbc/web/ResourceServlet.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package nl.astraeus.jdbc.web;
-
-import nl.astraeus.jdbc.util.IOUtils;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * User: rnentjes
- * Date: 3/28/12
- * Time: 3:05 PM
- */
-public class ResourceServlet extends HttpServlet {
-
- private long startup = System.currentTimeMillis();
-
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- String uri = req.getRequestURI();
-
- uri = "nl/astraeus/jdbc/web" + uri;
- InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream(uri);
-
- if (in == null) {
- resp.sendError(404, "Cannot find resource '" + uri + "'.");
- } else {
- try {
- if (uri.endsWith("js")) {
- resp.setContentType("text/javascript");
- } else if (uri.endsWith("css")) {
- resp.setContentType("text/css");
- } else if (uri.endsWith("png")) {
- resp.setContentType("image/png");
- } else if (uri.endsWith("jpg")) {
- resp.setContentType("image/jpeg");
- } else if (uri.endsWith("gif")) {
- resp.setContentType("image/gif");
- }
-
- resp.setHeader("Cache-Control", "max-age=3600");
- resp.setHeader("ETag", Long.toHexString(startup));
-
- IOUtils.copy(in, resp.getOutputStream());
- } finally {
- in.close();
- }
- }
- }
-
-}
diff --git a/src/nl/astraeus/jdbc/web/model/Settings.java b/src/nl/astraeus/jdbc/web/model/Settings.java
index ad17328..bea70e1 100644
--- a/src/nl/astraeus/jdbc/web/model/Settings.java
+++ b/src/nl/astraeus/jdbc/web/model/Settings.java
@@ -3,8 +3,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.http.Cookie;
-
/**
* User: rnentjes
* Date: 4/22/12
@@ -27,15 +25,6 @@
return instance;
}
- private Cookie createLongLivedCookie(String name, String value) {
- Cookie result = new Cookie(name, value);
-
- // 90 days
- result.setMaxAge(60 * 60 * 24 * 90);
-
- return result;
- }
-
private int numberOfQueries = 2500;
private boolean formattedQueries = true;
private boolean recordingStacktraces = true;
diff --git a/src/nl/astraeus/jdbc/web/page/LiveOverview.java b/src/nl/astraeus/jdbc/web/page/LiveOverview.java
index ed9ef65..65aa410 100644
--- a/src/nl/astraeus/jdbc/web/page/LiveOverview.java
+++ b/src/nl/astraeus/jdbc/web/page/LiveOverview.java
@@ -6,7 +6,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.http.HttpServletRequest;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -34,6 +33,7 @@
// return result;
}
+/*
public Page processRequest(HttpServletRequest request) {
if ("sortTotalCalls".equals(request.getParameter("action"))) {
sortTotalCalls = true;
@@ -53,6 +53,7 @@
return this;
}
+*/
public void set() {
List entries = JdbcLogger.get().getEntries();
diff --git a/.idea/ant.xml b/.idea/ant.xml
index 864bdba..48b830b 100644
--- a/.idea/ant.xml
+++ b/.idea/ant.xml
@@ -3,7 +3,6 @@
-
diff --git a/.idea/libraries/junit_4_5.xml b/.idea/libraries/junit_4_5.xml
deleted file mode 100644
index a3352c2..0000000
--- a/.idea/libraries/junit_4_5.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml
deleted file mode 100644
index 4992926..0000000
--- a/.idea/libraries/lib.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c490a2d..be607d9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,7 @@
http://www.w3.org/1999/xhtml
-
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 62d5a07..0e22cb8 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,7 +3,6 @@
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 8364c54..e9c8948 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,7 +2,6 @@
-
diff --git a/Simple-jdbc-statistics.iml b/Simple-jdbc-statistics.iml
index 584fd0a..ef15763 100644
--- a/Simple-jdbc-statistics.iml
+++ b/Simple-jdbc-statistics.iml
@@ -9,18 +9,19 @@
+
+
-
+
-
+
+
+
-
-
-
diff --git a/lib/ext/simple-web-0.1.jar b/lib/ext/simple-web-0.1.jar
index 28cb6a1..8d7da95 100644
--- a/lib/ext/simple-web-0.1.jar
+++ b/lib/ext/simple-web-0.1.jar
Binary files differ
diff --git a/lib/ext/ssr-0.5.jar b/lib/ext/ssr-0.5.jar
deleted file mode 100644
index dcd095d..0000000
--- a/lib/ext/ssr-0.5.jar
+++ /dev/null
Binary files differ
diff --git a/lib/servlet-api-2.5.jar b/lib/servlet-api-2.5.jar
deleted file mode 100644
index 20b5755..0000000
--- a/lib/servlet-api-2.5.jar
+++ /dev/null
Binary files differ
diff --git a/src/nl/astraeus/jdbc/Driver.java b/src/nl/astraeus/jdbc/Driver.java
index 7d4c505..afa0ba7 100644
--- a/src/nl/astraeus/jdbc/Driver.java
+++ b/src/nl/astraeus/jdbc/Driver.java
@@ -1,6 +1,5 @@
package nl.astraeus.jdbc;
-import nl.astraeus.http.SimpleWebServer;
import nl.astraeus.jdbc.web.JdbcStatsMappingProvider;
import nl.astraeus.jdbc.web.model.Settings;
import nl.astraeus.web.NanoHttpdSimpleWeb;
@@ -23,9 +22,9 @@
final private static String URL_SECURE_PREFIX = "jdbc:secstat:";
private static volatile boolean started = false;
- private static SimpleWebServer server = null;
+ private static NanoHttpdSimpleWeb server = null;
- public static SimpleWebServer getServer() {
+ public static NanoHttpdSimpleWeb getServer() {
return server;
}
diff --git a/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java b/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
deleted file mode 100644
index b3ea872..0000000
--- a/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package nl.astraeus.jdbc.web;
-
-import nl.astraeus.jdbc.util.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * User: rnentjes
- * Date: 3/28/12
- * Time: 3:05 PM
- */
-public class JdbcStatisticsServlet extends HttpServlet {
- private final static Logger logger = LoggerFactory.getLogger(JdbcStatisticsServlet.class);
-
- private String head;
- private String bottom;
-// private Map mapping = new HashMap();
-
- @Override
- public void init() throws ServletException {
- super.init();
-
- try {
- head = IOUtils.toString(getClass().getResourceAsStream("head.html"));
- bottom = IOUtils.toString(getClass().getResourceAsStream("bottom.html"));
- } catch (IOException e) {
- throw new ServletException(e);
- }
-
-/*
- mapping.put("queries", new QueryOverview());
- mapping.put("login", new Login());
- mapping.put("jvm", new JvmStats());
-*/
-
- // queries/select/1234
- // queries/page/2
- // queries/cancel
- // queries/select/1234/select/5432
-
- // queries/action=select/actionValue=1234
- // transactions/action=page&actionValue=3
- // settings
- }
-
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- String uri = req.getRequestURI();
-
-/*
- String [] parts = uri.split("\\/");
- int index = 0;
-
- if (parts.length > 0) {
- Page page = mapping.get(parts[index++]);
-
- while(index < (parts.length - 1)) {
- page = page.processGetRequest(parts[index++], parts[index++]);
- }
- }
-*/
-
- doPost(req, resp);
- }
-
- @Override
- protected void doPost(final HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- long nano = System.nanoTime();
-
-/*
- HttpSession session = req.getSession();
- boolean ajax = "true".equals(req.getParameter("ajax"));
-
- resp.setContentType("text/html");
-
- Page page = (Page)session.getAttribute("page");
- Page menu = (Page)session.getAttribute("menu");
-
- session.setMaxInactiveInterval(1800);
-
- if (menu == null) {
- menu = new Menu();
-
- session.setAttribute("menu", menu);
- }
-
- if (Settings.get().isSecure() && session.getAttribute("loggedin") == null && !(page instanceof Login)) {
- page = new Login();
- } else if (!(page instanceof Login)) {
- if (page == null || "menumain".equals(req.getParameter("action"))) {
- page = new QueryOverview();
- } else if ("menulive".equals(req.getParameter("action"))) {
- page = new LiveOverview();
- } else if ("menutransactions".equals(req.getParameter("action"))) {
- page = new TransactionOverview();
- } else if ("menusettings".equals(req.getParameter("action"))) {
- page = new SettingsOverview();
- } else if ("menuinfo".equals(req.getParameter("action"))) {
- page = new ServerInfo();
- } else if ("jvmstats".equals(req.getParameter("action"))) {
- page = new JvmStats();
- } else {
- page = page .processRequest(req);
- }
- } else {
- page = page .processRequest(req);
- }
-
- menu.processRequest(req);
-
- session.setAttribute("page", page);
-
- if (!ajax) {
- resp.getWriter().print(head);
- }
-
- resp.getWriter().print(menu.render(req));
-
- resp.getWriter().println("");
-
- resp.getWriter().print(Warnings.get(req).render(req));
-
- long time = System.nanoTime();
- resp.getWriter().print(page.render(req));
- resp.getWriter().println("
");
-
- if (!ajax) {
- resp.getWriter().print(bottom);
- }
-*/
-
- //logger.debug("Request ends, time=" + Util.formatNano(System.nanoTime() - nano) + ", page=" + page.getClass().getSimpleName());
- }
-
-}
diff --git a/src/nl/astraeus/jdbc/web/ResourceServlet.java b/src/nl/astraeus/jdbc/web/ResourceServlet.java
deleted file mode 100644
index 60e8af8..0000000
--- a/src/nl/astraeus/jdbc/web/ResourceServlet.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package nl.astraeus.jdbc.web;
-
-import nl.astraeus.jdbc.util.IOUtils;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * User: rnentjes
- * Date: 3/28/12
- * Time: 3:05 PM
- */
-public class ResourceServlet extends HttpServlet {
-
- private long startup = System.currentTimeMillis();
-
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- String uri = req.getRequestURI();
-
- uri = "nl/astraeus/jdbc/web" + uri;
- InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream(uri);
-
- if (in == null) {
- resp.sendError(404, "Cannot find resource '" + uri + "'.");
- } else {
- try {
- if (uri.endsWith("js")) {
- resp.setContentType("text/javascript");
- } else if (uri.endsWith("css")) {
- resp.setContentType("text/css");
- } else if (uri.endsWith("png")) {
- resp.setContentType("image/png");
- } else if (uri.endsWith("jpg")) {
- resp.setContentType("image/jpeg");
- } else if (uri.endsWith("gif")) {
- resp.setContentType("image/gif");
- }
-
- resp.setHeader("Cache-Control", "max-age=3600");
- resp.setHeader("ETag", Long.toHexString(startup));
-
- IOUtils.copy(in, resp.getOutputStream());
- } finally {
- in.close();
- }
- }
- }
-
-}
diff --git a/src/nl/astraeus/jdbc/web/model/Settings.java b/src/nl/astraeus/jdbc/web/model/Settings.java
index ad17328..bea70e1 100644
--- a/src/nl/astraeus/jdbc/web/model/Settings.java
+++ b/src/nl/astraeus/jdbc/web/model/Settings.java
@@ -3,8 +3,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.http.Cookie;
-
/**
* User: rnentjes
* Date: 4/22/12
@@ -27,15 +25,6 @@
return instance;
}
- private Cookie createLongLivedCookie(String name, String value) {
- Cookie result = new Cookie(name, value);
-
- // 90 days
- result.setMaxAge(60 * 60 * 24 * 90);
-
- return result;
- }
-
private int numberOfQueries = 2500;
private boolean formattedQueries = true;
private boolean recordingStacktraces = true;
diff --git a/src/nl/astraeus/jdbc/web/page/LiveOverview.java b/src/nl/astraeus/jdbc/web/page/LiveOverview.java
index ed9ef65..65aa410 100644
--- a/src/nl/astraeus/jdbc/web/page/LiveOverview.java
+++ b/src/nl/astraeus/jdbc/web/page/LiveOverview.java
@@ -6,7 +6,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.http.HttpServletRequest;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -34,6 +33,7 @@
// return result;
}
+/*
public Page processRequest(HttpServletRequest request) {
if ("sortTotalCalls".equals(request.getParameter("action"))) {
sortTotalCalls = true;
@@ -53,6 +53,7 @@
return this;
}
+*/
public void set() {
List entries = JdbcLogger.get().getEntries();
diff --git a/src/nl/astraeus/jdbc/web/page/ThreadStack.java b/src/nl/astraeus/jdbc/web/page/ThreadStack.java
index c01667d..c4cf90b 100644
--- a/src/nl/astraeus/jdbc/web/page/ThreadStack.java
+++ b/src/nl/astraeus/jdbc/web/page/ThreadStack.java
@@ -1,6 +1,5 @@
package nl.astraeus.jdbc.web.page;
-import nl.astraeus.http.ConnectionHandlerThread;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,25 +46,15 @@
}
public void set() {
-// SimpleWebServer server = Driver.getServer();
-
- ConnectionHandlerThread thread = null;
-// for (ConnectionHandlerThread t : server.getThreads()) {
-// if (t.getName().equals(threadName)) {
-// thread = t;
-// break;
-// }
-// }
-
List trace = new LinkedList();
- for (int index = 4; index < thread.getStackTrace().length; index++) {
- boolean hl = thread.getStackTrace()[index].getClassName().startsWith("nl.astraeus");
-
- trace.add(new TraceElement(thread.getStackTrace()[index], hl));
- }
-
- set("thread", thread);
+// for (int index = 4; index < thread.getStackTrace().length; index++) {
+// boolean hl = thread.getStackTrace()[index].getClassName().startsWith("nl.astraeus");
+//
+// trace.add(new TraceElement(thread.getStackTrace()[index], hl));
+// }
+//
+// set("thread", thread);
set("trace", trace);
set("threads", new LinkedList()); //server.getThreads());
}
diff --git a/.idea/ant.xml b/.idea/ant.xml
index 864bdba..48b830b 100644
--- a/.idea/ant.xml
+++ b/.idea/ant.xml
@@ -3,7 +3,6 @@
-
diff --git a/.idea/libraries/junit_4_5.xml b/.idea/libraries/junit_4_5.xml
deleted file mode 100644
index a3352c2..0000000
--- a/.idea/libraries/junit_4_5.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml
deleted file mode 100644
index 4992926..0000000
--- a/.idea/libraries/lib.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c490a2d..be607d9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,7 @@
http://www.w3.org/1999/xhtml
-
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 62d5a07..0e22cb8 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,7 +3,6 @@
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 8364c54..e9c8948 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,7 +2,6 @@
-
diff --git a/Simple-jdbc-statistics.iml b/Simple-jdbc-statistics.iml
index 584fd0a..ef15763 100644
--- a/Simple-jdbc-statistics.iml
+++ b/Simple-jdbc-statistics.iml
@@ -9,18 +9,19 @@
+
+
-
+
-
+
+
+
-
-
-
diff --git a/lib/ext/simple-web-0.1.jar b/lib/ext/simple-web-0.1.jar
index 28cb6a1..8d7da95 100644
--- a/lib/ext/simple-web-0.1.jar
+++ b/lib/ext/simple-web-0.1.jar
Binary files differ
diff --git a/lib/ext/ssr-0.5.jar b/lib/ext/ssr-0.5.jar
deleted file mode 100644
index dcd095d..0000000
--- a/lib/ext/ssr-0.5.jar
+++ /dev/null
Binary files differ
diff --git a/lib/servlet-api-2.5.jar b/lib/servlet-api-2.5.jar
deleted file mode 100644
index 20b5755..0000000
--- a/lib/servlet-api-2.5.jar
+++ /dev/null
Binary files differ
diff --git a/src/nl/astraeus/jdbc/Driver.java b/src/nl/astraeus/jdbc/Driver.java
index 7d4c505..afa0ba7 100644
--- a/src/nl/astraeus/jdbc/Driver.java
+++ b/src/nl/astraeus/jdbc/Driver.java
@@ -1,6 +1,5 @@
package nl.astraeus.jdbc;
-import nl.astraeus.http.SimpleWebServer;
import nl.astraeus.jdbc.web.JdbcStatsMappingProvider;
import nl.astraeus.jdbc.web.model.Settings;
import nl.astraeus.web.NanoHttpdSimpleWeb;
@@ -23,9 +22,9 @@
final private static String URL_SECURE_PREFIX = "jdbc:secstat:";
private static volatile boolean started = false;
- private static SimpleWebServer server = null;
+ private static NanoHttpdSimpleWeb server = null;
- public static SimpleWebServer getServer() {
+ public static NanoHttpdSimpleWeb getServer() {
return server;
}
diff --git a/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java b/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
deleted file mode 100644
index b3ea872..0000000
--- a/src/nl/astraeus/jdbc/web/JdbcStatisticsServlet.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package nl.astraeus.jdbc.web;
-
-import nl.astraeus.jdbc.util.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * User: rnentjes
- * Date: 3/28/12
- * Time: 3:05 PM
- */
-public class JdbcStatisticsServlet extends HttpServlet {
- private final static Logger logger = LoggerFactory.getLogger(JdbcStatisticsServlet.class);
-
- private String head;
- private String bottom;
-// private Map mapping = new HashMap();
-
- @Override
- public void init() throws ServletException {
- super.init();
-
- try {
- head = IOUtils.toString(getClass().getResourceAsStream("head.html"));
- bottom = IOUtils.toString(getClass().getResourceAsStream("bottom.html"));
- } catch (IOException e) {
- throw new ServletException(e);
- }
-
-/*
- mapping.put("queries", new QueryOverview());
- mapping.put("login", new Login());
- mapping.put("jvm", new JvmStats());
-*/
-
- // queries/select/1234
- // queries/page/2
- // queries/cancel
- // queries/select/1234/select/5432
-
- // queries/action=select/actionValue=1234
- // transactions/action=page&actionValue=3
- // settings
- }
-
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- String uri = req.getRequestURI();
-
-/*
- String [] parts = uri.split("\\/");
- int index = 0;
-
- if (parts.length > 0) {
- Page page = mapping.get(parts[index++]);
-
- while(index < (parts.length - 1)) {
- page = page.processGetRequest(parts[index++], parts[index++]);
- }
- }
-*/
-
- doPost(req, resp);
- }
-
- @Override
- protected void doPost(final HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- long nano = System.nanoTime();
-
-/*
- HttpSession session = req.getSession();
- boolean ajax = "true".equals(req.getParameter("ajax"));
-
- resp.setContentType("text/html");
-
- Page page = (Page)session.getAttribute("page");
- Page menu = (Page)session.getAttribute("menu");
-
- session.setMaxInactiveInterval(1800);
-
- if (menu == null) {
- menu = new Menu();
-
- session.setAttribute("menu", menu);
- }
-
- if (Settings.get().isSecure() && session.getAttribute("loggedin") == null && !(page instanceof Login)) {
- page = new Login();
- } else if (!(page instanceof Login)) {
- if (page == null || "menumain".equals(req.getParameter("action"))) {
- page = new QueryOverview();
- } else if ("menulive".equals(req.getParameter("action"))) {
- page = new LiveOverview();
- } else if ("menutransactions".equals(req.getParameter("action"))) {
- page = new TransactionOverview();
- } else if ("menusettings".equals(req.getParameter("action"))) {
- page = new SettingsOverview();
- } else if ("menuinfo".equals(req.getParameter("action"))) {
- page = new ServerInfo();
- } else if ("jvmstats".equals(req.getParameter("action"))) {
- page = new JvmStats();
- } else {
- page = page .processRequest(req);
- }
- } else {
- page = page .processRequest(req);
- }
-
- menu.processRequest(req);
-
- session.setAttribute("page", page);
-
- if (!ajax) {
- resp.getWriter().print(head);
- }
-
- resp.getWriter().print(menu.render(req));
-
- resp.getWriter().println("");
-
- resp.getWriter().print(Warnings.get(req).render(req));
-
- long time = System.nanoTime();
- resp.getWriter().print(page.render(req));
- resp.getWriter().println("
");
-
- if (!ajax) {
- resp.getWriter().print(bottom);
- }
-*/
-
- //logger.debug("Request ends, time=" + Util.formatNano(System.nanoTime() - nano) + ", page=" + page.getClass().getSimpleName());
- }
-
-}
diff --git a/src/nl/astraeus/jdbc/web/ResourceServlet.java b/src/nl/astraeus/jdbc/web/ResourceServlet.java
deleted file mode 100644
index 60e8af8..0000000
--- a/src/nl/astraeus/jdbc/web/ResourceServlet.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package nl.astraeus.jdbc.web;
-
-import nl.astraeus.jdbc.util.IOUtils;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * User: rnentjes
- * Date: 3/28/12
- * Time: 3:05 PM
- */
-public class ResourceServlet extends HttpServlet {
-
- private long startup = System.currentTimeMillis();
-
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- String uri = req.getRequestURI();
-
- uri = "nl/astraeus/jdbc/web" + uri;
- InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream(uri);
-
- if (in == null) {
- resp.sendError(404, "Cannot find resource '" + uri + "'.");
- } else {
- try {
- if (uri.endsWith("js")) {
- resp.setContentType("text/javascript");
- } else if (uri.endsWith("css")) {
- resp.setContentType("text/css");
- } else if (uri.endsWith("png")) {
- resp.setContentType("image/png");
- } else if (uri.endsWith("jpg")) {
- resp.setContentType("image/jpeg");
- } else if (uri.endsWith("gif")) {
- resp.setContentType("image/gif");
- }
-
- resp.setHeader("Cache-Control", "max-age=3600");
- resp.setHeader("ETag", Long.toHexString(startup));
-
- IOUtils.copy(in, resp.getOutputStream());
- } finally {
- in.close();
- }
- }
- }
-
-}
diff --git a/src/nl/astraeus/jdbc/web/model/Settings.java b/src/nl/astraeus/jdbc/web/model/Settings.java
index ad17328..bea70e1 100644
--- a/src/nl/astraeus/jdbc/web/model/Settings.java
+++ b/src/nl/astraeus/jdbc/web/model/Settings.java
@@ -3,8 +3,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.http.Cookie;
-
/**
* User: rnentjes
* Date: 4/22/12
@@ -27,15 +25,6 @@
return instance;
}
- private Cookie createLongLivedCookie(String name, String value) {
- Cookie result = new Cookie(name, value);
-
- // 90 days
- result.setMaxAge(60 * 60 * 24 * 90);
-
- return result;
- }
-
private int numberOfQueries = 2500;
private boolean formattedQueries = true;
private boolean recordingStacktraces = true;
diff --git a/src/nl/astraeus/jdbc/web/page/LiveOverview.java b/src/nl/astraeus/jdbc/web/page/LiveOverview.java
index ed9ef65..65aa410 100644
--- a/src/nl/astraeus/jdbc/web/page/LiveOverview.java
+++ b/src/nl/astraeus/jdbc/web/page/LiveOverview.java
@@ -6,7 +6,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.http.HttpServletRequest;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -34,6 +33,7 @@
// return result;
}
+/*
public Page processRequest(HttpServletRequest request) {
if ("sortTotalCalls".equals(request.getParameter("action"))) {
sortTotalCalls = true;
@@ -53,6 +53,7 @@
return this;
}
+*/
public void set() {
List entries = JdbcLogger.get().getEntries();
diff --git a/src/nl/astraeus/jdbc/web/page/ThreadStack.java b/src/nl/astraeus/jdbc/web/page/ThreadStack.java
index c01667d..c4cf90b 100644
--- a/src/nl/astraeus/jdbc/web/page/ThreadStack.java
+++ b/src/nl/astraeus/jdbc/web/page/ThreadStack.java
@@ -1,6 +1,5 @@
package nl.astraeus.jdbc.web.page;
-import nl.astraeus.http.ConnectionHandlerThread;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,25 +46,15 @@
}
public void set() {
-// SimpleWebServer server = Driver.getServer();
-
- ConnectionHandlerThread thread = null;
-// for (ConnectionHandlerThread t : server.getThreads()) {
-// if (t.getName().equals(threadName)) {
-// thread = t;
-// break;
-// }
-// }
-
List trace = new LinkedList();
- for (int index = 4; index < thread.getStackTrace().length; index++) {
- boolean hl = thread.getStackTrace()[index].getClassName().startsWith("nl.astraeus");
-
- trace.add(new TraceElement(thread.getStackTrace()[index], hl));
- }
-
- set("thread", thread);
+// for (int index = 4; index < thread.getStackTrace().length; index++) {
+// boolean hl = thread.getStackTrace()[index].getClassName().startsWith("nl.astraeus");
+//
+// trace.add(new TraceElement(thread.getStackTrace()[index], hl));
+// }
+//
+// set("thread", thread);
set("trace", trace);
set("threads", new LinkedList()); //server.getThreads());
}
diff --git a/test/nl/astraeus/jdbc/JdbcStatisticTest.java b/test/nl/astraeus/jdbc/JdbcStatisticTest.java
index 5e250bd..b2879d1 100644
--- a/test/nl/astraeus/jdbc/JdbcStatisticTest.java
+++ b/test/nl/astraeus/jdbc/JdbcStatisticTest.java
@@ -1,7 +1,7 @@
package nl.astraeus.jdbc;
+
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -11,7 +11,7 @@
*/
public class JdbcStatisticTest {
- @Test
+ @Test
public void test() {
Assert.assertTrue(true);
}