diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2012-04-27 19:37:33 +0000 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2012-04-27 19:37:33 +0000 |
commit | 3291206a50732601dedec5aa4982a8d6db87e16e (patch) | |
tree | 279732e04fa3b98ebac138d755dcf77f53786735 /src | |
parent | 365a86bef2371035e4f6731fbcf1184f46346586 (diff) | |
download | traccar-server-3291206a50732601dedec5aa4982a8d6db87e16e.tar.gz traccar-server-3291206a50732601dedec5aa4982a8d6db87e16e.tar.bz2 traccar-server-3291206a50732601dedec5aa4982a8d6db87e16e.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/org/traccar/Server.java | 9 | ||||
-rw-r--r-- | src/org/traccar/http/WebServer.java | 45 |
2 files changed, 54 insertions, 0 deletions
diff --git a/src/org/traccar/Server.java b/src/org/traccar/Server.java index a0506f0cb..1c11f07b0 100644 --- a/src/org/traccar/Server.java +++ b/src/org/traccar/Server.java @@ -30,6 +30,7 @@ import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder; import org.jboss.netty.handler.codec.string.StringDecoder; import org.jboss.netty.handler.codec.string.StringEncoder; +import org.traccar.http.WebServer; import org.traccar.model.DataManager; import org.traccar.model.DatabaseDataManager; import org.traccar.protocol.*; @@ -57,6 +58,8 @@ public class Server { private DataManager dataManager; + private WebServer webServer; + /** * Initialize */ @@ -81,12 +84,17 @@ public class Server { initT55Server(properties); initXexun2Server(properties); initAvl08Server(properties); + + // Initialize web server + Integer port = Integer.valueOf(properties.getProperty("http.port", "8082")); + webServer = new WebServer(port); } /** * Start */ public void start() { + webServer.start(); for (Object server: serverList) { ((TrackerServer) server).start(); } @@ -99,6 +107,7 @@ public class Server { for (Object server: serverList) { ((TrackerServer) server).stop(); } + webServer.stop(); } /** diff --git a/src/org/traccar/http/WebServer.java b/src/org/traccar/http/WebServer.java new file mode 100644 index 000000000..9b3b78413 --- /dev/null +++ b/src/org/traccar/http/WebServer.java @@ -0,0 +1,45 @@ +/* + * Copyright 2012 Anton Tananaev (anton.tananaev@gmail.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.http; + +import org.eclipse.jetty.server.Server; + +/** + * Integrated http server + */ +public class WebServer { + + private Server server; + + public WebServer(Integer port) { + server = new Server(port); + } + + public void start() { + try { + server.start(); + } catch (Exception error) { + } + } + + public void stop() { + try { + server.stop(); + } catch (Exception error) { + } + } + +} |