Repo merged with upstream

1 files changed, 0 insertions, 34 deletions

diff --git a/src/Main.java b/src/Main.java
deleted file mode 100644
index 69c029c61..000000000
--- a/src/Main.java
+++ /dev/null
@@ -1,34 +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();
-    	
-    	if(args.length > 0){
-    		Log.info("Using parameterized config: " + args[0]);
-    		service.init(args);
-    	}
-    	else{
-    		String[] argsDefault = new String[]{"setup\\windows\\windows.cfg"}; 
-    		Log.info("Using default config: " + argsDefault[0]);
-    		service.init(argsDefault);	
-    	}
-        
-        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();
-            }
-        });
-
-    }
-}