aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/http
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2012-12-30 16:55:46 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2012-12-30 16:55:46 +1300
commita7100fa9749a343a77c747a2cca8ae9e2faf91cb (patch)
tree7dda63cda265afadc33c3b5d65e8bb3de2651081 /src/org/traccar/http
parent9a6cc11cdc5069314f9c64aa1e017f556baf8070 (diff)
downloadtraccar-server-a7100fa9749a343a77c747a2cca8ae9e2faf91cb.tar.gz
traccar-server-a7100fa9749a343a77c747a2cca8ae9e2faf91cb.tar.bz2
traccar-server-a7100fa9749a343a77c747a2cca8ae9e2faf91cb.zip
Code to test new web interface
Diffstat (limited to 'src/org/traccar/http')
-rw-r--r--src/org/traccar/http/WebServer.java21
1 files changed, 21 insertions, 0 deletions
diff --git a/src/org/traccar/http/WebServer.java b/src/org/traccar/http/WebServer.java
index 5dfeabed2..aac334cc6 100644
--- a/src/org/traccar/http/WebServer.java
+++ b/src/org/traccar/http/WebServer.java
@@ -174,6 +174,7 @@ public class WebServer {
response.sendRedirect(response.encodeRedirectURL("/"));
}
+ @Override
public void handle(String target,Request baseRequest,HttpServletRequest request,HttpServletResponse response)
throws IOException, ServletException
{
@@ -192,6 +193,26 @@ public class WebServer {
public WebServer(Integer port, DataManager dataManager) {
server = new Server(port);
server.setHandler(new WebHandler(dataManager));
+
+ /*WebAppContext webapp = new WebAppContext();
+ webapp.setContextPath("/");
+ webapp.setWar("/home/user/Documents/traccar-web/target/traccar-web-1.0-SNAPSHOT.war");
+ try {
+
+ Context context = new InitialContext();
+
+ Class clazz = Class.forName("org.h2.jdbcx.JdbcDataSource");
+
+ DataSource ds = (DataSource) clazz.newInstance();
+ clazz.getMethod("setURL", String.class).invoke(ds, "jdbc:h2:/home/user/Documents/traccar/target/database2");
+ clazz.getMethod("setUser", String.class).invoke(ds, "sa");
+ //clazz.getMethod("setPassword", String.class).invoke(ds, "");
+
+ context.bind("java:/DefaultDS", ds);
+
+ } catch (Exception error) {
+ }
+ server.setHandler(webapp);*/
}
public WebServer(String address, Integer port, DataManager dataManager) {