Deleted dead code and show version number in server log file

1 files changed, 28 insertions, 72 deletions

diff --git a/Dozentenmodulserver/src/server/startServer.java b/Dozentenmodulserver/src/server/startServer.java
index 783c98eb..99189780 100644
--- a/Dozentenmodulserver/src/server/startServer.java
+++ b/Dozentenmodulserver/src/server/startServer.java
@@ -5,86 +5,50 @@ 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;
+//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;
 
-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 {
 
 	/**
 	 * @param args
 	 */
-	
-	
-	
-	private static Logger log = Logger.getLogger( startServer.class );
+
+	private static Logger log = Logger.getLogger(startServer.class);
 
 	private static List<Thread> servers = new ArrayList<>();
-	
-	
+
 	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 
-		
-		//create file with version and build information
-		
-		String version="Version: 1.0";
-		String buildDate="BuildDate: 21.08.2014";
-		String runningSince="Running since: " + new Date();
-		String fileName="buildInformation";
-		
-		try {
-			System.out.println("Creating information file...");
-			Runtime.getRuntime().exec("echo " + version +" > "+fileName);
-			Runtime.getRuntime().exec("echo " + buildDate +" >> "+fileName);
-			Runtime.getRuntime().exec("echo " + runningSince +" >> "+fileName);
-		} catch (IOException e2) {
-			// TODO Auto-generated catch block
-			e2.printStackTrace();
-		}
-		
-		
-		
-		
-		
+		String version = "Version: 1.0";
+		String buildDate = "Build Date: 21.08.2014";
+
+		//get going and show basic information in logfile
+		BasicConfigurator.configure();
+		log.info("***** " + new Date() + " - starting Application *****");
+		log.info(new Date() + " - "+version+" , "+buildDate);
 		
 		
 
-		//get Configuration
+		// 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"));
+			log.info(new Date() + " - Getting config from .ini-file");
+			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) {
@@ -94,32 +58,24 @@ public class startServer {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
 		}
-		//Start Server
-
-		BasicConfigurator.configure();
-		log.info("***** "+ new Date() + " - starting Application *****" );
+		// Start Server
 		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" );
-		// Run more servers
-		// ...
-		// Wait for all servers to die
 		for (Thread wait : servers) {
 			boolean success = false;
 			while (!success) {
 				try {
 					wait.join();
 					success = true;
-				} catch ( InterruptedException e ) {
+				} catch (InterruptedException e) {
 					// Do nothing...
 				}
 			}
 		}
-		log.info( new Date()+" - all Servers shut down, exiting...\n" );
-	
+		log.info(new Date() + " - all Servers shut down, exiting...\n");
+
 	}
 
 }