[server] On mah way (lots of restructuring, some early db classes, sql dump of current schema)

32 files changed, 915 insertions, 353 deletions

diff --git a/dozentenmodulserver/pom.xml b/dozentenmodulserver/pom.xml
index 12a4b2ae..5e88da74 100644
--- a/dozentenmodulserver/pom.xml
+++ b/dozentenmodulserver/pom.xml
@@ -54,7 +54,7 @@
 				<configuration>
 					<archive>
 						<manifest>
-							<mainClass>server.StartServer</mainClass>
+							<mainClass>org.openslx.bwlp.sat.App</mainClass>
 						</manifest>
 					</archive>
 					<descriptorRefs>
@@ -84,7 +84,7 @@
 							<transformers>
 								<transformer
 									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-									<mainClass>server.StartServer</mainClass>
+									<mainClass>org.openslx.bwlp.sat.App</mainClass>
 								</transformer>
 							</transformers>
 						</configuration>
diff --git a/dozentenmodulserver/setup/config.properties b/dozentenmodulserver/setup/config.properties
new file mode 100644
index 00000000..dc9b5232
--- /dev/null
+++ b/dozentenmodulserver/setup/config.properties
@@ -0,0 +1,5 @@
+# This is a sample configuration!
+vmstore.path = /mnt/bigfatstorage
+db.uri = jdbc:mysql://localhost/dbname?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8&connectionCollation=utf8mb4_unicode_ci
+db.username = dbuser
+db.password = somepassword
diff --git a/dozentenmodulserver/setup/sat-01-schema.sql b/dozentenmodulserver/setup/sat-01-schema.sql
new file mode 100644
index 00000000..57e86e99
--- /dev/null
+++ b/dozentenmodulserver/setup/sat-01-schema.sql
@@ -0,0 +1,318 @@
+SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
+SET time_zone = "+00:00";
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+
+CREATE DATABASE IF NOT EXISTS `sat` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+USE `sat`;
+
+DELIMITER $$
+CREATE DEFINER=`root`@`localhost` PROCEDURE `setversionbase`(IN baseid CHAR(36) CHARACTER SET ascii)
+BEGIN

+	-- Variables

+	DECLARE l_current, l_latest VARCHAR(36) CHARACTER SET ascii;

+	DECLARE done INT DEFAULT FALSE;

+	-- Our two cursors

+	DECLARE cur_current CURSOR FOR

+		SELECT imageversionid FROM imageversion

+		WHERE imagebaseid = baseid AND isenabled = 1 AND isvalid = 1

+		ORDER BY createtime DESC LIMIT 1;

+	DECLARE cur_latest CURSOR FOR

+		SELECT imageversionid FROM imageversion

+		WHERE imagebaseid = baseid

+		ORDER BY createtime DESC LIMIT 1;

+	-- Handler

+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;

+	-- Get the current version id

+	OPEN cur_current;

+	cur_loop: LOOP

+		FETCH FROM cur_current INTO l_current;

+		LEAVE cur_loop;

+	END LOOP;

+	CLOSE cur_current;

+	-- Get the latest version id

+	OPEN cur_latest;

+	lat_loop: LOOP

+		FETCH FROM cur_latest INTO l_latest;

+		LEAVE lat_loop;

+	END LOOP;

+	CLOSE cur_latest;

+	-- Update image table

+	UPDATE imagebase SET currentversionid = l_current, latestversionid = l_latest WHERE imagebaseid = baseid LIMIT 1;

