[client] do commit the changes :)

25 files changed, 275 insertions, 165 deletions

diff --git a/dozentenmodul/pom.xml b/dozentenmodul/pom.xml
index 47a51005..da220c4a 100644
--- a/dozentenmodul/pom.xml
+++ b/dozentenmodul/pom.xml
@@ -77,6 +77,12 @@
                     <exclude>META-INF/*.RSA</exclude>
                   </excludes>
                 </filter>
+					 <filter>
+						<artifact>log4j:*</artifact>
+						<includes>
+							<include>**</include>
+						</includes>
+					 </filter>
               </filters>
               <minimizeJar>true</minimizeJar>
               <transformers>
@@ -92,6 +98,14 @@
         </executions>
       </plugin>
     </plugins>
+		<resources>
+			<resource>
+				<directory>src/main/properties</directory>
+				<includes>
+					<include>**/*.properties</include>
+				</includes>
+			</resource>
+		</resources>
   </build>
 
   <profiles>
diff --git a/dozentenmodul/src/main/java/App.java b/dozentenmodul/src/main/java/App.java
index 10b9a460..0d3e0124 100644
--- a/dozentenmodul/src/main/java/App.java
+++ b/dozentenmodul/src/main/java/App.java
@@ -1,29 +1,71 @@
 import gui.intro.Login_GUI;
 
 import java.awt.EventQueue;
+import java.io.File;
 import java.io.IOException;
 
 import javax.swing.JOptionPane;
 
