Added conf file for configuring server ports

Former-commit-id: 16f48cef9ddfdf3722bff863eb520e807d7c0c37

hal.conf

@@ -0,0 +1,2 @@
+http_port=8080
+sync_port=6666

src/se/koc/hal/HalContext.java

@@ -2,15 +2,41 @@ package se.koc.hal;
 
 import zutil.db.DBConnection;
 
+import java.io.FileReader;
+import java.util.Properties;
+
 public class HalContext {
+    // Constants
+    private static final String CONF_FILE = "hal.conf";
+
+    // Variables
+    public static DBConnection db;
 	
-	public static DBConnection db;
+	public static Properties conf;
+	private static Properties defaultConf;
+
+
+	static {
+		defaultConf = new Properties();
+		defaultConf.setProperty("http_port", ""+8080);
+		defaultConf.setProperty("sync_port", ""+6666);
+
+        HalContext.initialize();
+	}
 	
 	
-	
-	
-	
-	public static void initialize() throws Exception{
-		db = new DBConnection(DBConnection.DBMS.SQLite, "hal.db");
+	public static void initialize(){
+        try {
+            // Read conf
+            conf = new Properties(defaultConf);
+            FileReader in = new FileReader(CONF_FILE);
+            conf.load(in);
+            in.close();
+
+            // Init DB
+            db = new DBConnection(DBConnection.DBMS.SQLite, "hal.db");
+        } catch (Exception e){
+            throw new RuntimeException(e);
+        }
 	}
 }

src/se/koc/hal/PowerChallenge.java

@@ -31,8 +31,6 @@ public class PowerChallenge {
 
     public static void main(String[] args) throws Exception {
 
-    	HalContext.initialize();
-    	
     	// init logging
     	LogUtil.setGlobalLevel(Level.ALL);
     	LogUtil.setGlobalFormatter(new CompactLogFormatter());
@@ -43,7 +41,8 @@ public class PowerChallenge {
             daemon.initiate(daemonTimer);
         }
         
-        HttpServer http = new HttpServer(80);
+        HttpServer http = new HttpServer(
+                Integer.parseInt(HalContext.conf.getProperty("http_port")));
         http.setDefaultPage(new HttpFilePage(FileUtil.find("web-resource/")));
         http.setPage("/", new PCOverviewHttpPage());
         http.setPage("/configure", new PCConfigureHttpPage());

src/se/koc/hal/deamon/DataSynchronizationDaemon.java

@@ -21,11 +21,10 @@ import zutil.net.threaded.ThreadedTCPNetworkServerThread;
 
 public class DataSynchronizationDaemon extends ThreadedTCPNetworkServer implements HalDaemon{
 	private static final Logger logger = LogUtil.getLogger();
-	public static final int SERVER_PORT = 6666;
 
 
 	public DataSynchronizationDaemon() {
-		super(SERVER_PORT);
+		super(Integer.parseInt(HalContext.conf.getProperty("sync_port")));
 	}
 
 	@Override