+END$$
+
+DELIMITER ;
+
+CREATE TABLE IF NOT EXISTS `imagebase` (
+  `imagebaseid` char(36) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `currentversionid` char(36) CHARACTER SET ascii COLLATE ascii_bin DEFAULT NULL COMMENT 'Reference to current version of this image. This is redundant as it can be determined from the imageversion table, but the query to get all images with their current version would be very slow then, which is not what we want, as it is fired quite often.',
+  `latestversionid` char(36) CHARACTER SET ascii COLLATE ascii_bin DEFAULT NULL,
+  `displayname` varchar(100) NOT NULL,
+  `description` text NOT NULL,
+  `osid` int(11) NOT NULL,
+  `virtid` varchar(10) NOT NULL,
+  `createtime` bigint(20) NOT NULL,
+  `updatetime` bigint(20) NOT NULL,
+  `ownerid` char(36) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `updaterid` char(36) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `sharemode` enum('LOCAL','PUBLISH','DOWNLOAD') NOT NULL,
+  `istemplate` tinyint(1) NOT NULL,
+  `canlinkdefault` tinyint(1) NOT NULL,
+  `candownloaddefault` tinyint(1) NOT NULL,
+  `caneditdefault` tinyint(1) NOT NULL,
+  `canadmindefault` tinyint(1) NOT NULL,
+  PRIMARY KEY (`imagebaseid`),
+  KEY `owner` (`ownerid`),
+  KEY `fk_imagebase_1_idx` (`osid`),
+  KEY `fk_imagebase_owner_idx` (`updaterid`),
+  KEY `fk_imagebase_1_idx1` (`virtid`),
+  KEY `currentversion_idx` (`currentversionid`),
+  KEY `latestversion_idx` (`latestversionid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `imagebase_x_tag` (
+  `imagebaseid` char(36) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `tagid` char(36) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  PRIMARY KEY (`imagebaseid`,`tagid`),
+  KEY `tag_image` (`tagid`,`imagebaseid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `imageblock` (
+  `imageversionid` char(36) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `startbyte` bigint(20) NOT NULL,
+  `blocksize` int(11) NOT NULL,
+  `blocksha1` binary(20) DEFAULT NULL,
+  `ismissing` tinyint(1) NOT NULL COMMENT 'true if this block is missing from the file, either because it was not transferred to the server yet, or because it failed an integrity check.',
+  PRIMARY KEY (`imageversionid`,`startbyte`,`blocksize`),
+  KEY `checksums` (`blocksha1`,`blocksize`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `imagepermission` (
+  `imagebaseid` char(36) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `userid` char(36) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `canlink` tinyint(1) NOT NULL,
+  `candownload` tinyint(1) NOT NULL,
+  `canedit` tinyint(1) NOT NULL,
+  `canadmin` tinyint(1) NOT NULL,
+  PRIMARY KEY (`imagebaseid`,`userid`),
+  KEY `fk_imagepermission_2_idx` (`userid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `imageversion` (
+  `imageversionid` char(36) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `imagebaseid` char(36) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `createtime` bigint(20) NOT NULL,
+  `expiretime` bigint(20) NOT NULL,
+  `filesize` bigint(20) NOT NULL,
+  `filepath` varchar(200) NOT NULL,
+  `uploaderid` char(36) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `isenabled` tinyint(1) NOT NULL,
+  `isrestricted` tinyint(1) NOT NULL,
+  `isvalid` tinyint(1) NOT NULL,
+  `isprocessed` tinyint(1) NOT NULL,
+  `mastersha1` binary(20) DEFAULT NULL,
+  `virtualizerconfig` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'Specific configuration of the virtualizer for this image. For vmware, this is basically a dump of the *.vmx.',
+  PRIMARY KEY (`imageversionid`),
+  KEY `version_access` (`imagebaseid`,`isenabled`,`isvalid`,`createtime`),
+  KEY `fk_imageversion_2_idx` (`uploaderid`),
+  KEY `expire_index` (`expiretime`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+DROP TRIGGER IF EXISTS `version_delete_post`;
+DELIMITER //
+CREATE TRIGGER `version_delete_post` AFTER DELETE ON `imageversion`
+ FOR EACH ROW BEGIN

+	CALL setversionbase(OLD.imagebaseid);

+END
+//
+DELIMITER ;
+DROP TRIGGER IF EXISTS `version_delete_pre`;
+DELIMITER //
+CREATE TRIGGER `version_delete_pre` BEFORE DELETE ON `imageversion`
+ FOR EACH ROW BEGIN

+	UPDATE imagebase SET currentversionid = NULL WHERE currentversionid = OLD.imageversionid;

+	UPDATE imagebase SET latestversionid = NULL WHERE latestversionid = OLD.imageversionid;

+END
+//
+DELIMITER ;
+DROP TRIGGER IF EXISTS `version_insert`;
+DELIMITER //
+CREATE TRIGGER `version_insert` AFTER INSERT ON `imageversion`
+ FOR EACH ROW BEGIN

+	CALL setversionbase(NEW.imagebaseid);

+END
+//
+DELIMITER ;
+DROP TRIGGER IF EXISTS `version_update`;
+DELIMITER //
+CREATE TRIGGER `version_update` AFTER UPDATE ON `imageversion`
+ FOR EACH ROW BEGIN

+	IF NEW.isenabled <> OLD.isenabled OR NEW.isvalid <> OLD.isvalid THEN

+		CALL setversionbase(NEW.imagebaseid);

+	END IF;

+END
+//
+DELIMITER ;
+
+CREATE TABLE IF NOT EXISTS `imageversion_x_software` (
+  `imageversionid` char(36) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `softwareid` int(11) NOT NULL,
+  PRIMARY KEY (`imageversionid`,`softwareid`),
+  KEY `fk_imageversion_x_software_2_idx` (`softwareid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `lecture` (
+  `lectureid` char(36) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `displayname` varchar(100) NOT NULL,
+  `description` text NOT NULL,
+  `imageversionid` char(36) CHARACTER SET ascii COLLATE ascii_bin NOT NULL COMMENT 'We reference a specific image version here, not the base image.\nOn update of an image, we update the lecture table for all matching lectures that used the current image version.\nThis way, a tutor can explicitly switch back to an older version of an image.',
+  `isenabled` tinyint(1) NOT NULL,
+  `starttime` bigint(20) NOT NULL,
+  `endtime` bigint(20) NOT NULL,
+  `lastused` bigint(20) NOT NULL DEFAULT '0',
+  `usecount` int(11) NOT NULL DEFAULT '0',
+  `createtime` bigint(20) NOT NULL,
+  `updatetime` bigint(20) NOT NULL,
+  `ownerid` char(36) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `updaterid` char(36) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `isexam` tinyint(1) NOT NULL,
+  `hasinternetaccess` tinyint(1) NOT NULL,
+  `caneditdefault` tinyint(1) NOT NULL,
+  `canadmindefault` tinyint(1) NOT NULL,
+  PRIMARY KEY (`lectureid`),
+  KEY `fk_lecture_1_idx` (`imageversionid`),
+  KEY `fk_lecture_2_idx` (`ownerid`),
+  KEY `fk_lecture_3_idx` (`updaterid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `lecturenetrule` (
+  `ruleid` int(11) NOT NULL AUTO_INCREMENT,
+  `lectureid` char(36) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `direction` enum('IN','OUT') NOT NULL,
+  `host` varchar(45) NOT NULL,
+  PRIMARY KEY (`ruleid`),
+  KEY `fk_lecturenetrule_1_idx` (`lectureid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `lecturepermission` (
+  `lectureid` char(36) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `userid` char(36) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `canedit` tinyint(1) NOT NULL,
+  `canadmin` tinyint(1) NOT NULL,
+  PRIMARY KEY (`lectureid`,`userid`),
+  KEY `fk_lecturepermission_2_idx` (`userid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `operatingsystem` (
+  `osid` int(11) NOT NULL COMMENT 'Defined on the master server, so no auto_increment!',
+  `displayname` varchar(100) NOT NULL,
+  `architecture` varchar(14) NOT NULL,
+  PRIMARY KEY (`osid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `organization` (
+  `organizationid` char(36) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `displayname` varchar(255) NOT NULL,
+  `canlogin` tinyint(1) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`organizationid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `os_x_virt` (
+  `osid` int(11) NOT NULL,
+  `virtid` varchar(10) NOT NULL,
+  `virtoskeyword` varchar(30) NOT NULL,
+  PRIMARY KEY (`osid`,`virtid`),
+  KEY `fk_os_x_virt_2_idx` (`virtid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `software` (
+  `softwareid` int(11) NOT NULL AUTO_INCREMENT COMMENT 'This ID is used internally only, this never leaves the satellite.',
+  `softwarestring` varchar(120) NOT NULL,
+  `tagid` char(36) CHARACTER SET ascii COLLATE ascii_bin DEFAULT NULL,
+  PRIMARY KEY (`softwareid`),
+  UNIQUE KEY `softwarestring_UNIQUE` (`softwarestring`),
+  KEY `index2` (`tagid`,`softwareid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `tag` (
+  `tagid` char(36) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `displayname` varchar(32) NOT NULL,
+  `isrestricting` tinyint(1) NOT NULL,
+  PRIMARY KEY (`tagid`),
+  KEY `tagindex` (`displayname`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `user` (
+  `userid` char(36) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `firstname` varchar(50) NOT NULL,
+  `lastname` varchar(50) NOT NULL,
+  `email` varchar(50) NOT NULL,
+  `organizationid` char(36) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+  `lastlogin` bigint(20) DEFAULT NULL,
+  `canlogin` tinyint(1) NOT NULL DEFAULT '0',
+  `issuperuser` tinyint(1) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`userid`),
+  KEY `fk_user_1_idx` (`organizationid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `virtualizer` (
+  `virtid` varchar(10) NOT NULL,
+  `virtname` varchar(20) NOT NULL,
+  PRIMARY KEY (`virtid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+
+ALTER TABLE `imagebase`
+  ADD CONSTRAINT `fk_imagebase_os` FOREIGN KEY (`osid`) REFERENCES `operatingsystem` (`osid`),
+  ADD CONSTRAINT `fk_imagebase_owner` FOREIGN KEY (`ownerid`) REFERENCES `user` (`userid`) ON UPDATE CASCADE,
+  ADD CONSTRAINT `fk_imagebase_updater` FOREIGN KEY (`updaterid`) REFERENCES `user` (`userid`) ON UPDATE CASCADE,
+  ADD CONSTRAINT `fk_imagebase_1` FOREIGN KEY (`virtid`) REFERENCES `virtualizer` (`virtid`) ON UPDATE CASCADE,
+  ADD CONSTRAINT `currentversion` FOREIGN KEY (`currentversionid`) REFERENCES `imageversion` (`imageversionid`) ON UPDATE CASCADE,
+  ADD CONSTRAINT `latestversion` FOREIGN KEY (`latestversionid`) REFERENCES `imageversion` (`imageversionid`) ON UPDATE CASCADE;
+
+ALTER TABLE `imagebase_x_tag`
+  ADD CONSTRAINT `fk_imagebase_x_tag_1` FOREIGN KEY (`imagebaseid`) REFERENCES `imagebase` (`imagebaseid`) ON UPDATE CASCADE,
+  ADD CONSTRAINT `fk_imagebase_x_tag_2` FOREIGN KEY (`tagid`) REFERENCES `tag` (`tagid`) ON UPDATE CASCADE;
+
+ALTER TABLE `imageblock`
+  ADD CONSTRAINT `fk_imageblocksha1_1` FOREIGN KEY (`imageversionid`) REFERENCES `imageversion` (`imageversionid`) ON UPDATE CASCADE;
+
+ALTER TABLE `imagepermission`
+  ADD CONSTRAINT `fk_imagepermission_1` FOREIGN KEY (`imagebaseid`) REFERENCES `imagebase` (`imagebaseid`) ON UPDATE CASCADE,
+  ADD CONSTRAINT `fk_imagepermission_2` FOREIGN KEY (`userid`) REFERENCES `user` (`userid`) ON UPDATE CASCADE;
+
+ALTER TABLE `imageversion`
+  ADD CONSTRAINT `fk_imageversion_base` FOREIGN KEY (`imagebaseid`) REFERENCES `imagebase` (`imagebaseid`) ON UPDATE CASCADE,
+  ADD CONSTRAINT `fk_imageversion_creator` FOREIGN KEY (`uploaderid`) REFERENCES `user` (`userid`) ON UPDATE CASCADE;
+
+ALTER TABLE `imageversion_x_software`
+  ADD CONSTRAINT `fk_imageversion_x_software_1` FOREIGN KEY (`imageversionid`) REFERENCES `imageversion` (`imageversionid`) ON UPDATE CASCADE,
+  ADD CONSTRAINT `fk_imageversion_x_software_2` FOREIGN KEY (`softwareid`) REFERENCES `software` (`softwareid`) ON UPDATE CASCADE;
+
+ALTER TABLE `lecture`
+  ADD CONSTRAINT `fk_lecture_image` FOREIGN KEY (`imageversionid`) REFERENCES `imageversion` (`imageversionid`) ON UPDATE CASCADE,
+  ADD CONSTRAINT `fk_lecture_owner` FOREIGN KEY (`ownerid`) REFERENCES `user` (`userid`) ON UPDATE CASCADE,
+  ADD CONSTRAINT `fk_lecture_updater` FOREIGN KEY (`updaterid`) REFERENCES `user` (`userid`) ON UPDATE CASCADE;
+
+ALTER TABLE `lecturenetrule`
+  ADD CONSTRAINT `fk_lecturenetrule_1` FOREIGN KEY (`lectureid`) REFERENCES `lecture` (`lectureid`) ON UPDATE CASCADE;
+
+ALTER TABLE `lecturepermission`
+  ADD CONSTRAINT `fk_lecturepermission_1` FOREIGN KEY (`lectureid`) REFERENCES `lecture` (`lectureid`) ON UPDATE CASCADE,
+  ADD CONSTRAINT `fk_lecturepermission_2` FOREIGN KEY (`userid`) REFERENCES `user` (`userid`) ON UPDATE CASCADE;
+
+ALTER TABLE `os_x_virt`
+  ADD CONSTRAINT `fk_os_x_virt_1` FOREIGN KEY (`osid`) REFERENCES `operatingsystem` (`osid`),
+  ADD CONSTRAINT `fk_os_x_virt_2` FOREIGN KEY (`virtid`) REFERENCES `virtualizer` (`virtid`);
+
+ALTER TABLE `software`
+  ADD CONSTRAINT `fk_software_1` FOREIGN KEY (`tagid`) REFERENCES `tag` (`tagid`) ON UPDATE CASCADE;
+
+ALTER TABLE `user`
+  ADD CONSTRAINT `fk_user_1` FOREIGN KEY (`organizationid`) REFERENCES `organization` (`organizationid`) ON UPDATE CASCADE;
+
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
diff --git a/dozentenmodulserver/setup/sat-01-testdata.sql b/dozentenmodulserver/setup/sat-01-testdata.sql
new file mode 100644
index 00000000..3aac5b97
--- /dev/null
+++ b/dozentenmodulserver/setup/sat-01-testdata.sql
@@ -0,0 +1,73 @@
+SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
+SET time_zone = "+00:00";
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+
+USE `sat`;
+
+INSERT INTO `operatingsystem` (`osid`, `displayname`, `architecture`) VALUES
+(1, 'WustOS', 'x86');
+
+INSERT INTO `virtualizer` (`virtid`, `virtname`) VALUES
+('vmware', 'VMware');
+
+INSERT INTO `organization` (`organizationid`, `displayname`, `canlogin`) VALUES
+('blblogin.blb-karlsruhe.de', 'Badische Landesbibliothek', 0),
+('bsz-bw.de', 'Bibliotheksservice-Zentrum Baden-Württemberg', 0),
+('demo', 'Demo-Satellit', 0),
+('dhbw-karlsruhe.de', 'DHBW Karlsruhe', 0),
+('dhbw-loerrach.de', 'DHBW Lörrach', 0),
+('dhbw-mannheim.de', 'DHBW Mannheim', 0),
+('dhbw-stuttgart.de', 'DHBW Stuttgart', 0),
+('dhbw-vs.de', 'DHBW Villingen-Schwenningen', 0),
+('fr-test.de', 'Uni Freiburg TEST', 0),
+('hft-stuttgart.de', 'Hochschule für Technik Stuttgart', 0),
+('hs-albsig.de', 'Hochschule Albstadt-Sigmaringen', 0),
+('hs-esslingen.de', 'Hochschule Esslingen', 0),
+('hs-furtwangen.de', 'Hochschule Furtwangen University', 0),
+('hs-heilbronn.de', 'Hochschule Heilbronn', 0),
+('hs-karlsruhe.de', 'Hochschule Karlsruhe - Technik und Wirtschaft', 0),
+('hs-mannheim.de', 'Hochschule Mannheim', 0),
+('hs-offenburg.de', 'Hochschule Offenburg', 0),
+('hs-rottenburg.de', 'Hochschule für Forstwirtschaft Rottenburg (HFR)', 0),
+('htw-aalen.de', 'Hochschule Aalen - Technik und Wirtschaft', 0),
+('htwg-konstanz.de', 'HTWG Konstanz', 0),
+('kit.edu', 'Karlsruher Institut für Technologie (KIT)', 0),
+('lb.ph-ludwigsburg.de', 'PH Ludwigsburg', 0),
+('ph-freiburg.de', 'PH Freiburg', 0),
+('ph-gmuend.de', 'PH Schwäbisch Gmünd', 0),
+('ph-karlsruhe.de', 'PH Karlsruhe', 0),
+('ph-weingarten.de', 'PH Weingarten', 0),
+('reutlingen-university-test.de', 'Reutlingen TEST', 0),
+('reutlingen-university.de', 'Reutlingen University / Hochschule Reutlingen', 0),
+('test-hs-offenburg.de', 'HS Offenburg test', 0),
+('test-uni-ulm.de', 'Universität Ulm Test', 0),
+('testscope.aai.dfn.de', 'DFN Test IdP 3', 0),
+('uni-freiburg.de', 'Albert-Ludwigs-Universität Freiburg', 0),
+('uni-heidelberg.de', 'Universität Heidelberg', 0),
+('uni-hohenheim.de', 'Universität Hohenheim', 0),
+('uni-konstanz.de', 'Universität Konstanz', 0),
+('uni-mannheim.de', 'Universität Mannheim', 0),
+('uni-stuttgart.de', 'Universität Stuttgart', 0),
+('uni-tuebingen.de', 'Universität Tübingen', 0),
+('uni-ulm.de', 'Universität Ulm', 0);
+
+INSERT INTO `user` (`userid`, `firstname`, `lastname`, `email`, `organizationid`, `lastlogin`, `canlogin`, `issuperuser`) VALUES
+('2f2a7203-1035-11e5-97f5-001999f89615', 'Max', 'Mustermann', 'spam@aol.com', 'fr-test.de', 1434025631, 1, 1);
+
+INSERT INTO `imagebase` (`imagebaseid`, `currentversionid`, `latestversionid`, `displayname`, `description`, `osid`, `virtid`, `createtime`, `updatetime`, `ownerid`, `updaterid`, `sharemode`, `istemplate`, `canlinkdefault`, `candownloaddefault`, `caneditdefault`, `canadmindefault`) VALUES
+('ba9e1f3a-1035-11e5-97f5-001999f89615', NULL, NULL, 'Test Image', 'Bla bla bla', 1, 'vmware', 1434025865, 1434025865, '2f2a7203-1035-11e5-97f5-001999f89615', '2f2a7203-1035-11e5-97f5-001999f89615', 'LOCAL', 0, 1, 1, 0, 0);
+
+INSERT INTO `imagepermission` (`imagebaseid`, `userid`, `canlink`, `candownload`, `canedit`, `canadmin`) VALUES
+('ba9e1f3a-1035-11e5-97f5-001999f89615', '2f2a7203-1035-11e5-97f5-001999f89615', 1, 1, 1, 1);
+
+INSERT INTO `imageversion` (`imageversionid`, `imagebaseid`, `createtime`, `expiretime`, `filesize`, `filepath`, `uploaderid`, `isenabled`, `isrestricted`, `isvalid`, `isprocessed`, `mastersha1`, `virtualizerconfig`) VALUES
+('37613571-1036-11e5-97f5-001999f89615', 'ba9e1f3a-1035-11e5-97f5-001999f89615', 1434026074, 1434026074, 1234, 'y', '2f2a7203-1035-11e5-97f5-001999f89615', 0, 1, 1, 1, NULL, NULL),
+('721ab892-103e-11e5-97f5-001999f89615', 'ba9e1f3a-1035-11e5-97f5-001999f89615', 1434029609, 1434029609, 23452345, 'a', '2f2a7203-1035-11e5-97f5-001999f89615', 0, 1, 1, 1, NULL, NULL);
+
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java
new file mode 100644
index 00000000..8aac1fcb
--- /dev/null
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java
@@ -0,0 +1,93 @@
+package org.openslx.bwlp.sat;
+
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.TimerTask;
+
+import org.apache.log4j.BasicConfigurator;
+import org.apache.log4j.Logger;
+import org.apache.thrift.transport.TTransportException;
+import org.openslx.bwlp.sat.database.Database;
+import org.openslx.bwlp.sat.database.mappers.DbImage;
+import org.openslx.bwlp.sat.fileserv.FileServer;
+import org.openslx.bwlp.sat.thrift.BinaryListener;
+import org.openslx.bwlp.sat.thrift.cache.OperatingSystemList;
+import org.openslx.bwlp.sat.thrift.cache.OrganizationList;
+import org.openslx.bwlp.sat.util.Configuration;
+import org.openslx.bwlp.sat.util.QuickTimer;
+import org.openslx.bwlp.thrift.iface.ImageSummaryRead;
+import org.openslx.bwlp.thrift.iface.UserInfo;
+
+public class App {
+
+	private static Logger log = Logger.getLogger(App.class);
+
+	private static List<Thread> servers = new ArrayList<>();
+
+	public static boolean DEBUG = false;
+
+	public static void main(String[] args) throws TTransportException, NoSuchAlgorithmException {
+		//get going and show basic information in log file
+		BasicConfigurator.configure();
+		if (args.length != 0 && args[0].equals("debug")) {
+			DEBUG = true;
+		}
+		log.info("****************************************************************");
+		log.info("******************* Starting Application ***********************");
+		log.info("****************************************************************");
+
+		// get Configuration
+		try {
+			log.info("Loading configuration");
+			Configuration.load();
+		} catch (Exception e1) {
+			log.fatal("Could not load configuration", e1);
+			System.exit(1);
+		}
+
+		// Load useful things from master server
+		OrganizationList.get();
+		//OperatingSystemList.get();
+
+		// Start file transfer server
+		if (!FileServer.instance().start()) {
+			log.error("Could not start internal file server.");
+			return;
+		}
+		// Start Server
+		Thread t;
+		t = new Thread(new BinaryListener(9090, false));
+		servers.add(t);
+		t.start();
+		// DEBUG
+		if (DEBUG) {
+			Database.printCharsetInformation();
+			List<ImageSummaryRead> allVisible = DbImage.getAllVisible(new UserInfo("bla", "blu", null, null,
+					null), null);
+			log.info("Got " + allVisible.size());
+			QuickTimer.scheduleAtFixedDelay(new TimerTask() {
+				@Override
+				public void run() {
+					Database.printDebug();
+				}
+			}, 100, 5000);
+		}
+		// Wait for servers
+		for (Thread wait : servers) {
+			boolean success = false;
+			while (!success) {
+				try {
+					wait.join();
+					success = true;
+				} catch (InterruptedException e) {
+					// Do nothing...
+				}
+			}
+		}
+		QuickTimer.cancel();
+		log.info(new Date() + " - all Servers shut down, exiting...\n");
+	}
+
+}
diff --git a/dozentenmodulserver/src/main/java/sql/SQL.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/Database.java
index af79b521..cfc6530b 100644
--- a/dozentenmodulserver/src/main/java/sql/SQL.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/Database.java
@@ -1,7 +1,8 @@
-package sql;

+package org.openslx.bwlp.sat.database;

 

 import java.sql.Connection;

 import java.sql.DriverManager;

+import java.sql.ResultSet;

 import java.sql.SQLException;

 import java.util.Collections;

 import java.util.Queue;

@@ -9,13 +10,12 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;

 import java.util.concurrent.ConcurrentLinkedQueue;

 

-import models.Configuration;

-

 import org.apache.log4j.Logger;

+import org.openslx.bwlp.sat.util.Configuration;

 

-public class SQL {

+public class Database {

 

-	private static final Logger LOGGER = Logger.getLogger(SQL.class);

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

 	/**

 	 * Pool of available connections.

 	 */

@@ -35,6 +35,13 @@ public class SQL {
 		}

 	}

 

+	/**

+	 * Get a connection to the database. If there is a valid connection in the

+	 * pool, it will be returned. Otherwise, a new connection is created. If

+	 * there are more than 20 busy connections, <code>null</code> is returned.

+	 * 

+	 * @return connection to database, or <code>null</code>

+	 */

 	public static MysqlConnection getConnection() {

 		MysqlConnection con;

 		for (;;) {

@@ -72,10 +79,42 @@ public class SQL {
 		return null;

 	}

 

+	/**

+	 * Called by a {@link MysqlConnection} when its <code>close()</code>-method

+	 * is called, so the connection will be added to the pool of available

+	 * connections again.

+	 * 

+	 * @param connection

+	 */

 	static void returnConnection(MysqlConnection connection) {

 		if (!busyConnections.remove(connection))

 			throw new RuntimeException("Tried to return a mysql connection to the pool that was not taken!");

 		pool.add(connection);

 	}

 

+	public static void printCharsetInformation() {

+		LOGGER.info("MySQL charset related variables:");

+		try (MysqlConnection connection = Database.getConnection()) {

+			MysqlStatement stmt = connection.prepareStatement("SHOW VARIABLES LIKE :what");

+			stmt.setString("what", "char%");

+			ResultSet rs = stmt.executeQuery();

+			while (rs.next()) {

+				LOGGER.info(rs.getString("Variable_name") + ": " + rs.getString("Value"));

+			}

+			stmt.setString("what", "collat%");

+			rs = stmt.executeQuery();

+			while (rs.next()) {

+				LOGGER.info(rs.getString("Variable_name") + ": " + rs.getString("Value"));

+			}

+		} catch (SQLException e) {

+			LOGGER.error("Query failed in Database.printCharsetInformation()", e);

+		}

+		LOGGER.info("End of variables");

+	}

+

+	public static void printDebug() {

+		LOGGER.info("Available: " + pool.size());

+		LOGGER.info("Busy: " + busyConnections.size());

+	}

+

 }// end class

diff --git a/dozentenmodulserver/src/main/java/sql/MysqlConnection.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/MysqlConnection.java
index dbbddfe1..24aaf1e8 100644
--- a/dozentenmodulserver/src/main/java/sql/MysqlConnection.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/MysqlConnection.java
@@ -1,4 +1,4 @@
-package sql;
+package org.openslx.bwlp.sat.database;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -26,7 +26,8 @@ public class MysqlConnection implements AutoCloseable {
 	}
 
 	public MysqlStatement prepareStatement(String sql) throws SQLException {
-		hasPendingQueries = true;
+		if (!sql.startsWith("SELECT"))
+			hasPendingQueries = true;
 		MysqlStatement statement = new MysqlStatement(rawConnection, sql);
 		openStatements.add(statement);
 		return statement;
@@ -55,12 +56,14 @@ public class MysqlConnection implements AutoCloseable {
 			} catch (SQLException e) {
 				LOGGER.warn("Rolling back uncommited queries failed!", e);
 			}
+		}
+		if (!openStatements.isEmpty()) {
 			for (MysqlStatement statement : openStatements) {
 				statement.close();
 			}
 			openStatements.clear();
 		}
-		SQL.returnConnection(this);
+		Database.returnConnection(this);
 	}
 
 	void release() {
diff --git a/dozentenmodulserver/src/main/java/sql/MysqlStatement.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/MysqlStatement.java
index efef88b0..3d5f9065 100644
--- a/dozentenmodulserver/src/main/java/sql/MysqlStatement.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/MysqlStatement.java
@@ -1,4 +1,4 @@
-package sql;
+package org.openslx.bwlp.sat.database;
 
 import java.io.Closeable;
 import java.sql.Connection;
@@ -13,9 +13,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * Class for creating {@link java.sql.PreparedStatement}s with
- * named parameters.
- * Based on
+ * Class for creating {@link PreparedStatement}s with named parameters. Based on
  * <a href=
  * "http://www.javaworld.com/article/2077706/core-java/named-parameters-for-preparedstatement.html?page=2"
  * >Named Parameters for PreparedStatement</a>
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java
new file mode 100644
index 00000000..b772edb4
--- /dev/null
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java
@@ -0,0 +1,62 @@
+package org.openslx.bwlp.sat.database.mappers;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.openslx.bwlp.sat.database.Database;
+import org.openslx.bwlp.sat.database.MysqlConnection;
+import org.openslx.bwlp.sat.database.MysqlStatement;
+import org.openslx.bwlp.thrift.iface.ImagePermissions;
+import org.openslx.bwlp.thrift.iface.ImageSummaryRead;
+import org.openslx.bwlp.thrift.iface.ShareMode;
+import org.openslx.bwlp.thrift.iface.UserInfo;
+
+public class DbImage {
+
+	private static final Logger LOGGER = Logger.getLogger(DbImage.class);
+
+	public static List<ImageSummaryRead> getAllVisible(UserInfo user, List<String> tagSearch) {
+		try (MysqlConnection connection = Database.getConnection()) {
+			MysqlStatement stmt = connection.prepareStatement("SELECT"
+					+ " i.imagebaseid, i.currentversionid, i.latestversionid, i.displayname,"
+					+ " i.osid, i.virtid, i.createtime, i.updatetime, i.ownerid,"
+					+ " i.sharemode, i.istemplate, i.canlinkdefault, i.candownloaddefault,"
+					+ " i.caneditdefault, i.canadmindefault,"
+					+ " cur.expiretime, cur.filesize, cur.isenabled, cur.isrestricted, cur.isvalid,"
+					+ " lat.uploaderid, lat.isprocessed,"
+					+ " perm.canlink, perm.candownload, perm.canedit, perm.canadmin"
+					+ " FROM imagebase i"
+					+ " LEFT JOIN imageversion cur ON (cur.imageversionid = i.currentversionid)"
+					+ " LEFT JOIN imageversion lat ON (lat.imageversionid = i.latestversionid)"
+					+ " LEFT JOIN imagepermission perm ON (i.imagebaseid = perm.imagebaseid AND perm.userid = :userid)");
+			stmt.setString("userid", user.userId);
+			ResultSet rs = stmt.executeQuery();
+			List<ImageSummaryRead> list = new ArrayList<>();
+			while (rs.next()) {
+				ImagePermissions defaultPermissions = DbImagePermissions.fromResultSetDefault(rs);
+				ImageSummaryRead entry = new ImageSummaryRead(rs.getString("imagebaseid"),
+						rs.getString("currentversionid"), rs.getString("latestversionid"),
+						rs.getString("displayname"), rs.getInt("osid"), rs.getString("virtid"),
+						rs.getLong("createtime"), rs.getLong("updatetime"), rs.getLong("expiretime"),
+						rs.getString("ownerid"), rs.getString("uploaderid"),
+						toShareMode(rs.getString("sharemode")), rs.getLong("filesize"),
+						rs.getByte("isrestricted") != 0, rs.getByte("isvalid") != 0,
+						rs.getByte("isprocessed") != 0, rs.getByte("istemplate") != 0, defaultPermissions);
+				entry.userPermissions = DbImagePermissions.fromResultSetUser(rs);
+				list.add(entry);
+			}
+			return list;
+		} catch (SQLException e) {
+			LOGGER.error("Query failed in DbImage.getAllVisible()", e);
+			return null;
+		}
+	}
+
+	private static ShareMode toShareMode(String string) {
+		return ShareMode.valueOf(string);
+	}
+
+}
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImagePermissions.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImagePermissions.java
new file mode 100644
index 00000000..e254b085
--- /dev/null
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImagePermissions.java
@@ -0,0 +1,64 @@
+package org.openslx.bwlp.sat.database.mappers;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.openslx.bwlp.thrift.iface.ImagePermissions;
+
+public class DbImagePermissions {
+
+	/**
+	 * Build an instance of {@link ImagePermissions} by reading the given
+	 * columns from the given {@link ResultSet}. If there are no permissions
+	 * given in the ResultSet, <code>null</code> is returned.
+	 * 
+	 * @param rs the {@link ResultSet} to read from
+	 * @param canLink Name of the column to read the "can link" permission from
+	 * @param canDownload Name of the column to read the "can download"
+	 *            permission from
+	 * @param canEdit Name of the column to read the "can edit" permission from
+	 * @param canAdmin Name of the column to read the "can admin" permission
+	 *            from
+	 * @return instance of {@link ImagePermissions}, or <code>null</code>
+	 * @throws SQLException
+	 */
+	private static ImagePermissions fromResultSet(ResultSet rs, String canLink, String canDownload,
+			String canEdit, String canAdmin) throws SQLException {
+		byte link = rs.getByte(canLink);
+		if (rs.wasNull())
+			return null;
+		return new ImagePermissions(link != 0, rs.getByte(canDownload) != 0, rs.getByte(canEdit) != 0,
+				rs.getByte(canAdmin) != 0);
+	}
+
+	/**
+	 * Build an instance of {@link ImagePermissions} by reading the
+	 * columns <code>canlink</code>, <code>candownload</code>,
+	 * <code>canedit</code>, <code>canadmin</code> from the given
+	 * {@link ResultSet}. If there are no permissions
+	 * given in the ResultSet, <code>null</code> is returned.
+	 * 
+	 * @param rs the {@link ResultSet} to read from
+	 * @return instance of {@link ImagePermissions}, or <code>null</code>
+	 * @throws SQLException
+	 */
+	public static ImagePermissions fromResultSetUser(ResultSet rs) throws SQLException {
+		return fromResultSet(rs, "canlink", "candownload", "canedit", "canadmin");
+	}
+
+	/**
+	 * Build an instance of {@link ImagePermissions} by reading the
+	 * columns <code>canlinkdefault</code>, <code>candownloaddefault</code>,
+	 * <code>caneditdefault</code>, <code>canadmindefault</code> from the given
+	 * {@link ResultSet}. If there are no permissions
+	 * given in the ResultSet, <code>null</code> is returned.
+	 * 
+	 * @param rs the {@link ResultSet} to read from
+	 * @return instance of {@link ImagePermissions}, or <code>null</code>
+	 * @throws SQLException
+	 */
+	public static ImagePermissions fromResultSetDefault(ResultSet rs) throws SQLException {
+		return fromResultSet(rs, "canlinkdefault", "candownloaddefault", "caneditdefault", "canadmindefault");
+	}
+
+}
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbOrganization.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbOrganization.java
new file mode 100644
index 00000000..cc401af9
--- /dev/null
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbOrganization.java
@@ -0,0 +1,34 @@
+package org.openslx.bwlp.sat.database.mappers;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.openslx.bwlp.sat.database.Database;
+import org.openslx.bwlp.sat.database.MysqlConnection;
+import org.openslx.bwlp.sat.database.MysqlStatement;
+import org.openslx.bwlp.thrift.iface.Organization;
+
+public class DbOrganization {
+
+	private static final Logger LOGGER = Logger.getLogger(DbOrganization.class);
+
+	public static boolean storeOrganizations(List<Organization> organizations) {
+		try (MysqlConnection connection = Database.getConnection()) {
+			MysqlStatement stmt = connection.prepareStatement("INSERT INTO organization"
+					+ " (organizationid, displayname, canlogin) VALUES (:id, :name, 0)"
+					+ " ON DUPLICATE KEY UPDATE displayname = VALUES(displayname)");
+			for (Organization organization : organizations) {
+				stmt.setString("id", organization.organizationId);
+				stmt.setString("name", organization.displayName);
+				stmt.executeUpdate();
+			}
+			connection.commit();
+			return true;
+		} catch (SQLException e) {
+			LOGGER.error("Query failed in DbOrganization.storeOrganization()", e);
+			return false;
+		}
+	}
+
+}
diff --git a/dozentenmodulserver/src/main/java/fileserv/ActiveUpload.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/ActiveUpload.java
index 334345f3..a2474587 100644
--- a/dozentenmodulserver/src/main/java/fileserv/ActiveUpload.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/ActiveUpload.java
@@ -1,4 +1,4 @@
-package fileserv;
+package org.openslx.bwlp.sat.fileserv;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -9,9 +9,10 @@ import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.ThreadPoolExecutor;
 
-import models.Configuration;
-
 import org.apache.log4j.Logger;
+import org.openslx.bwlp.sat.util.Configuration;
+import org.openslx.bwlp.sat.util.FileSystem;
+import org.openslx.bwlp.sat.util.Formatter;
 import org.openslx.bwlp.thrift.iface.ImageDetailsRead;
 import org.openslx.bwlp.thrift.iface.UserInfo;
 import org.openslx.filetransfer.DataReceivedCallback;
@@ -19,9 +20,6 @@ import org.openslx.filetransfer.Downloader;
 import org.openslx.filetransfer.FileRange;
 import org.openslx.filetransfer.WantRangeCallback;
 
-import util.FileSystem;
-import util.Formatter;
-
 public class ActiveUpload {
 	private static final Logger LOGGER = Logger.getLogger(ActiveUpload.class);
 
diff --git a/dozentenmodulserver/src/main/java/fileserv/ChunkList.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/ChunkList.java
index 95b3e1fa..b07193c5 100644
--- a/dozentenmodulserver/src/main/java/fileserv/ChunkList.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/ChunkList.java
@@ -1,4 +1,4 @@
-package fileserv;
+package org.openslx.bwlp.sat.fileserv;
 
 import java.nio.ByteBuffer;
 import java.util.LinkedList;
diff --git a/dozentenmodulserver/src/main/java/fileserv/FileChunk.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileChunk.java
index 1a95d27c..ffa033a5 100644
--- a/dozentenmodulserver/src/main/java/fileserv/FileChunk.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileChunk.java
@@ -1,4 +1,4 @@
-package fileserv;
+package org.openslx.bwlp.sat.fileserv;
 
 import java.nio.ByteBuffer;
 import java.util.Collection;
diff --git a/dozentenmodulserver/src/main/java/fileserv/FileServer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java
index e82fa39c..c357c292 100644
--- a/dozentenmodulserver/src/main/java/fileserv/FileServer.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java
@@ -1,4 +1,4 @@
-package fileserv;
+package org.openslx.bwlp.sat.fileserv;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -10,6 +10,8 @@ import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.openslx.bwlp.sat.util.Constants;
+import org.openslx.bwlp.sat.util.Formatter;
 import org.openslx.bwlp.thrift.iface.TTransferRejectedException;
 import org.openslx.bwlp.thrift.iface.UserInfo;
 import org.openslx.filetransfer.Downloader;
@@ -17,9 +19,6 @@ import org.openslx.filetransfer.IncomingEvent;
 import org.openslx.filetransfer.Listener;
 import org.openslx.filetransfer.Uploader;
 
-import util.Constants;
-import util.Formatter;
-
 public class FileServer implements IncomingEvent {
 
 	/**
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/BinaryListener.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/BinaryListener.java
new file mode 100644
index 00000000..70c47edb
--- /dev/null
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/BinaryListener.java
@@ -0,0 +1,65 @@
+package org.openslx.bwlp.sat.thrift;
+
+import java.security.NoSuchAlgorithmException;
+
+import org.apache.log4j.Logger;
+import org.apache.thrift.protocol.TProtocolFactory;
+import org.apache.thrift.server.THsHaServer;
+import org.apache.thrift.server.TServer;
+import org.apache.thrift.transport.TNonblockingServerSocket;
+import org.apache.thrift.transport.TNonblockingServerTransport;
+import org.apache.thrift.transport.TTransportException;
+import org.openslx.bwlp.thrift.iface.SatelliteServer;
+import org.openslx.thrifthelper.TBinaryProtocolSafe;
+
+public class BinaryListener implements Runnable {
+	private static final Logger log = Logger.getLogger(BinaryListener.class);
+
+	private static final int MAX_MSG_LEN = 30 * 1000 * 1000;
+	private static final int MINWORKERTHREADS = 2;
+	private static final int MAXWORKERTHREADS = 64;
+
+	private final SatelliteServer.Processor<ServerHandler> processor = new SatelliteServer.Processor<ServerHandler>(
+			new ServerHandler());
+	private final TProtocolFactory protFactory = new TBinaryProtocolSafe.Factory(true, true);
+
+	private final TServer server;
+
+	public BinaryListener(int port, boolean secure) throws TTransportException, NoSuchAlgorithmException {
+		if (secure)
+			server = initSecure(port);
+		else
+			server = initNormal(port);
+	}
+
+	@Override
+	public void run() {
+		log.info("Starting Listener");
+		server.serve();
+		log.fatal("Listener stopped unexpectedly");
+		// TODO: Restart listener; if it fails, quit server so it will be restarted by the OS
+	}
+
+	private TServer initSecure(int port) throws NoSuchAlgorithmException, TTransportException {
+		// TODO
+		return null;
+	}
+
+	private TServer initNormal(int port) throws TTransportException {
+		final TNonblockingServerTransport serverTransport;
+		try {
+			serverTransport = new TNonblockingServerSocket(port);
+			log.fatal("Listening on port " + port + " (plain handler)");
+		} catch (TTransportException e) {
+			log.fatal("Could not listen on port " + port + " (plain handler)");
+			throw e;
+		}
+		THsHaServer.Args args = new THsHaServer.Args(serverTransport);
+		args.protocolFactory(protFactory);
+		args.processor(processor);
+		args.workerThreads(8);
+		args.maxReadBufferBytes = MAX_MSG_LEN;
+		return new THsHaServer(args);
+	}
+
+}
diff --git a/dozentenmodulserver/src/main/java/server/ServerHandler.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
index dddec9be..cf26b510 100644
--- a/dozentenmodulserver/src/main/java/server/ServerHandler.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
@@ -1,4 +1,4 @@
-package server;
+package org.openslx.bwlp.sat.thrift;
 
 import java.nio.ByteBuffer;
 import java.util.List;
@@ -6,6 +6,10 @@ import java.util.Map;
 
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
+import org.openslx.bwlp.sat.database.mappers.DbImage;
+import org.openslx.bwlp.sat.fileserv.ActiveUpload;
+import org.openslx.bwlp.sat.fileserv.FileServer;
+import org.openslx.bwlp.sat.thrift.cache.OperatingSystemList;
 import org.openslx.bwlp.thrift.iface.ImageBaseWrite;
 import org.openslx.bwlp.thrift.iface.ImageDetailsRead;
 import org.openslx.bwlp.thrift.iface.ImagePermissions;
@@ -28,11 +32,6 @@ import org.openslx.bwlp.thrift.iface.UserInfo;
 import org.openslx.bwlp.thrift.iface.Virtualizer;
 import org.openslx.sat.thrift.version.Version;
 
-import sql.models.DbImage;
-import thrift.OperatingSystemList;
-import fileserv.ActiveUpload;
-import fileserv.FileServer;
-
 public class ServerHandler implements SatelliteServer.Iface {
 
 	private static final Logger log = Logger.getLogger(ServerHandler.class);
diff --git a/dozentenmodulserver/src/main/java/server/SessionManager.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/SessionManager.java
index 3f4d4257..bf444a20 100644
--- a/dozentenmodulserver/src/main/java/server/SessionManager.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/SessionManager.java
@@ -1,4 +1,4 @@
-package server;
+package org.openslx.bwlp.sat.thrift;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/CachedList.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/CachedList.java
new file mode 100644
index 00000000..4c986fd2
--- /dev/null
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/CachedList.java
@@ -0,0 +1,33 @@
+package org.openslx.bwlp.sat.thrift.cache;
+
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.apache.thrift.TException;
+import org.openslx.util.TimeoutReference;
+
+
+public abstract class CachedList<T> {
+
+	private static final Logger LOGGER = Logger.getLogger(CachedList.class);
+
+	private final TimeoutReference<List<T>> cachedList = new TimeoutReference<>(600000, null);
+
+	protected abstract List<T> getCallback() throws TException;
+
+	protected synchronized List<T> getInternal() {
+		List<T> list = cachedList.get();
+		if (list == null) {
+			try {
+				list = getCallback();
+			} catch (TException e) {
+				LOGGER.warn("Could not retrieve " + getClass().getSimpleName() + " list from master server",
+						e);
+				return null;
+			}
+			cachedList.set(list);
+		}
+		return list;
+	}
+
+}
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/OperatingSystemList.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/OperatingSystemList.java
new file mode 100644
index 00000000..020ae4ff
--- /dev/null
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/OperatingSystemList.java
@@ -0,0 +1,26 @@
+package org.openslx.bwlp.sat.thrift.cache;
+
+import java.util.List;
+
+import org.apache.thrift.TException;
+import org.openslx.bwlp.thrift.iface.OperatingSystem;
+import org.openslx.thrifthelper.ThriftManager;
+
+/**
+ * Holds the list of all known organizations. The list is synchronized with
+ * the master server.
+ */
+public class OperatingSystemList extends CachedList<OperatingSystem> {
+
+	private static final OperatingSystemList instance = new OperatingSystemList();
+
+	public static List<OperatingSystem> get() {
+		return instance.getInternal();
+	}
+
+	@Override
+	protected List<OperatingSystem> getCallback() throws TException {
+		return ThriftManager.getMasterClient().getOperatingSystems();
+	}
+
+}
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/OrganizationList.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/OrganizationList.java
new file mode 100644
index 00000000..8db7e7e5
--- /dev/null
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/OrganizationList.java
@@ -0,0 +1,29 @@
+package org.openslx.bwlp.sat.thrift.cache;
+
+import java.util.List;
+
+import org.apache.thrift.TException;
+import org.openslx.bwlp.sat.database.mappers.DbOrganization;
+import org.openslx.bwlp.thrift.iface.Organization;
+import org.openslx.thrifthelper.ThriftManager;
+
+/**
+ * Holds the list of all known organizations. The list is synchronized with
+ * the master server.
+ */
+public class OrganizationList extends CachedList<Organization> {
+
+	private static final OrganizationList instance = new OrganizationList();
+
+	public static List<Organization> get() {
+		return instance.getInternal();
+	}
+
+	@Override
+	protected List<Organization> getCallback() throws TException {
+		List<Organization> organizations = ThriftManager.getMasterClient().getOrganizations();
+		DbOrganization.storeOrganizations(organizations);
+		return organizations;
+	}
+
+}
diff --git a/dozentenmodulserver/src/main/java/models/Configuration.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Configuration.java
index 244e542b..07cd3a8d 100644
--- a/dozentenmodulserver/src/main/java/models/Configuration.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Configuration.java
@@ -1,4 +1,4 @@
-package models;
+package org.openslx.bwlp.sat.util;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/dozentenmodulserver/src/main/java/util/Constants.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Constants.java
index 8ac5dabd..6c2dc31b 100644
--- a/dozentenmodulserver/src/main/java/util/Constants.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Constants.java
@@ -1,6 +1,6 @@
-package util;
+package org.openslx.bwlp.sat.util;
 
-import fileserv.FileChunk;
+import org.openslx.bwlp.sat.fileserv.FileChunk;
 
 public class Constants {
 	public static final String INCOMPLETE_UPLOAD_SUFFIX = ".part";
diff --git a/dozentenmodulserver/src/main/java/util/FileSystem.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/FileSystem.java
index 5f5a1e08..38841cd9 100644
--- a/dozentenmodulserver/src/main/java/util/FileSystem.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/FileSystem.java
@@ -1,4 +1,4 @@
-package util;
+package org.openslx.bwlp.sat.util;
 
 import java.io.File;
 
diff --git a/dozentenmodulserver/src/main/java/util/Formatter.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Formatter.java
index 2f6fbae2..0839ad24 100644
--- a/dozentenmodulserver/src/main/java/util/Formatter.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Formatter.java
@@ -1,10 +1,8 @@
-package util;
+package org.openslx.bwlp.sat.util;
 
 import java.io.File;
 import java.util.UUID;
 
-import models.Configuration;
-
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.openslx.bwlp.thrift.iface.UserInfo;
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/QuickTimer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/QuickTimer.java
new file mode 100644
index 00000000..7a317ff7
--- /dev/null
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/QuickTimer.java
@@ -0,0 +1,38 @@
+package org.openslx.bwlp.sat.util;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+/**
+ * This is a global, static {@link Timer} you can use anywhere for repeating
+ * tasks that will <b>not take a significant amount of time to execute</b>. This
+ * means they should not run any complex data base queries (better yet, none at
+ * all) or do heavy file I/O, etc..
+ * The main reason for this class is to prevent having {@link Timer} threads
+ * everywhere in the server for trivial tasks.
+ */
+public class QuickTimer {
+
+	private static final Timer timer = new Timer("QuickTimer");
+
+	public static void scheduleAtFixedDelay(TimerTask task, long delay, long period) {
+		timer.schedule(task, delay, period);
+	}
+
+	public static void scheduleAtFixedRate(TimerTask task, long delay, long period) {
+		timer.scheduleAtFixedRate(task, delay, period);
+	}
+
+	public static void scheduleOnce(TimerTask task, long delay) {
+		timer.schedule(task, delay);
+	}
+
+	/**
+	 * Cancel this timer. Should only be called when the server is shutting
+	 * down.
+	 */
+	public static void cancel() {
+		timer.cancel();
+	}
+
+}
diff --git a/dozentenmodulserver/src/main/java/util/Util.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Util.java
index 28f522b8..338ed325 100644
--- a/dozentenmodulserver/src/main/java/util/Util.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Util.java
@@ -1,4 +1,4 @@
-package util;
+package org.openslx.bwlp.sat.util;
 
 import java.io.Closeable;
 
diff --git a/dozentenmodulserver/src/main/java/server/BinaryListener.java b/dozentenmodulserver/src/main/java/server/BinaryListener.java
deleted file mode 100644
index 92954322..00000000
--- a/dozentenmodulserver/src/main/java/server/BinaryListener.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package server;
-
-import java.util.Date;
-
-import org.apache.log4j.Logger;
-import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.server.TServer;
-import org.apache.thrift.server.TThreadPoolServer;
-import org.apache.thrift.server.TThreadPoolServer.Args;
-import org.apache.thrift.transport.TServerSocket;
-import org.apache.thrift.transport.TServerTransport;
-import org.apache.thrift.transport.TTransportException;
-import org.openslx.bwlp.thrift.iface.SatelliteServer;
-
-public class BinaryListener implements Runnable {
-	private static Logger log = Logger.getLogger(BinaryListener.class);
-
-	private final int MINWORKERTHREADS = 20; // keine ahnung ob das passt...
-	private final int MAXWORKERTHREADS = 80; // ebenso
-
-	@Override
-	public void run() {
-		final ServerHandler handler = new ServerHandler();
-		final SatelliteServer.Processor<ServerHandler> processor = new SatelliteServer.Processor<ServerHandler>(
-				handler);
-		final TServerTransport transport;
-		final TProtocolFactory protFactory = new TBinaryProtocolSafe.Factory(
-				true, true);
-		try {
-			transport = new TServerSocket(9090);
-			log.info(new Date() + " - Listening on Port 9090");
-
-		} catch (TTransportException e) {
-			log.fatal(new Date() + " - Could not listen on port 9090");
-			return;
-		}
-		TServer server = new TThreadPoolServer(new Args(transport)
-				.protocolFactory(protFactory).processor(processor)
-				.minWorkerThreads(MINWORKERTHREADS)
-				.maxWorkerThreads(MAXWORKERTHREADS));
-
-		log.info(new Date() + " - Started running BinaryListener");
-		log.info(new Date() + " - MINWORKERTHREADS=" + MINWORKERTHREADS
-				+ " and MAXWORKERTHREADS=" + MAXWORKERTHREADS + "\n");
-		server.serve();
-
-	}
-
-}
diff --git a/dozentenmodulserver/src/main/java/server/StartServer.java b/dozentenmodulserver/src/main/java/server/StartServer.java
deleted file mode 100644
index a5631622..00000000
--- a/dozentenmodulserver/src/main/java/server/StartServer.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package server;
-
-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 fileserv.FileServer;
-
-public class StartServer {
-
-	private static Logger log = Logger.getLogger(StartServer.class);
-
-	private static List<Thread> servers = new ArrayList<>();
-
-	public static void main(String[] args) {
-
-		//get going and show basic information in logfile
-		BasicConfigurator.configure();
-		log.info("****************************************************************");
-		log.info("******************* starting Application ***********************");
-		log.info("****************************************************************");
-
-		// get Configuration
-		try {
-			log.info("Loading configuration");
-			Configuration.load();
-		} catch (Exception e1) {
-			log.fatal("Could not load configuration", e1);
-			System.exit(1);
-		}
-
-		// Start file transfer server
-		if (!FileServer.instance().start()) {
-			log.error("Could not start internal file server.");
-			return;
-		}
-		// Start Server
-		Thread t;
-		t = new Thread(new BinaryListener());
-		servers.add(t);
-		t.start();
-		// Wait for servers
-		for (Thread wait : servers) {
-			boolean success = false;
-			while (!success) {
-				try {
-					wait.join();
-					success = true;
-				} catch (InterruptedException e) {
-					// Do nothing...
-				}
-			}
-		}
-		log.info(new Date() + " - all Servers shut down, exiting...\n");
-	}
-
-}
diff --git a/dozentenmodulserver/src/main/java/server/TBinaryProtocolSafe.java b/dozentenmodulserver/src/main/java/server/TBinaryProtocolSafe.java
deleted file mode 100644
index 843b58b1..00000000
--- a/dozentenmodulserver/src/main/java/server/TBinaryProtocolSafe.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package server;
-
-import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
-
-import org.apache.thrift.TException;
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TMessage;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.transport.TTransport;
-
-/**
- * Binary protocol implementation for thrift.
- * Will not read messages bigger than 12MiB.
- * 
- */
-public class TBinaryProtocolSafe extends TBinaryProtocol
-{
-	/**
-	 * Factory
-	 */
-	@SuppressWarnings( "serial" )
-	public static class Factory implements TProtocolFactory
-	{
-
-		protected boolean strictRead_ = false;
-		protected boolean strictWrite_ = true;
-
-		public Factory()
-		{
-			this( false, true );
-		}
-
-		public Factory(boolean strictRead, boolean strictWrite)
-		{
-			strictRead_ = strictRead;
-			strictWrite_ = strictWrite;
-		}
-
-		public TProtocol getProtocol( TTransport trans )
-		{
-			return new TBinaryProtocolSafe( trans, strictRead_, strictWrite_ );
-		}
-	}
-
-	private static final int maxLen = 12 * 1024 * 1024; // 12 MiB
-
-	/**
-	 * Constructor
-	 */
-	public TBinaryProtocolSafe(TTransport trans)
-	{
-		this( trans, false, true );
-	}
-
-	public TBinaryProtocolSafe(TTransport trans, boolean strictRead, boolean strictWrite)
-	{
-		super( trans );
-		strictRead_ = strictRead;
-		strictWrite_ = strictWrite;
-	}
-
-	/**
-	 * Reading methods.
-	 */
-
-	public TMessage readMessageBegin() throws TException
-	{
-		int size = readI32();
-		if ( size > maxLen )
-			throw new TProtocolException( TProtocolException.SIZE_LIMIT, "Payload too big." );
-		if ( size < 0 ) {
-			int version = size & VERSION_MASK;
-			if ( version != VERSION_1 ) {
-				throw new TProtocolException( TProtocolException.BAD_VERSION, "Bad version in readMessageBegin" );
-			}
-			return new TMessage( readString(), (byte) ( size & 0x000000ff ), readI32() );
-		} else {
-			if ( strictRead_ ) {
-				throw new TProtocolException( TProtocolException.BAD_VERSION, "Missing version in readMessageBegin, old client?" );
-			}
-			return new TMessage( readStringBody( size ), readByte(), readI32() );
-		}
-	}
-
-	public String readString() throws TException
-	{
-		int size = readI32();
-		if ( size > maxLen )
-			throw new TProtocolException( TProtocolException.SIZE_LIMIT, "Payload too big." );
-		if ( trans_.getBytesRemainingInBuffer() >= size ) {
-			try {
-				String s = new String( trans_.getBuffer(), trans_.getBufferPosition(), size, "UTF-8" );
-				trans_.consumeBuffer( size );
-				return s;
-			} catch ( UnsupportedEncodingException e ) {
-				throw new TException( "JVM DOES NOT SUPPORT UTF-8" );
-			}
-		}
-
-		return readStringBody( size );
-	}
-
-	public ByteBuffer readBinary() throws TException
-	{
-		int size = readI32();
-		if ( size > maxLen )
-			throw new TProtocolException( TProtocolException.SIZE_LIMIT, "Payload too big." );
-		if ( trans_.getBytesRemainingInBuffer() >= size ) {
-			ByteBuffer bb = ByteBuffer.wrap( trans_.getBuffer(), trans_.getBufferPosition(), size );
-			trans_.consumeBuffer( size );
-			return bb;
-		}
-
-		byte[] buf = new byte[ size ];
-		trans_.readAll( buf, 0, size );
-		return ByteBuffer.wrap( buf );
-	}
-
-}
-
diff --git a/dozentenmodulserver/src/main/java/sql/models/DbImage.java b/dozentenmodulserver/src/main/java/sql/models/DbImage.java
deleted file mode 100644
index fe59dac8..00000000
--- a/dozentenmodulserver/src/main/java/sql/models/DbImage.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package sql.models;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-import org.openslx.bwlp.thrift.iface.ImageSummaryRead;
-import org.openslx.bwlp.thrift.iface.UserInfo;
-
-import sql.MysqlConnection;
-import sql.MysqlStatement;
-import sql.SQL;
-
-public class DbImage {
-
-	private static final Logger LOGGER = Logger.getLogger(DbImage.class);
-
-	public static List<ImageSummaryRead> getAllVisible(UserInfo user, List<String> tagSearch) {
-		try (MysqlConnection connection = SQL.getConnection()) {
-			MysqlStatement stmt = connection.prepareStatement("SELECT"
-					+ " i.imagebaseid, i.currentversionid, i.latestversionid, i.displayname,"
-					+ " i.osid, i.virtid, i.createtime, i.updatetime, i.ownerid, i.uploaderid,"
-					+ " i.sharemode, i.istemplate, i.canlinkdefault, i.candownloaddefault,"
-					+ " i.caneditdefault, i.canadmindefault,"
-					+ " cur.filesize, cur.isenabled, cur.isrestricted, cur.isvalid," + " lat.isprocessed"
-					+ " FROM imagebase i"
-					+ " LEFT JOIN imageversion cur ON (cur.imageversionid = i.currentversionid)"
-					+ " LEFT JOIN imageversion lat ON (lat.imageversionid = i.latestversionid)");
-			ResultSet rs = stmt.executeQuery();
-			while (rs.next()) {
-				ImageSummaryRead entry = new ImageSummaryRead();
-			}
-			return null;
-		} catch (SQLException e) {
-			LOGGER.error("Query failed in DbImage.getAllVisible()", e);
-			return null;
-		}
-	}
-
-}
diff --git a/dozentenmodulserver/src/main/java/thrift/OperatingSystemList.java b/dozentenmodulserver/src/main/java/thrift/OperatingSystemList.java
deleted file mode 100644
index 6d5404f7..00000000
--- a/dozentenmodulserver/src/main/java/thrift/OperatingSystemList.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package thrift;
-
-import java.util.List;
-
-import org.apache.log4j.Logger;
-import org.apache.thrift.TException;
-import org.openslx.bwlp.thrift.iface.OperatingSystem;
-import org.openslx.thrifthelper.ThriftManager;
-import org.openslx.util.TimeoutReference;
-
-/**
- * Holds the list of all known operating systems. The list is synchronized with
- * the master server.
- */
-public class OperatingSystemList {
-
-	private static final Logger LOGGER = Logger.getLogger(OperatingSystemList.class);
-
-	private static final TimeoutReference<List<OperatingSystem>> cachedList = new TimeoutReference<List<OperatingSystem>>(
-			600000, null);
-
-	public static synchronized List<OperatingSystem> get() {
-		List<OperatingSystem> list = cachedList.get();
-		if (list == null) {
-			try {
-				list = ThriftManager.getMasterClient().getOperatingSystems();
-				// TODO: Write to DB
-			} catch (TException e) {
-				LOGGER.warn("Could not retrieve OS list from master server", e);
-				return null;
-			}
-			cachedList.set(list);
-		}
-		return list;
-	}
-
-}