+import org.apache.log4j.FileAppender;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PatternLayout;
+
 import config.Config;
 
 
 public class App {
 
+	// Logger
+	private final static Logger LOGGER = Logger.getLogger(App.class);
+
+	private static void setupLogger() {
+
+		// path to the log file
+		final String logFilePath = Config.getPath() + System.getProperty("file.separator") + "bwSuite.log";
+
+		// check if we had an old log file
+		final File logFile = new File(logFilePath);
+		if (logFile.exists() && !logFile.isDirectory()) {
+			// we have one, rename it to 'bwSuite.log.old'
+			try {
+				logFile.renameTo(new File(logFilePath + ".old"));
+			} catch (Exception e) {
+				LOGGER.error("Could not move '" + logFilePath +
+							"' to '" + logFilePath + ".old':");
+				e.printStackTrace();
+			}
+		}
+
+		// add file appender to global logger
+		FileAppender fa = null;
+		try {
+			fa = new FileAppender(new PatternLayout("%d [%F:%M] %m%n"), Config.getPath() + System.getProperty("file.separator") + "bwSuite.log");
+			LOGGER.addAppender(fa);
+			LOGGER.info("Starting logging to: " + Config.getPath() + System.getProperty("file.separator") + "bwSuite.log");
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		LOGGER.info("Logger initialised.");
+	}
+
 	public static void main(String[] args) {
+
+		// Pruefe und Erzeuge gegebenfalls Config
+		try {
+			Config.init();
+		} catch (IOException e) {
+			e.printStackTrace();
+			JOptionPane.showMessageDialog(null, e.getMessage(),
+					"Fehler", JOptionPane.ERROR_MESSAGE);
+			return;
+		}
+
+		setupLogger();
+
+		// start the GUI
 		EventQueue.invokeLater(new Runnable() {
 			public void run() {
 				try {
-					// Pruefe und Erzeuge gegebenfalls Config
-					try {
-						Config.init();
-					} catch (IOException e) {
-						e.printStackTrace();
-						JOptionPane.showMessageDialog(null, e.getMessage(),
-								"Fehler", JOptionPane.ERROR_MESSAGE);
-						return;
-					}
-
 					// Aufruf und Anzeige des Login Fensters
 					Login_GUI frame = new Login_GUI();
 					frame.setVisible(true);
diff --git a/dozentenmodul/src/main/java/config/Config.java b/dozentenmodul/src/main/java/config/Config.java
index 95547b5f..547e0ad5 100644
--- a/dozentenmodul/src/main/java/config/Config.java
+++ b/dozentenmodul/src/main/java/config/Config.java
@@ -1,8 +1,10 @@
 package config;
 
+
 import java.io.File;
 import java.io.IOException;
 
+import org.apache.log4j.Logger;
 import org.ini4j.Wini;
 
 /**
@@ -14,6 +16,11 @@ import org.ini4j.Wini;
 public class Config {
 
 	/**
+	 * Logger for this class
+	 */
+	private final static Logger LOGGER = Logger.getLogger(Config.class);
+
+	/**
 	 * The main configuration object is of type Wini
 	 * It contains the content of the config.ini as
 	 * determined in the init() function. 
@@ -39,7 +46,7 @@ public class Config {
 
 		// Determine OS
 		String OSName = System.getProperty("os.name").toLowerCase();
-		System.out.println("Machine's OS: " + OSName);
+		LOGGER.info("Machine's OS: " + OSName);
 		if (OSName.contains("windows")) {
 			// Windows machine. Use the environment variable 'APPDATA' which
 			// should point to a path similar to:
@@ -49,7 +56,7 @@ public class Config {
 				configPath = appDataPath + "\\bwSuite\\config.ini";
 			} else {
 				// APPDATA was empty, let's build it ourselves...
-				System.out.println("APPDATA ist leer.");
+				LOGGER.warn("APPDATA ist leer.");
 				configPath = System.getProperty("user.home") + "\\AppData\\Roaming\\bwSuite\\config.ini";	
 			}
 			
@@ -69,7 +76,7 @@ public class Config {
 		
 		// Check if the directory exists.
 		if (!configFile.getParentFile().exists()) {
-			System.out.println("Ordner " + configFile.getParentFile() + " exisitiert nicht - lege ihn jetzt an.");
+			LOGGER.info("Ordner " + configFile.getParentFile() + " exisitiert nicht - lege ihn jetzt an.");
 			// Does not, create it
 			if (!configFile.getParentFile().mkdirs()) {
 				throw new IOException("Konnte '" + configFile.getParentFile() + "' nicht erstellen.");
@@ -84,7 +91,7 @@ public class Config {
 			// Check if file is writeable
 			if(configFile.canWrite()) {
 				ini = new Wini(configFile);
-				System.out.println("Erzeuge '" + configFile + "'...");
+				LOGGER.info("Erzeuge '" + configFile + "'...");
 				// write default configuration options and values
 				ini.put("main", "BillOfRights", false);
 				ini.put("main", "vmware", false);
@@ -98,7 +105,7 @@ public class Config {
 				throw new IOException("Konnte nicht in '" + configFile + "' schreiben. Haben Sie Rechte dazu?");
 			}
 		} else {
-			System.out.println("'" + configFile + "' existiert bereits - keine weitere Aktion.");
+			LOGGER.info("'" + configFile + "' existiert bereits - keine weitere Aktion.");
 			ini = new Wini(configFile);
 		}
 	} // end constructor.
@@ -147,6 +154,17 @@ public class Config {
 	}
 	
 	/**
+	 * Query the path of the configuration file
+	 * @return path to the configuration file
+	 */
+	public static String getPath() {
+		if (ini.getFile().getParentFile().isDirectory())
+			return ini.getFile().getParentFile().toString();
+		else
+			return null;
+	}
+	
+	/**
 	 * Sets the value of 'BillOfRights' in the configuration file to 'value'
 	 * @return true if it succeeded, false otherwise
 	 */
@@ -199,7 +217,6 @@ public class Config {
 			ini.store();
 			return true;
 		} catch (IOException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 			return false;
 		}
diff --git a/dozentenmodul/src/main/java/ftp/DownloadTask.java b/dozentenmodul/src/main/java/ftp/DownloadTask.java
index 5592adba..02bfbe4d 100644
--- a/dozentenmodul/src/main/java/ftp/DownloadTask.java
+++ b/dozentenmodul/src/main/java/ftp/DownloadTask.java
@@ -1,6 +1,7 @@
 package ftp;
 
 import gui.image.FTPEditDownloader_GUI;
+import gui.intro.Login_GUI;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -9,6 +10,8 @@ import java.io.InputStream;
 import javax.swing.JOptionPane;
 import javax.swing.SwingWorker;
 
+import org.apache.log4j.Logger;
+
 /**
  * Execute file download in a background thread and update the progress.
  * 
@@ -17,6 +20,11 @@ import javax.swing.SwingWorker;
  */
 public class DownloadTask extends SwingWorker<Void, Void> {
 
+	/**
+	 * Logger instance for this class. 
+	 */
+	private final static Logger LOGGER = Logger.getLogger(DownloadTask.class);
+	
 	private static final int BUFFER_SIZE = 4096;
 
 	private String host;
@@ -69,7 +77,6 @@ public class DownloadTask extends SwingWorker<Void, Void> {
 					&& isCancelled() == false) {
 				outputStream.write(buffer, 0, bytesRead);
 				totalBytesRead += bytesRead;
-				// System.out.println(totalBytesRead);
 				double speed = NANOS_PER_SECOND / BYTES_PER_MIB
 						* totalBytesRead / (System.nanoTime() - start + 1);
 				percentCompleted = (int) (totalBytesRead * 100 / fileSize);
@@ -103,12 +110,12 @@ public class DownloadTask extends SwingWorker<Void, Void> {
 	@Override
 	protected void done() {
 		if (!isCancelled() && percentCompleted==100) {
-			System.out.println("Datei erfolgreich heruntergeladen");
+			LOGGER.info("Datei erfolgreich heruntergeladen.");
 			JOptionPane.showMessageDialog(null,
 					"Datei erfolgreich heruntergeladen.", "Message",
 					JOptionPane.INFORMATION_MESSAGE);
 		} else if(!isCancelled() && percentCompleted != 100){
-			System.out.println("Datein wurde unvollständig heruntergeladen");
+			LOGGER.error("Datei wurde unvollständig heruntergeladen.");
 			JOptionPane.showMessageDialog(null,
 					"Datei wurde unvollständig heruntergeladen. Bitte wiederholen.", "Message",
 					JOptionPane.INFORMATION_MESSAGE);
diff --git a/dozentenmodul/src/main/java/ftp/UploadTask.java b/dozentenmodul/src/main/java/ftp/UploadTask.java
index e7ebe43b..8fe60320 100644
--- a/dozentenmodul/src/main/java/ftp/UploadTask.java
+++ b/dozentenmodul/src/main/java/ftp/UploadTask.java
@@ -6,6 +6,8 @@ import java.io.FileInputStream;
 import javax.swing.JOptionPane;
 import javax.swing.SwingWorker;
 
+import org.apache.log4j.Logger;
+
 import models.Image;
 
 /**
@@ -16,6 +18,12 @@ import models.Image;
  * 
  */
 public class UploadTask extends SwingWorker<Void, Void> {
+	
+	/**
+	 * Logger instance for this class. 
+	 */
+	private final static Logger LOGGER = Logger.getLogger(UploadTask.class);
+	
 	private static final int BUFFER_SIZE = 4096;
 
 	private String host;
@@ -94,12 +102,12 @@ public class UploadTask extends SwingWorker<Void, Void> {
 	@Override
 	protected void done() {
 		if (!isCancelled() && percentCompleted==100) {
-			System.out.println("Datei erfolgreich hochgeladen");
+			LOGGER.info("Datei erfolgreich hochgeladen.");
 			JOptionPane.showMessageDialog(null,
 					"Datei erfolgreich hochgeladen.", "Message",
 					JOptionPane.INFORMATION_MESSAGE);
 		} else if(!isCancelled() && percentCompleted != 100){
-			System.out.println("Datein wurde unvollständig hochgeladen");
+			LOGGER.error("Datei wurde unvollständig hochgeladen.");
 			JOptionPane.showMessageDialog(null,
 					"Datei wurde unvollständig hochgeladen. Bitte wiederholen.", "Message",
 					JOptionPane.INFORMATION_MESSAGE);
diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
index d5247c7e..cf5345fb 100644
--- a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
@@ -1,6 +1,7 @@
 package gui.image;
 
 import gui.intro.About_GUI;
+import gui.intro.Login_GUI;
 import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
@@ -38,7 +39,11 @@ import models.Links;
 import models.person;
 import util.GuiOrganizer;
 import util.OpenLinks;
+
 import javax.swing.JScrollPane;
+
+import org.apache.log4j.Logger;
+
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 
@@ -46,6 +51,11 @@ import java.awt.event.KeyEvent;
 @SuppressWarnings("serial")
 public class CreateImageAllgemein_GUI extends JFrame {
 
+	/**
+	 * Logger instance for this class.
+	 */
+	private final static Logger LOGGER = Logger.getLogger(CreateImageAllgemein_GUI.class);
+	
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
 	private JTextField Vorname;
@@ -323,8 +333,7 @@ public class CreateImageAllgemein_GUI extends JFrame {
 							Image.image.setImagename(imagename.getText());
 							Image.image.setDesc(textAreadesc.getText());
 							// Info
-							System.out
-							.println("Alle Eingaben in Ordnung. Imagename= \""
+							LOGGER.info("Alle Eingaben in Ordnung. Imagename= \""
 									+ Image.image.getImagename()
 									+ "\", Imagebeschreibung=\""
 									+ Image.image.getDesc()+"\"");
diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
index ecf5b9df..57192b97 100644
--- a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
@@ -2,6 +2,7 @@ package gui.image;
 
 
 import gui.intro.About_GUI;
+import gui.intro.Login_GUI;
 import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
@@ -44,26 +45,27 @@ import server.generated.Server.Client;
 import thrift.ThriftConnection;
 import util.GuiOrganizer;
 import util.OpenLinks;
+
 import javax.swing.JComboBox;
 
+import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 
 @SuppressWarnings("serial")
 public class CreateImageTechnisch_GUI extends JFrame {
 
+	/**
+	 * Logger instance for this class.
+	 */
+	private final static Logger LOGGER = Logger.getLogger(CreateImageTechnisch_GUI.class);
+	
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
 	JSpinner spinnerCPU;
 	JSpinner spinnerRam;
-	//JRadioButton rdbtnlicenseJa;
-		//JRadioButton rdbtnlicenseNein;
-		//JRadioButton rdbtnInternetJa;
-		//JRadioButton rdbtnInternetNein;
-		//JRadioButton radioButtonVorlageJa;
-		//JRadioButton radioButtonVorlageNein;
-		private JCheckBox chckbxIsTemplate;
-		private JCheckBox chckbxIsLicensed;
-		private JCheckBox chckbxIsInternetBlocked;
+	private JCheckBox chckbxIsTemplate;
+	private JCheckBox chckbxIsLicensed;
+	private JCheckBox chckbxIsInternetBlocked;
 	JComboBox comboBox;
 	private final ButtonGroup buttonGrouplicense = new ButtonGroup();
 	private final ButtonGroup buttonGroupInternet = new ButtonGroup();
@@ -389,7 +391,7 @@ public class CreateImageTechnisch_GUI extends JFrame {
 						Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());
 						Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());
 						Image.image.setOS(comboBox.getSelectedItem().toString());
-						System.out.println("Betriebssystem: "+Image.image.getOS()+",  istVorlage: "+Image.image.isVorlage()+", Lizenzpflichtig: "+Image.image.isLicensed()+", Internetsperre: "+Image.image.isInternet()+", CPU: "+Image.image.getCpu()+",  RAM: "+Image.image.getRam());
+						LOGGER.info("Betriebssystem: "+Image.image.getOS()+",  istVorlage: "+Image.image.isVorlage()+", Lizenzpflichtig: "+Image.image.isLicensed()+", Internetsperre: "+Image.image.isInternet()+", CPU: "+Image.image.getCpu()+",  RAM: "+Image.image.getRam());
 						CreateImageFreigabe_GUI ea=new CreateImageFreigabe_GUI();
 						ea.setVisible(true);
 						dispose();
diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
index 008183ef..2f6ca6f3 100644
--- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
@@ -412,7 +412,6 @@ public class DeleteImage_GUI extends JFrame {
 		tabbedPane = new JTabbedPane(JTabbedPane.TOP);
 		tabbedPane.addChangeListener(new ChangeListener() {
 			public void stateChanged(ChangeEvent arg0) {
-				// System.out.println(tabbedPane.getSelectedIndex());
 				if (tabbedPane.getSelectedIndex() == 0 && activeSearch == false) {
 
 					String username = person.verantwortlicher.getName() + " "
@@ -444,13 +443,11 @@ public class DeleteImage_GUI extends JFrame {
 										.convertRowIndexToModel(tablemyImages
 												.getSelectedRow()), 6)
 								.toString();
-						// System.out.println(imageid);
 						String version = modelMyImages.getValueAt(
 								tablemyImages
 										.convertRowIndexToModel(tablemyImages
 												.getSelectedRow()), 7)
 								.toString();
-						// System.out.println(version);
 						writeImageData(imageid, version);
 					}
 				});
@@ -487,14 +484,12 @@ public class DeleteImage_GUI extends JFrame {
 												.convertRowIndexToModel(tablePublicVorlagen
 														.getSelectedRow()), 6)
 								.toString();
-						// System.out.println(imageid);
 						String version = modelPublicVorlagen
 								.getValueAt(
 										tablePublicVorlagen
 												.convertRowIndexToModel(tablePublicVorlagen
 														.getSelectedRow()), 7)
 								.toString();
-						// System.out.println(version);
 						writeImageData(imageid, version);
 					}
 				});
@@ -522,13 +517,11 @@ public class DeleteImage_GUI extends JFrame {
 										.convertRowIndexToModel(tableAllImages
 												.getSelectedRow()), 6)
 								.toString();
-						// System.out.println(imageid);
 						String version = modelAll.getValueAt(
 								tableAllImages
 										.convertRowIndexToModel(tableAllImages
 												.getSelectedRow()), 7)
 								.toString();
-						// System.out.println(version);
 						writeImageData(imageid, version);
 
 					}
@@ -587,8 +580,6 @@ public class DeleteImage_GUI extends JFrame {
 						try {
 							if (!client.connectedToLecture(imageid,
 									imageversion)) {
-								// System.out.println(imageid);
-								// System.out.println(imageversion);
 								try {
 									client.deleteImageServer(imageid,
 											imageversion);
@@ -694,8 +685,6 @@ public class DeleteImage_GUI extends JFrame {
 						try {
 							if (!client.connectedToLecture(imageid,
 									imageversion)) {
-								// System.out.println(imageid);
-								// System.out.println(imageversion);
 								try {
 									client.deleteImageServer(imageid,
 											imageversion);
@@ -798,8 +787,6 @@ public class DeleteImage_GUI extends JFrame {
 						try {
 							if (!client.connectedToLecture(imageid,
 									imageversion)) {
-								// System.out.println(imageid);
-								// System.out.println(imageversion);
 								try {
 									client.deleteImageServer(imageid,
 											imageversion);
@@ -1111,10 +1098,8 @@ public class DeleteImage_GUI extends JFrame {
 			int x = 0;
 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
 			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
-			while (i.hasNext()) {
-
-				// System.out.println(out.format(in.parse(images.get(x).updateTime)));
 
+			while (i.hasNext()) {
 				// erzeuge Objekte fuer die Tabelle
 				Object[] obj = { images.get(x).getImageName(),
 						images.get(x).getLicenseRestriction(),
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
index e4f6e0cf..d3e83bea 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
@@ -1,6 +1,7 @@
 package gui.image;
 
 import gui.intro.About_GUI;
+import gui.intro.Login_GUI;
 import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
@@ -38,17 +39,24 @@ import models.Image;
 import models.Links;
 import models.person;
 
+import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 
 import server.generated.Server.Client;
 import thrift.ThriftConnection;
 import util.GuiOrganizer;
 import util.OpenLinks;
+
 import javax.swing.JScrollPane;
 
 @SuppressWarnings("serial")
 public class EditImageAllgemein_GUI extends JFrame {
 
+	/**
+	 * Logger instance for this class.
+	 */
+	private final static Logger LOGGER = Logger.getLogger(EditImageAllgemein_GUI.class);
+	
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
 	private JTextField Vorname;
@@ -321,8 +329,7 @@ public class EditImageAllgemein_GUI extends JFrame {
 							Image.image.setImagename(imagename.getText());
 							Image.image.setDesc(textAreadesc.getText());
 							// Info
-							System.out
-									.println("Alle Eingaben in Ordnung. Imagename= \""
+							LOGGER.info("Alle Eingaben in Ordnung. Imagename= \""
 											+ Image.image.getImagename()
 											+ "\", Imagebeschreibung=\""
 											+ Image.image.getDesc()+"\"");
@@ -436,7 +443,7 @@ public class EditImageAllgemein_GUI extends JFrame {
 			} else {
 				Image.image.setLicensed(true);
 			}
-			System.out.println(map.get("template"));
+			LOGGER.debug(map.get("template"));
 			if (map.get("template").equals("false")) {
 				Image.image.setVorlage(false);
 			} else {
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
index a86b0a58..d8df52c7 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
@@ -1,13 +1,13 @@
 package gui.image;
 
 import gui.intro.About_GUI;
+import gui.intro.Login_GUI;
 import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
 import java.awt.FlowLayout;
 import java.awt.Font;
 import java.awt.SystemColor;
-
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
@@ -18,7 +18,6 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.List;
 
-
 import javax.swing.ButtonGroup;
 import javax.swing.JButton;
 import javax.swing.JFrame;
@@ -44,24 +43,26 @@ import util.GuiOrganizer;
 import util.OpenLinks;
 import models.Image;
 import models.Links;
+
 import javax.swing.JComboBox;
 
+import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
+
 import javax.swing.JCheckBox;
 
 @SuppressWarnings("serial")
 public class EditImageTechnisch_GUI extends JFrame {
 
+	/**
+	 * Logger instance for this class.
+	 */
+	private final static Logger LOGGER = Logger.getLogger(EditImageTechnisch_GUI.class);
+	
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
 	JSpinner spinnerCPU;
 	JSpinner spinnerRam;
-	//JRadioButton rdbtnlicenseJa;
-	//JRadioButton rdbtnlicenseNein;
-	//JRadioButton rdbtnInternetJa;
-	//JRadioButton rdbtnInternetNein;
-	//JRadioButton radioButtonVorlageJa;
-	//JRadioButton radioButtonVorlageNein;
 	private JCheckBox chckbxIsTemplate;
 	private JCheckBox chckbxIsLicensed;
 	private JCheckBox chckbxIsInternetBlocked;
@@ -223,7 +224,7 @@ public class EditImageTechnisch_GUI extends JFrame {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
 		}
-		System.out.println("OS Model:" + Image.image.getOS());
+		LOGGER.info("OS of this image: " + Image.image.getOS());
 		for(int i =0;i<comboBox.getItemCount();i++)
 		{
 			if(comboBox.getItemAt(i).equals(Image.image.getOS()+" bit")){
@@ -232,7 +233,7 @@ public class EditImageTechnisch_GUI extends JFrame {
 				
 			}
 		}
-		System.out.println(comboBox.getSelectedItem().toString());
+		LOGGER.debug(comboBox.getSelectedItem().toString());
 		comboBox.setBounds(270, 26, 277, 20);
 		panel_1.add(comboBox);
 		
@@ -434,7 +435,12 @@ public class EditImageTechnisch_GUI extends JFrame {
 						}
 						
 						Image.image.setOS(comboBox.getSelectedItem().toString());
-						System.out.println("Betriebssystem: "+Image.image.getOS()+",  istVorlage: "+Image.image.isVorlage()+", Lizenzpflichtig: "+Image.image.isLicensed()+", Internetsperre: "+Image.image.isInternet()+", CPU: "+Image.image.getCpu()+",  RAM: "+Image.image.getRam());
+						LOGGER.info("OS: " + Image.image.getOS() +
+									", Vorlage: " + Image.image.isVorlage() +
+									", Lizenzpflichtig: " + Image.image.isLicensed() +
+									", Internetsperre: " + Image.image.isInternet() +
+									", CPU: " + Image.image.getCpu() +
+									",  RAM: " + Image.image.getRam());
 						// oeffnet das naechste Fenster
 						EditImageFreigabe_GUI ea=new EditImageFreigabe_GUI();
 						ea.setVisible(true);
diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index d2e81721..a2825d54 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -44,6 +44,7 @@ import models.Links;
 import models.SessionData;
 import models.person;
 
+import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 import org.ini4j.InvalidFileFormatException;
 import org.ini4j.Wini;
@@ -54,6 +55,7 @@ import util.GuiOrganizer;
 import util.OpenLinks;
 import ftp.UploadTask;
 import gui.intro.About_GUI;
+import gui.intro.Login_GUI;
 import gui.intro.MainMenue_GUI;
 import config.Config;
 
@@ -61,6 +63,11 @@ import config.Config;
 public class FTPCreateUploader_GUI extends JFrame implements
 		PropertyChangeListener {
 
+	/**
+	 * Logger instance for this class.
+	 */
+	private final static Logger LOGGER = Logger.getLogger(FTPCreateUploader_GUI.class);
+	
 	@SuppressWarnings("unused")
 	private JPanel contentPane;
 	private final JPanel contentPanel = new JPanel();
@@ -431,11 +438,11 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		menuItem.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
-				OpenLinks open = new OpenLinks();
+				//OpenLinks open = new OpenLinks();
 				URI windows;
 				try {
 					windows = new URI(Links.getFAQ());
-					open.openWebpage(windows);
+					OpenLinks.openWebpage(windows);
 				} catch (URISyntaxException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
@@ -481,21 +488,22 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		btnUploadStarten.setText("Bitte warten");
 
 		try {
-			System.out.println("Getting FTP User");
+			LOGGER.info("Getting FTP User...");
 			user = client.getFtpUser();
-			System.out.println("FTP name: " + user.userName);
-			System.out.println("FTP path: " + user.path);
-			System.out.println("FTP pass: " + user.password);
+			LOGGER.debug("FTP name: " + user.userName);
+			LOGGER.debug("FTP path: " + user.path);
+			LOGGER.debug("FTP pass: " + user.password);
 		} catch (TException e) {
 			// TODO Auto-generated catch block
+			LOGGER.error("Konnte vom Satellit keinen FTP-User erhalten!");
 			e.printStackTrace();
 			JOptionPane.showMessageDialog(null,
-					e.getCause() + "\n" + e.getStackTrace(), "Debug-Message",
+					"Konnte vom Satellit keinen FTP-User erhalten!", "Debug-Message",
 					JOptionPane.ERROR_MESSAGE);
 		}
 		DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss");
 
-		System.out.println("Setting new Name: " + formatter.format(new Date())
+		LOGGER.info("Setting new name: " + formatter.format(new Date())
 				+ "_" + person.verantwortlicher.getHochschule() + "_"
 				+ person.verantwortlicher.getUsername() + "_"
 				+ Image.image.getImagename() + ".vmdk");
@@ -503,7 +511,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 				+ person.verantwortlicher.getHochschule() + "_"
 				+ person.verantwortlicher.getUsername() + "_"
 				+ Image.image.getImagename() + ".vmdk");
-		System.out.println("Uploading to host: " + host);
+		LOGGER.info("Uploading to host: " + host);
 
 		task = new UploadTask(host, port, user.userName, user.password,
 				user.path + "temp/", uploadFile);
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
index 99ae2bc6..42a2c20c 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
@@ -40,6 +40,7 @@ import models.Image;
 import models.Links;
 import models.SessionData;
 
+import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 import org.ini4j.InvalidFileFormatException;
 import org.ini4j.Wini;
@@ -58,6 +59,11 @@ import config.Config;
 public class FTPEditDownloader_GUI extends JFrame implements
 		PropertyChangeListener {
 
+	/**
+	 * Logger instance for this class.
+	 */
+	private final static Logger LOGGER = Logger.getLogger(FTPEditDownloader_GUI.class);
+	
 	@SuppressWarnings("unused")
 	private JPanel contentPane;
 	private final JPanel contentPanel = new JPanel();
@@ -534,7 +540,6 @@ public class FTPEditDownloader_GUI extends JFrame implements
 		} else {
 			isCurrentlyLoading = true;
 		}
-		System.out.println("isCurrentlyLoading="+isCurrentlyLoading);
 		return isCurrentlyLoading;
 	}// end isCurrentlyLoading()
 
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
index 8ab64d3f..ca7c1d48 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
@@ -43,6 +43,7 @@ import models.Links;
 import models.SessionData;
 import models.person;
 
+import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 import org.ini4j.InvalidFileFormatException;
 import org.ini4j.Wini;
@@ -53,6 +54,7 @@ import util.GuiOrganizer;
 import util.OpenLinks;
 import ftp.UploadTask;
 import gui.intro.About_GUI;
+import gui.intro.Login_GUI;
 import gui.intro.MainMenue_GUI;
 import config.Config;
 
@@ -60,6 +62,11 @@ import config.Config;
 public class FTPEditUploader_GUI extends JFrame implements
 		PropertyChangeListener {
 
+	/**
+	 * Logger instance for this class.
+	 */
+	private final static Logger LOGGER = Logger.getLogger(FTPEditUploader_GUI.class);
+	
 	@SuppressWarnings("unused")
 	private JPanel contentPane;
 	private final JPanel contentPanel = new JPanel();
@@ -480,20 +487,21 @@ public class FTPEditUploader_GUI extends JFrame implements
 		btnUploadStarten.setText("Bitte warten");
 
 		try {
+			LOGGER.info("Getting FTP-User...");
 			user = client.getFtpUser();
-			System.out.println("FTP name: " + user.userName);
-			System.out.println("FTP path: " + user.path);
-			System.out.println("FTP pass: " + user.password);
+			LOGGER.debug("FTP name: " + user.userName);
+			LOGGER.debug("FTP path: " + user.path);
+			LOGGER.debug("FTP pass: " + user.password);
 		} catch (TException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 			JOptionPane.showMessageDialog(null,
-					e.getCause() + "\n" + e.getStackTrace(), "Debug-Message",
+					"Konnte vom Satelliten keine FTP-User erhalten!", "Debug-Message",
 					JOptionPane.ERROR_MESSAGE);
 		}
 		DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss");
 
-		System.out.println("Setting new Name: " + formatter.format(new Date())
+		LOGGER.info("Setting new Name: " + formatter.format(new Date())
 				+ "_" + person.verantwortlicher.getHochschule() + "_"
 				+ person.verantwortlicher.getUsername() + "_"
 				+ Image.image.getImagename() + ".vmdk");
@@ -563,8 +571,8 @@ public class FTPEditUploader_GUI extends JFrame implements
 	public boolean updateData() {
 
 		try {
-			System.out.println("NewName=" + Image.image.getNewName());
-			System.out.println("OldName=" + Image.image.getImagename());
+			LOGGER.debug("NewName: " + Image.image.getNewName());
+			LOGGER.debug("OldName: " + Image.image.getImagename());
 			if (Image.image.getNewName() != null) {
 				client.updateImageData(Image.image.getImagename(),
 						Image.image.getImagename(), Image.image.getDesc(),
@@ -597,7 +605,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 			JOptionPane.showMessageDialog(null,
-					e.getCause() + "\n" + e.getStackTrace(), "Debug-Message",
+					"Konnte die Metadaten des Images nicht in die Datenbank speichern!", "Debug-Message",
 					JOptionPane.ERROR_MESSAGE);
 			return false;
 		}
diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index 1e27725c..dbb667fe 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -1,6 +1,7 @@
 package gui.image;
 
 import gui.intro.About_GUI;
+import gui.intro.Login_GUI;
 import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
@@ -57,6 +58,7 @@ import models.Image;
 import models.Links;
 import models.person;
 
+import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 
 import server.generated.Server.Client;
@@ -68,6 +70,11 @@ import util.OpenLinks;
 @SuppressWarnings("serial")
 public class SearchEditImage_GUI extends JFrame {
 
+	/**
+	 * Logger instance for this class.
+	 */
+	private final static Logger LOGGER = Logger.getLogger(SearchEditImage_GUI.class);
+	
 	private final JPanel contentPanel = new JPanel();
 	JLabel labelName;
 	JLabel labelUpdate;
@@ -433,13 +440,11 @@ public class SearchEditImage_GUI extends JFrame {
 										.convertRowIndexToModel(tablemyImages
 												.getSelectedRow()), 6)
 								.toString();
-						//System.out.println(imageid);
 						String version = modelMyImages.getValueAt(
 								tablemyImages
 										.convertRowIndexToModel(tablemyImages
 												.getSelectedRow()), 7)
 								.toString();
-						//System.out.println(version);
 						writeImageData(imageid, version);
 					}
 				});
@@ -474,14 +479,12 @@ public class SearchEditImage_GUI extends JFrame {
 												.convertRowIndexToModel(tablePublicVorlagen
 														.getSelectedRow()), 6)
 								.toString();
-						//System.out.println(imageid);
 						String version = modelPublicVorlagen
 								.getValueAt(
 										tablePublicVorlagen
 												.convertRowIndexToModel(tablePublicVorlagen
 														.getSelectedRow()), 7)
 								.toString();
-						//System.out.println(version);
 						writeImageData(imageid, version);
 					}
 				});
@@ -506,13 +509,11 @@ public class SearchEditImage_GUI extends JFrame {
 										.convertRowIndexToModel(tableAllImages
 												.getSelectedRow()), 6)
 								.toString();
-						//System.out.println(imageid);
 						String version = modelAll.getValueAt(
 								tableAllImages
 										.convertRowIndexToModel(tableAllImages
 												.getSelectedRow()), 7)
 								.toString();
-						//System.out.println(version);
 						writeImageData(imageid, version);
 
 					}
@@ -990,8 +991,8 @@ public class SearchEditImage_GUI extends JFrame {
 
 			while (i.hasNext()) {
 				// erzeuge Objekte fuer die Tabelle
-				System.out.println("image time: " + images.get(x).updateTime);
-				System.out.println("image name: " + images.get(x).getImageName());
+				LOGGER.debug("Image last updated on: " + images.get(x).updateTime);
+				LOGGER.debug("Image name: " + images.get(x).getImageName());
 				Object[] obj = { images.get(x).getImageName(),
 						images.get(x).getLicenseRestriction(),
 						images.get(x).getOsName(),
diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
index fedf27df..64c76bed 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
@@ -59,18 +59,25 @@ import models.Image;
 import models.Links;

 import models.person;

 

+import org.apache.log4j.Logger;

 import org.apache.thrift.TException;

 

 import server.generated.Server.Client;

 import thrift.ThriftConnection;

 import util.GuiOrganizer;

 import util.OpenLinks;

+

 import java.beans.PropertyChangeListener;

 import java.beans.PropertyChangeEvent;

 

 @SuppressWarnings("serial")

 public class SearchImage_GUI extends JFrame {

 

+	/**

+	 * Logger instance for this class.

+	 */

+	private final static Logger LOGGER = Logger.getLogger(SearchImage_GUI.class);

+	

 	private final JPanel contentPanel = new JPanel();

 	JLabel labelName;

 	JLabel labelUpdate;

@@ -440,13 +447,11 @@ public class SearchImage_GUI extends JFrame {
 										.convertRowIndexToModel(tableAllImages

 												.getSelectedRow()), 6)

 								.toString();

-						//System.out.println(imageid);

 						String version = modelAll.getValueAt(

 								tableAllImages

 										.convertRowIndexToModel(tableAllImages

 												.getSelectedRow()), 7)

 								.toString();

-						//System.out.println(version);

 						writeImageData(imageid, version);

 

 					}

@@ -468,13 +473,11 @@ public class SearchImage_GUI extends JFrame {
 										.convertRowIndexToModel(tablemyImages

 												.getSelectedRow()), 6)

 								.toString();

-						//System.out.println(imageid);

 						String version = modelMyImages.getValueAt(

 								tablemyImages

 										.convertRowIndexToModel(tablemyImages

 												.getSelectedRow()), 7)

 								.toString();

-						//System.out.println(version);

 						writeImageData(imageid, version);

 					}

 				});

@@ -500,14 +503,12 @@ public class SearchImage_GUI extends JFrame {
 												.convertRowIndexToModel(tablePublicVorlagen

 														.getSelectedRow()), 6)

 								.toString();

-						//System.out.println(imageid);

 						String version = modelPublicVorlagen

 								.getValueAt(

 										tablePublicVorlagen

 												.convertRowIndexToModel(tablePublicVorlagen

 														.getSelectedRow()), 7)

 								.toString();

-						//System.out.println(version);

 						writeImageData(imageid, version);

 					}

 				});

diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
index ebfaf9a3..4c29027a 100644
--- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
@@ -26,6 +26,7 @@ import javax.swing.border.EmptyBorder;
 import models.SessionData;
 import models.person;
 
+import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 import org.openslx.imagemaster.thrift.iface.ImageServer.Client;
 import org.openslx.imagemaster.thrift.iface.UserInfo;
@@ -39,6 +40,11 @@ import config.Config;
 @SuppressWarnings("serial")
 public class Login_GUI extends JFrame {
 
+	/**
+	 * Logger instance for this class.
+	 */
+	private final static Logger LOGGER = Logger.getLogger(Login_GUI.class);
+	
 	private JPanel contentPane;
 	private JTextField lblusername;
 	private JPasswordField lblpass;
@@ -126,7 +132,6 @@ public class Login_GUI extends JFrame {
 				.setToolTipText("Bitte geben Sie Ihren bwIDM-Benutzernamen ein.");
 
 		// Lese Information aus der Konfigurationsdatei
-		System.out.println(Config.getUsername());
 		lblusername.setText(Config.getUsername());
 		chckbxBenutzernameSpeichern.setSelected(Config.getSaveUsername());
 
@@ -195,7 +200,7 @@ public class Login_GUI extends JFrame {
 			}
 
 			// User-Info
-			System.out.println("Authentifizierung erfolgreich");
+			LOGGER.info("Authentifizierung von '" + lblusername.getText() + "' erfolgreich.");
 			user = client.getUserFromToken(result.authToken);
 
 		} catch (org.openslx.imagemaster.thrift.iface.AuthenticationException e) {
@@ -226,8 +231,8 @@ public class Login_GUI extends JFrame {
 		models.Client.clientcon.setClient(bwClient);
 
 		// User-Info
-		System.out.println("Session-ID: " + result.sessionId + "\nToken: "
-				+ result.authToken);
+		LOGGER.debug("Session-ID: " + result.sessionId);
+		LOGGER.debug("Token: " + result.authToken);
 		setStatus(Color.green, "Daten erhalten.", null);
 
 		String hochschule = user.eMail.substring(user.eMail.indexOf("@") + 1);
@@ -293,7 +298,7 @@ public class Login_GUI extends JFrame {
 	 *            show.
 	 */
 	private void setStatus(Color color, String shortMessage, String longMessage) {
-		System.out.println(shortMessage);
+		LOGGER.info(shortMessage);
 		lblConnectionInfo.setForeground(color);
 		lblConnectionInfo.setText(shortMessage);
 		if (longMessage != null)
diff --git a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
index 8abf8080..65335f74 100644
--- a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
@@ -51,6 +51,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.xml.sax.SAXException;
+import org.apache.log4j.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -68,6 +69,8 @@ import util.OpenLinks;
 @SuppressWarnings("serial")
 public class MainMenue_GUI extends JFrame {
 
+	private final static Logger LOGGER = Logger.getLogger(MainMenue_GUI.class);
+	
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
 	String descNewImage, descEditImage, descDeleteImage, descSearchImage,
@@ -92,10 +95,6 @@ public class MainMenue_GUI extends JFrame {
 	 */
 	public MainMenue_GUI() {
 
-		// Leerzeile auf Konsole bei Rueckkehr ins Hauptmenue fuer leichteres
-		// Lesen
-		System.out.println("\n");
-
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
@@ -365,7 +364,7 @@ public class MainMenue_GUI extends JFrame {
 				.setText("Um detaillierte Informationen zu erhalten, fahren Sie bitte mit der Maus über die Grafik.");
 		txtpnUmDetaillierteInformationen.setEditable(false);
 		txtpnUmDetaillierteInformationen.setBackground(SystemColor.menu);
-		txtpnUmDetaillierteInformationen.setBounds(10, 188, 509, 22);
+		txtpnUmDetaillierteInformationen.setBounds(10, 174, 509, 36);
 		contentPanel.add(txtpnUmDetaillierteInformationen);
 		{
 			JPanel buttonPane = new JPanel();
@@ -534,11 +533,11 @@ public class MainMenue_GUI extends JFrame {
 	}// end processRights()
 
 	public void setRoleRights() {
-		// Set rights for user, depending on the role that is returned by the
-		// masterserver
+		// Set rights for user, depending on the role
+		// returned by the masterserver
 
-		System.out.println("Ihre Rolle ist nun: "
-				+ person.verantwortlicher.getRole());
+		LOGGER.info("Role: " + person.verantwortlicher.getRole());
+		
 		// role==Student
 		if (person.verantwortlicher.getRole().equals("Student")) {
 			ImageRights.rights.setRead(1);
@@ -546,12 +545,6 @@ public class MainMenue_GUI extends JFrame {
 			ImageRights.rights.setChangePermission(0);
 			ImageRights.rights.setAdmin(0);
 			ImageRights.rights.setLinkAllowed(0);
-			System.out.println("Rechte (r,w,cp,a,la): "
-					+ ImageRights.rights.getRead() + ","
-					+ ImageRights.rights.getWrite() + ","
-					+ ImageRights.rights.getChangePermission() + ","
-					+ ImageRights.rights.getAdmin() + ","
-					+ ImageRights.rights.getLinkAllowed());
 
 		} else if (person.verantwortlicher.getRole().equals("Dozent")) { // role==Dozent
 			ImageRights.rights.setRead(1);
@@ -559,37 +552,27 @@ public class MainMenue_GUI extends JFrame {
 			ImageRights.rights.setChangePermission(0);
 			ImageRights.rights.setAdmin(0);
 			ImageRights.rights.setLinkAllowed(1);
-			System.out.println("Rechte (r,w,cp,a,la): "
-					+ ImageRights.rights.getRead() + ","
-					+ ImageRights.rights.getWrite() + ","
-					+ ImageRights.rights.getChangePermission() + ","
-					+ ImageRights.rights.getAdmin() + ","
-					+ ImageRights.rights.getLinkAllowed());
 		} else if (person.verantwortlicher.getRole().equals("Admin")) { // role==Admin
 			ImageRights.rights.setRead(1);
 			ImageRights.rights.setWrite(1);
 			ImageRights.rights.setChangePermission(1);
 			ImageRights.rights.setAdmin(1);
 			ImageRights.rights.setLinkAllowed(1);
-			System.out.println("Rechte (r,w,cp,a,la): "
-					+ ImageRights.rights.getRead() + ","
-					+ ImageRights.rights.getWrite() + ","
-					+ ImageRights.rights.getChangePermission() + ","
-					+ ImageRights.rights.getAdmin() + ","
-					+ ImageRights.rights.getLinkAllowed());
 		} else { // role==Nothing
 			ImageRights.rights.setRead(0);
 			ImageRights.rights.setWrite(0);
 			ImageRights.rights.setChangePermission(0);
 			ImageRights.rights.setAdmin(0);
 			ImageRights.rights.setLinkAllowed(0);
-			System.out.println("Rechte (r,w,cp,a,la): "
-					+ ImageRights.rights.getRead() + ","
-					+ ImageRights.rights.getWrite() + ","
-					+ ImageRights.rights.getChangePermission() + ","
-					+ ImageRights.rights.getAdmin() + ","
-					+ ImageRights.rights.getLinkAllowed());
 		}// end if else
+		
+		// always print rights information 
+		LOGGER.info("Rights: (r, w, cp, a, la) = ("
+				+ ImageRights.rights.getRead() + ", "
+				+ ImageRights.rights.getWrite() + ", "
+				+ ImageRights.rights.getChangePermission() + ", "
+				+ ImageRights.rights.getAdmin() + ", "
+				+ ImageRights.rights.getLinkAllowed() + ")");
 	}// end setRoleRights
 
 	public void setCorrectRadioButton() {
diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
index 2ac5555d..cc947084 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
@@ -410,14 +410,12 @@ public class CreateLectureLink_GUI extends JFrame {
 										.convertRowIndexToModel(tablemyImages
 												.getSelectedRow()), 6)
 						.toString();
-	        	//System.out.println(imageid);
 	        	String version = modelMyImages
 						.getValueAt(
 								tablemyImages
 										.convertRowIndexToModel(tablemyImages
 												.getSelectedRow()), 7)
 						.toString();
-	        	//System.out.println(version);
 	        	try {
 					writeImageData(imageid, version);
 				} catch (TException e1) {
@@ -461,14 +459,12 @@ public class CreateLectureLink_GUI extends JFrame {
 														.convertRowIndexToModel(tablePublicVorlagen
 																.getSelectedRow()), 6)
 										.toString();
-					        	//System.out.println(imageid);
 					        	String version = modelPublicVorlagen
 										.getValueAt(
 												tablePublicVorlagen
 														.convertRowIndexToModel(tablePublicVorlagen
 																.getSelectedRow()), 7)
 										.toString();
-					        	//System.out.println(version);
 					        	try {
 									writeImageData(imageid, version);
 								} catch (TException e1) {
@@ -504,14 +500,12 @@ public class CreateLectureLink_GUI extends JFrame {
 												.convertRowIndexToModel(tableAllImages
 														.getSelectedRow()), 6)
 								.toString();
-			        	//System.out.println(imageid);
 			        	String version = modelAll
 								.getValueAt(
 										tableAllImages
 												.convertRowIndexToModel(tableAllImages
 														.getSelectedRow()), 7)
 								.toString();
-			        	//System.out.println(version);
 			        	try {
 							writeImageData(imageid, version);
 						} catch (TException e1) {
diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
index dd6f6048..b387ab9f 100644
--- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
@@ -1,6 +1,7 @@
 package gui.lecture;
 
 import gui.intro.About_GUI;
+import gui.intro.Login_GUI;
 import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
@@ -56,6 +57,7 @@ import javax.swing.table.TableRowSorter;
 import models.Links;
 import models.person;
 
+import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 
 import server.generated.Server.Client;
@@ -65,6 +67,8 @@ import util.OpenLinks;
 
 @SuppressWarnings("serial")
 public class DeleteLecture_GUI extends JFrame {
+	
+	private final static Logger LOGGER = Logger.getLogger(DeleteLecture_GUI.class);
 
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
@@ -330,7 +334,6 @@ public class DeleteLecture_GUI extends JFrame {
 										.convertRowIndexToModel(tableAllLectures
 												.getSelectedRow()), 8)
 						.toString();
-	        	//System.out.println(imageid);
 
 	        	try {
 					writeLectureData(imageid);
@@ -362,7 +365,6 @@ public class DeleteLecture_GUI extends JFrame {
 										.convertRowIndexToModel(tablemyLectures
 												.getSelectedRow()), 8)
 						.toString();
-	        	//System.out.println(imageid);
 
 	        	try {
 					writeLectureData(imageid);
@@ -534,10 +536,10 @@ public class DeleteLecture_GUI extends JFrame {
 							if (eingabe == JOptionPane.YES_OPTION) {
 								//user has confirmed deletion, now get the ID of the selected lecture
 								lectureID = modelMyLectures.getValueAt(tablemyLectures.convertColumnIndexToModel(tablemyLectures.getSelectedRow()), 8).toString();
-								System.out.println("Lösche Lecture "+lectureID);
+								LOGGER.info("Lösche Veranstaltung: " + lectureID);
 								try {
 									if(client.deleteLecture(lectureID, person.verantwortlicher.getHochschule(),person.verantwortlicher.getUsername())){
-										System.out.println("Löschen erfolgreich");
+										LOGGER.info("Löschen erfolgreich.");
 										//delete successful
 										
 										DeleteLecture_GUI dl = new DeleteLecture_GUI();
@@ -545,10 +547,11 @@ public class DeleteLecture_GUI extends JFrame {
 										dispose();
 									} else {
 										//delete not successful
+										LOGGER.error("Konnte Veranstaltung '" + lectureID + "' nicht aus der Datenbank löschen!");
 										JOptionPane
 										.showMessageDialog(
 												null,
-												"Löschen aus Datenbank fehlgeschlagen.",
+												"Löschen der Veranstaltung aus der Datenbank fehlgeschlagen.",
 												"Fehler",
 												JOptionPane.INFORMATION_MESSAGE);
 									}
@@ -569,10 +572,10 @@ public class DeleteLecture_GUI extends JFrame {
 							if (eingabe == JOptionPane.YES_OPTION) {
 								//user has confirmed deletion, now get the ID of the selected lecture
 								lectureID = tableAllLectures.getValueAt(tableAllLectures.convertColumnIndexToModel(tableAllLectures.getSelectedRow()), 8).toString();
-								System.out.println("Lösche Lecture "+lectureID);
+								LOGGER.info("Lösche Veranstaltung: "+lectureID);
 								try {
 									if(client.deleteLecture(lectureID, person.verantwortlicher.getHochschule(),person.verantwortlicher.getUsername())){
-										System.out.println("Löschen erfolgreich");
+										LOGGER.info("Löschen erfolgreich.");
 										//delete successful
 										
 										DeleteLecture_GUI dl = new DeleteLecture_GUI();
@@ -580,6 +583,7 @@ public class DeleteLecture_GUI extends JFrame {
 										dispose();
 									} else {
 										//delete not successful
+										LOGGER.error("Konnte Veranstaltung '" + lectureID + "' nicht aus der Datenbank löschen!");
 										JOptionPane
 										.showMessageDialog(
 												null,
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
index bc9056de..7c828ea0 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
@@ -406,14 +406,12 @@ public class EditLectureLink_GUI extends JFrame {
 										.convertRowIndexToModel(tableAllImages
 												.getSelectedRow()), 6)
 						.toString();
-	        	//System.out.println(imageid);
 	        	String version = modelAll
 						.getValueAt(
 								tableAllImages
 										.convertRowIndexToModel(tableAllImages
 												.getSelectedRow()), 7)
 						.toString();
-	        	//System.out.println(version);
 	        	writeImageData(imageid, version);
 
 	        }
@@ -436,14 +434,12 @@ public class EditLectureLink_GUI extends JFrame {
 												.convertRowIndexToModel(tablemyImages
 														.getSelectedRow()), 6)
 								.toString();
-			        	//System.out.println(imageid);
 			        	String version = modelMyImages
 								.getValueAt(
 										tablemyImages
 												.convertRowIndexToModel(tablemyImages
 														.getSelectedRow()), 7)
 								.toString();
-			        	//System.out.println(version);
 			        	writeImageData(imageid, version);
 			        }
 			    });
@@ -469,14 +465,12 @@ public class EditLectureLink_GUI extends JFrame {
 												.convertRowIndexToModel(tablePublicVorlagen
 														.getSelectedRow()), 6)
 								.toString();
-			        	//System.out.println(imageid);
 			        	String version = modelPublicVorlagen
 								.getValueAt(
 										tablePublicVorlagen
 												.convertRowIndexToModel(tablePublicVorlagen
 														.getSelectedRow()), 7)
 								.toString();
-			        	//System.out.println(version);
 			        	writeImageData(imageid, version);
 			        }
 			    });
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
index b143420a..ab72cf11 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
@@ -335,7 +335,6 @@ public class EditLectureSearch_GUI extends JFrame {
 												.convertRowIndexToModel(tableAllLectures
 														.getSelectedRow()), 8)
 								.toString();
-						//System.out.println(imageid);
 
 						try {
 							writeLectureData(imageid);
@@ -365,7 +364,6 @@ public class EditLectureSearch_GUI extends JFrame {
 										.convertRowIndexToModel(tablemyLectures
 												.getSelectedRow()), 8)
 								.toString();
-						//System.out.println(imageid);
 
 						try {
 							writeLectureData(imageid);
diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
index e3c70c4b..510e7a7d 100644
--- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
@@ -325,7 +325,6 @@ public class SearchLecture_GUI extends JFrame {
 										.convertRowIndexToModel(tableAllLectures

 												.getSelectedRow()), 8)

 						.toString();

-	        	//System.out.println(imageid);

 

 	        	try {

 					writeLectureData(imageid);

@@ -357,7 +356,6 @@ public class SearchLecture_GUI extends JFrame {
 										.convertRowIndexToModel(tablemyLectures

 												.getSelectedRow()), 8)

 						.toString();

-	        	//System.out.println(imageid);

 

 	        	try {

 					writeLectureData(imageid);

diff --git a/dozentenmodul/src/main/java/thrift/MasterThriftConnection.java b/dozentenmodul/src/main/java/thrift/MasterThriftConnection.java
index eec1d785..7c1259f9 100644
--- a/dozentenmodul/src/main/java/thrift/MasterThriftConnection.java
+++ b/dozentenmodul/src/main/java/thrift/MasterThriftConnection.java
@@ -1,5 +1,6 @@
 package thrift;
 
+import org.apache.log4j.Logger;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.protocol.TProtocol;
 import org.apache.thrift.transport.TFramedTransport;
@@ -10,6 +11,8 @@ import org.openslx.imagemaster.thrift.iface.ImageServer.Client;
 
 public class MasterThriftConnection {
 
+	private final static Logger LOGGER = Logger.getLogger(MasterThriftConnection.class);
+	
 	public static final String MASTERSERVER_IP = "132.230.4.16";
 	public static final int MASTERSERVER_PORT = 9090;
 	public static final int MASTERSERVER_TIMEOUT_MS = 6000;
@@ -22,13 +25,13 @@ public class MasterThriftConnection {
 		try {
 			transport.open();
 		} catch (TTransportException e) {
-			System.out.println("Keine Verbindung möglich!");
+			LOGGER.error("Keine Verbindung möglich!");
 			return null;
 		}
 
 		final TProtocol protocol = new TBinaryProtocol(transport);
 		final Client client = new Client(protocol);
-		System.out.println("Masterserver erreichbar.");
+		LOGGER.info("Masterserver '" + MASTERSERVER_IP + "' erreichbar.");
 
 		return client;
 	}
diff --git a/dozentenmodul/src/main/java/thrift/ThriftConnection.java b/dozentenmodul/src/main/java/thrift/ThriftConnection.java
index a6fe6d53..98f4cb77 100644
--- a/dozentenmodul/src/main/java/thrift/ThriftConnection.java
+++ b/dozentenmodul/src/main/java/thrift/ThriftConnection.java
@@ -4,6 +4,7 @@ import javax.swing.JOptionPane;
 
 import models.SessionData;
 
+import org.apache.log4j.Logger;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.protocol.TProtocol;
 import org.apache.thrift.transport.TSocket;
@@ -15,6 +16,8 @@ import server.generated.Server.Client;
 
 public class ThriftConnection {
 	
+	private final static Logger LOGGER = Logger.getLogger(ThriftConnection.class);
+	
 	private String satAddress = ""+SessionData.session.getServerAdress();
 	final TTransport transport = new TSocket(satAddress, 9090);
 	
@@ -28,26 +31,25 @@ public class ThriftConnection {
 		try {
 			transport.open();
 		} catch (TTransportException e) {
-			System.out.println("Keine Verbindung möglich! Satellit="+satAddress);
+			LOGGER.error("Keine Verbindung möglich! Satellit: " + satAddress);
 			e.printStackTrace();
 			JOptionPane.showMessageDialog(null,
-					e.getCause()+"\n"+e.getMessage(),
+					"Konnte keine Verbindung zum Satellit '" + satAddress + "' aufbauen!",
 					"Debug-Message", JOptionPane.ERROR_MESSAGE);
-			//System.out.println("Keine Verbindung moeglich! Satellit=");
 			return null;
 		}
 
 		final TProtocol protocol = new TBinaryProtocol(transport);
 		
 		final Server.Client client = new Server.Client(protocol);
-		System.out.println("Verbindung zu "+satAddress+" wurde aufgebaut.");
+		LOGGER.info("Verbindung zu "+satAddress+" wurde aufgebaut.");
 		
 		return client;
 	}
 
 	public void closeThriftConnection()
 	{
-		System.out.println("Verbindung wird geplant getrennt...");
+		LOGGER.info("Verbindung wird geplant getrennt.");
 		transport.close();
 	}
 }
diff --git a/dozentenmodul/src/main/java/util/ResourceLoader.java b/dozentenmodul/src/main/java/util/ResourceLoader.java
index 06200e5a..49c54d9d 100644
--- a/dozentenmodul/src/main/java/util/ResourceLoader.java
+++ b/dozentenmodul/src/main/java/util/ResourceLoader.java
@@ -1,5 +1,7 @@
 package util;
 
+import gui.intro.Login_GUI;
+
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.Graphics2D;
@@ -10,6 +12,8 @@ import java.net.URL;
 
 import javax.swing.ImageIcon;
 
+import org.apache.log4j.Logger;
+
 /**
  * Helper class for loading resources.
  * This should be error safe loaders with a fall back in case the
@@ -18,6 +22,11 @@ import javax.swing.ImageIcon;
 public class ResourceLoader {
 
 	/**
+	 * Logger for this class
+	 */
+	private final static Logger LOGGER = Logger.getLogger(ResourceLoader.class);
+	
+	/**
 	 * Load the given resource as an ImageIcon.
 	 * This is guaranteed to never throw an Exception and always return
 	 * an ImageIcon. If the requested resource could not be loaded,
@@ -30,12 +39,12 @@ public class ResourceLoader {
 	public static ImageIcon getIcon(String path, String description) {
 		URL url = ResourceLoader.class.getResource(path);
 		if (url == null) {
-			System.out.println("Resource not found: " + path);
+			LOGGER.error("Resource not found: " + path);
 		} else {
 			try {
 				return new ImageIcon(url, description);
 			} catch (Exception e) {
-				System.out.println("Resource not loadable: " + path);
+				LOGGER.error("Resource not loadable: " + path);
 			}
 		}
 		// If we reach here loading failed, create image containing error