Converted DMC to maven.. (2/2) It compiles, now we have to make sure it *works*

4 files changed, 8 insertions, 7 deletions

diff --git a/.gitignore b/.gitignore
index edd3cec5..831dc3cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 .settings/
 target/
 bin/
+dependency-reduced-pom.xml
diff --git a/Dozentenmodul/src/main/java/auth/Authentification.java b/Dozentenmodul/src/main/java/auth/Authentification.java
index 41f69502..d242c01e 100644
--- a/Dozentenmodul/src/main/java/auth/Authentification.java
+++ b/Dozentenmodul/src/main/java/auth/Authentification.java
@@ -1,6 +1,6 @@
 package auth;
 
-import thrift.UserInfo;
+import org.openslx.imagemaster.thrift.iface.UserInfo;
 
 public class Authentification {
 
diff --git a/Dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/Dozentenmodul/src/main/java/gui/intro/Login_GUI.java
index 06a87307..70f4b1f2 100644
--- a/Dozentenmodul/src/main/java/gui/intro/Login_GUI.java
+++ b/Dozentenmodul/src/main/java/gui/intro/Login_GUI.java
@@ -30,10 +30,10 @@ import models.person;
 import org.apache.thrift.TException;
 import org.ini4j.Wini;
 
-import thrift.ImageServer.Client;
+import org.openslx.imagemaster.thrift.iface.ImageServer.Client;
 import thrift.MasterThriftConnection;
 import thrift.ThriftConnection;
-import thrift.UserInfo;
+import org.openslx.imagemaster.thrift.iface.UserInfo;
 import util.GuiOrganizer;
 import config.config_file;
 
@@ -110,7 +110,7 @@ public class Login_GUI extends JFrame {
 		// Aktion die beim Schliessen durchgefuehrt werden soll
 		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
-		//Größe setzen und mittig ausrichten
+		//Größe setzen und mittig ausrichten
 		setBounds(0, 0, 603, 400);
 		GuiOrganizer.centerGUI(this);
 		
@@ -195,7 +195,7 @@ public class Login_GUI extends JFrame {
 		thrift = new MasterThriftConnection();
 		client = thrift.getMasterThriftConnection();
 		token = null;
-		thrift.SessionData result = null;
+		org.openslx.imagemaster.thrift.iface.SessionData result = null;
 
 		try {
 			login = true;
@@ -293,7 +293,7 @@ public class Login_GUI extends JFrame {
 
 			}
 
-		} catch (thrift.AuthenticationException e) {
+		} catch (org.openslx.imagemaster.thrift.iface.AuthenticationException e) {
 			System.out
 					.println("Authentifizierung fehlgeschlagen: " + e.message);
 			JOptionPane
diff --git a/Dozentenmodul/src/main/java/thrift/MasterThriftConnection.java b/Dozentenmodul/src/main/java/thrift/MasterThriftConnection.java
index 11a27368..d328d7bf 100644
--- a/Dozentenmodul/src/main/java/thrift/MasterThriftConnection.java
+++ b/Dozentenmodul/src/main/java/thrift/MasterThriftConnection.java
@@ -8,7 +8,7 @@ import org.apache.thrift.transport.TSocket;
 import org.apache.thrift.transport.TTransport;
 import org.apache.thrift.transport.TTransportException;
 
-import thrift.ImageServer.Client;
+import org.openslx.imagemaster.thrift.iface.ImageServer.Client;