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

Conflicts:
	ffffDozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class
	Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
	Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
	Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
	Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
	Dozentenmodul/bin/gui/image/SearchImage_GUI.class
	Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class
	Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class
	Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class
	Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class
	Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
	Dozentenmodul/src/models/Links.java

1 files changed, 32 insertions, 3 deletions

diff --git a/Dozentenmodulserver/src/server/startServer.java b/Dozentenmodulserver/src/server/startServer.java
index 949b3538..a5509d04 100644
--- a/Dozentenmodulserver/src/server/startServer.java
+++ b/Dozentenmodulserver/src/server/startServer.java
@@ -16,6 +16,13 @@ import org.ini4j.Wini;
 
 import server.BinaryListener;
 
+import org.apache.thrift.protocol.TProtocolFactory;
+import org.apache.thrift.server.TServer;
+import org.apache.thrift.server.TThreadPoolServer;
+import org.apache.thrift.transport.TServerSocket;
+import org.apache.thrift.transport.TServerTransport;
+import org.apache.thrift.transport.TTransportException;
+import org.apache.thrift.server.TThreadPoolServer.Args;
 public class startServer {
 
 	/**
@@ -28,6 +35,27 @@ public class startServer {
 	
 	
 	public static void main(String[] args) {
+
+		
+		
+		//final ImageServerHandler handler = new ImageServerHandler();
+		//final ImageServer.Processor<ImageServerHandler> processor = new ImageServer.Processor<ImageServerHandler>(handler);
+		
+		/*
+		try{
+			TServerTransport serverTransport = new TServerSocket(9090);
+			//TServer server = new TSimpleServer(new Args(serverTransport).processor(processor));
+			TServer server = new TThreadPoolServer(new TThreadPoolServer.Args(serverTransport).processor(processor));
+			server.serve();
+		} catch (Exception e){
+			e.printStackTrace();
+		}
+		*/
+		
+		//deprecated 
+		
+		
+
 		//get Configuration
 		try {
 			Wini ini=new Wini(new File("Server_Config.ini"));
@@ -43,14 +71,15 @@ public class startServer {
 			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
@@ -66,7 +95,7 @@ public class startServer {
 			}
 		}
 		log.info( new Date()+" - all Servers shut down, exiting...\n" );
-
+	
 	}
 
 }