Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:
	Dozentenmodul/bin/gui/intro/Login_GUI.class
	Dozentenmodulserver/bin/server/ServerHandler.class
	Dozentenmodulserver/bin/server/startServer.class
	Dozentenmodulserver/src/server/startServer.java

1 files changed, 26 insertions, 2 deletions

diff --git a/Dozentenmodulserver/src/server/startServer.java b/Dozentenmodulserver/src/server/startServer.java
index 6f3d5a3d..a5509d04 100644
--- a/Dozentenmodulserver/src/server/startServer.java
+++ b/Dozentenmodulserver/src/server/startServer.java
@@ -1,11 +1,17 @@
 package server;
 
+import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import models.Configuration;
+
 import org.apache.log4j.BasicConfigurator;
 import org.apache.log4j.Logger;
+import org.ini4j.InvalidFileFormatException;
+import org.ini4j.Wini;
 
 
 import server.BinaryListener;
@@ -29,6 +35,7 @@ public class startServer {
 	
 	
 	public static void main(String[] args) {
+
 		
 		
 		//final ImageServerHandler handler = new ImageServerHandler();
@@ -48,14 +55,31 @@ public class startServer {
 		//deprecated 
 		
 		
+
+		//get Configuration
+		try {
+			Wini ini=new Wini(new File("Server_Config.ini"));
+			Configuration.config.setAbsolute_path(ini.get("ftp", "path_absolute"));
+			Configuration.config.setSql_connection(ini.get("sql", "connection"));
+			Configuration.config.setSql_pass(ini.get("sql", "pass"));
+			Configuration.config.setSql_user(ini.get("sql", "user"));
+		} catch (InvalidFileFormatException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		} catch (IOException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		//Start Server
+
 		BasicConfigurator.configure();
-		log.info( new Date() + " - starting Application\n" );
+		log.info("***** "+ new Date() + " - starting Application *****" );
 		Thread t;
 		t = new Thread(new BinaryListener());
 		servers.add(t);
 		t.start();
 		//information
-		log.info( new Date()+" - new thread created. Now "+servers.size()+" thread(s).\n" );
+		//log.info( new Date()+" - new thread created. Now "+servers.size()+" thread(s).\n" );
 		// Run more servers
 		// ...
 		// Wait for all servers to die