From b5919a813f1ec6a4b6fe8ca407ec12a107e688e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kjetil.orbekk@gmail.com>
Date: Mon, 6 Feb 2012 15:14:50 +0100
Subject: Replace MasterApp with a generic App class.

---
 same/src/main/java/com/orbekk/same/App.java       | 25 +++++++++++++++++++++
 same/src/main/java/com/orbekk/same/MasterApp.java | 27 -----------------------
 same/src/main/resources/master.properties.example |  1 +
 3 files changed, 26 insertions(+), 27 deletions(-)
 create mode 100644 same/src/main/java/com/orbekk/same/App.java
 delete mode 100644 same/src/main/java/com/orbekk/same/MasterApp.java

(limited to 'same')

diff --git a/same/src/main/java/com/orbekk/same/App.java b/same/src/main/java/com/orbekk/same/App.java
new file mode 100644
index 0000000..2416899
--- /dev/null
+++ b/same/src/main/java/com/orbekk/same/App.java
@@ -0,0 +1,25 @@
+package com.orbekk.same;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.orbekk.same.config.Configuration;
+
+public class App {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    public void run(String[] args) {
+        Configuration configuration = Configuration.loadOrDie();
+        SameController controller = SameController.create(configuration);
+        try {
+            controller.start();
+            controller.join();
+        } catch (Exception e) {
+            logger.error("Error in App.", e);
+        }
+    }
+    
+    public static void main(String[] args) {
+        new App().run(args);
+    }
+}
diff --git a/same/src/main/java/com/orbekk/same/MasterApp.java b/same/src/main/java/com/orbekk/same/MasterApp.java
deleted file mode 100644
index c5e270a..0000000
--- a/same/src/main/java/com/orbekk/same/MasterApp.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.orbekk.same;
-
-import org.eclipse.jetty.server.Server;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.googlecode.jsonrpc4j.JsonRpcServer;
-import com.orbekk.same.config.Configuration;
-
-public class MasterApp {
-    private Logger logger = LoggerFactory.getLogger(getClass());
-    
-    public void run(Configuration configuration) {
-        SameController controller = SameController.create(configuration);
-        try {
-            controller.start();
-        } catch (Exception e) {
-            logger.error("Failed to start Same", e);
-        }
-        controller.join();
-    }
-    
-    public static void main(String[] args) {
-        Configuration configuration = Configuration.loadOrDie();
-        (new MasterApp()).run(configuration);
-    }
-}
diff --git a/same/src/main/resources/master.properties.example b/same/src/main/resources/master.properties.example
index 338d6a9..f168f2c 100644
--- a/same/src/main/resources/master.properties.example
+++ b/same/src/main/resources/master.properties.example
@@ -1 +1,2 @@
 port=10010
+localIp=10.0.0.6
-- 
cgit v1.2.3