From 265946d452f1374d2a43c71f1403a4da7712194c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 19 Feb 2015 17:52:27 +0100
Subject: Remove client -> server dependency, move thrift classes to
 master-sync-shared

---
 .../src/main/java/server/ServerHandler.java        | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'dozentenmodulserver/src/main/java/server/ServerHandler.java')

diff --git a/dozentenmodulserver/src/main/java/server/ServerHandler.java b/dozentenmodulserver/src/main/java/server/ServerHandler.java
index 284f959c..6b97c412 100644
--- a/dozentenmodulserver/src/main/java/server/ServerHandler.java
+++ b/dozentenmodulserver/src/main/java/server/ServerHandler.java
@@ -19,22 +19,19 @@ import models.Configuration;
 import org.apache.commons.io.FileUtils;
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
-
-import server.generated.Image;
-import server.generated.Lecture;
-import server.generated.Person;
-import server.generated.Server;
-import server.generated.User;
-
 import org.openslx.imagemaster.thrift.iface.ImageServer.Client;
-import org.openslx.imagemaster.thrift.iface.InvalidTokenException;
 import org.openslx.imagemaster.thrift.iface.UserInfo;
+import org.openslx.sat.thrift.iface.Image;
+import org.openslx.sat.thrift.iface.Lecture;
+import org.openslx.sat.thrift.iface.Person;
+import org.openslx.sat.thrift.iface.User;
+import org.openslx.sat.thrift.iface.Server;
+import org.openslx.sat.thrift.version.Version;
 
+import sql.SQL;
 import thrift.MasterThriftConnection;
 //import thrift.SessionData;
 
-import sql.SQL;
-
 //import util.XMLCreator;
 
 public class ServerHandler implements Server.Iface {
@@ -1021,5 +1018,11 @@ public boolean deleteImageByPath(String image_path) throws TException{
 	}
 
 
+	@Override
+	public long getVersion() throws TException {
+		return Version.VERSION;
+	}
+
+
 
 }// end class
-- 
cgit v1.2.3-55-g7522