diff options
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | src/Main.java | 24 | ||||
| -rw-r--r-- | src/org/traccar/Main.java | 40 | ||||
| -rw-r--r-- | src/org/traccar/http/WebServer.java | 4 | ||||
| -rw-r--r-- | src/web/favicon.ico (renamed from src/favicon.ico) | bin | 1150 -> 1150 bytes | |||
| -rw-r--r-- | src/web/index.html (renamed from src/index.html) | 0 |
6 files changed, 43 insertions, 27 deletions
@@ -101,7 +101,7 @@ <configuration> <archive> <manifest> - <mainClass>Main</mainClass> + <mainClass>org.traccar.Main</mainClass> <addClasspath>true</addClasspath> <classpathPrefix>lib/</classpathPrefix> </manifest> diff --git a/src/Main.java b/src/Main.java deleted file mode 100644 index 8b6f2002e..000000000 --- a/src/Main.java +++ /dev/null @@ -1,24 +0,0 @@ -import org.traccar.Server; -import org.traccar.helper.Log; - -public class Main { - - public static void main(String[] args) throws Exception { - - final Server service = new Server(); - service.init(args); - - Log.info("starting server..."); - service.start(); - - // Shutdown server properly - Runtime.getRuntime().addShutdownHook(new Thread() { - @Override - public void run() { - Log.info("shutting down server..."); - service.stop(); - } - }); - - } -} diff --git a/src/org/traccar/Main.java b/src/org/traccar/Main.java new file mode 100644 index 000000000..36228ee58 --- /dev/null +++ b/src/org/traccar/Main.java @@ -0,0 +1,40 @@ +/* + * 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; + +import org.traccar.helper.Log; + +public class Main { + + public static void main(String[] args) throws Exception { + + final Server service = new Server(); + service.init(args); + + Log.info("starting server..."); + service.start(); + + // Shutdown server properly + Runtime.getRuntime().addShutdownHook(new Thread() { + @Override + public void run() { + Log.info("shutting down server..."); + service.stop(); + } + }); + + } +} diff --git a/src/org/traccar/http/WebServer.java b/src/org/traccar/http/WebServer.java index cf7b21623..6c79e6421 100644 --- a/src/org/traccar/http/WebServer.java +++ b/src/org/traccar/http/WebServer.java @@ -55,7 +55,7 @@ public class WebServer { response.setContentType("text/html"); - InputStream in = this.getClass().getClassLoader().getResourceAsStream("index.html"); + InputStream in = this.getClass().getClassLoader().getResourceAsStream("web/index.html"); OutputStream out = response.getOutputStream(); byte[] buffer = new byte[BUFFER_SIZE]; @@ -71,7 +71,7 @@ public class WebServer { response.setContentType("image/x-icon"); - InputStream in = this.getClass().getClassLoader().getResourceAsStream("favicon.ico"); + InputStream in = this.getClass().getClassLoader().getResourceAsStream("web/favicon.ico"); OutputStream out = response.getOutputStream(); byte[] buffer = new byte[BUFFER_SIZE]; diff --git a/src/favicon.ico b/src/web/favicon.ico Binary files differindex 6fd696c25..6fd696c25 100644 --- a/src/favicon.ico +++ b/src/web/favicon.ico diff --git a/src/index.html b/src/web/index.html index cde73f47b..cde73f47b 100644 --- a/src/index.html +++ b/src/web/index.html |