• new package for thrift classes

4 files changed, 2 insertions, 132 deletions

diff --git a/dozentenmodulserver/src/main/java/sql/MasterThriftConnection.java b/dozentenmodulserver/src/main/java/sql/MasterThriftConnection.java
deleted file mode 100644
index 97b6c65d..00000000
--- a/dozentenmodulserver/src/main/java/sql/MasterThriftConnection.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package sql;
-
-import org.apache.log4j.Logger;
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.transport.TFramedTransport;
-import org.apache.thrift.transport.TSocket;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
-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;
-
-	final TTransport transport = new TFramedTransport(new TSocket(
-			MASTERSERVER_IP, MASTERSERVER_PORT, MASTERSERVER_TIMEOUT_MS));
-
-	public Client getMasterThriftConnection() {
-
-		try {
-			transport.open();
-		} catch (TTransportException e) {
-			LOGGER.error("Keine Verbindung möglich!");
-			return null;
-		}
-
-		final TProtocol protocol = new TBinaryProtocol(transport);
-		final Client client = new Client(protocol);
-		LOGGER.info("Masterserver '" + MASTERSERVER_IP + "' erreichbar.");
-
-		return client;
-	}
-
-	public void closeMasterThriftConnection() {
-		transport.close();
-	}
-}
- 
\ No newline at end of file
diff --git a/dozentenmodulserver/src/main/java/sql/SQL.java b/dozentenmodulserver/src/main/java/sql/SQL.java
index 94478ac6..ca15bb8b 100644
--- a/dozentenmodulserver/src/main/java/sql/SQL.java
+++ b/dozentenmodulserver/src/main/java/sql/SQL.java
@@ -30,6 +30,8 @@ import server.BinaryListener;
 import server.generated.Image;

 import server.generated.Lecture;

 import server.generated.Person;

+import thrift.MasterThriftConnection;

+import thrift.SessionData;

 

 public class SQL {

 

diff --git a/dozentenmodulserver/src/main/java/sql/SessionData.java b/dozentenmodulserver/src/main/java/sql/SessionData.java
deleted file mode 100644
index bc300854..00000000
--- a/dozentenmodulserver/src/main/java/sql/SessionData.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package sql;
-
-public class SessionData {
-	
-	private String sessionID;
-	private String authToken;
-	private String serverAdress;
-
-	public static SessionData session =new SessionData();
-	
-	public String getSessionID() {
-		return sessionID;
-	}
-	public void setSessionID(String sessionID) {
-		this.sessionID = sessionID;
-	}
-	public String getAuthToken() {
-		return authToken;
-	}
-	public void setAuthToken(String authToken) {
-		this.authToken = authToken;
-	}
-	public String getServerAdress() {
-		return serverAdress;
-	}
-	public void setServerAdress(String serverAdress) {
-		this.serverAdress = serverAdress;
-	}
-
-	
-	
-}
- 
\ No newline at end of file
diff --git a/dozentenmodulserver/src/main/java/sql/ThriftConnection.java b/dozentenmodulserver/src/main/java/sql/ThriftConnection.java
deleted file mode 100644
index 32092c2f..00000000
--- a/dozentenmodulserver/src/main/java/sql/ThriftConnection.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package sql;
-
-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;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
-
-import server.generated.Server;
-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);
-	
-	public ThriftConnection() {
-		// TODO Auto-generated constructor stub
-	}
-	
-	public Client getThriftConnection()
-	{
-		
-		try {
-			transport.open();
-		} catch (TTransportException e) {
-			LOGGER.error("Keine Verbindung möglich! Satellit: " + satAddress);
-			e.printStackTrace();
-			JOptionPane.showMessageDialog(null,
-					"Konnte keine Verbindung zum Satellit '" + satAddress + "' aufbauen!",
-					"Debug-Message", JOptionPane.ERROR_MESSAGE);
-			return null;
-		}
-
-		final TProtocol protocol = new TBinaryProtocol(transport);
-		
-		final Server.Client client = new Server.Client(protocol);
-		LOGGER.info("Verbindung zu "+satAddress+" wurde aufgebaut.");
-		
-		return client;
-	} 
-
-	public void closeThriftConnection()
-	{
-		LOGGER.info("Verbindung wird geplant getrennt.");
-		transport.close();
-	}
-}
- 
\ No newline at end of file