diff options
| author | Tobias Spitzer | 2014-08-25 08:50:56 +0200 |
|---|---|---|
| committer | Tobias Spitzer | 2014-08-25 08:50:56 +0200 |
| commit | 83983b4b4d2e3ccc18b2327e17941cf00ecae7bb (patch) | |
| tree | 9a6d172b8f737a23d24dd12ea50a01bd7d3a3a12 /Dozentenmodulserver/src/server | |
| parent | Rolle für die Rechteverwaltung in SessionData Model hinzugefügt (diff) | |
| parent | Ausgaben hinzugefügt (diff) | |
| download | tutor-module-83983b4b4d2e3ccc18b2327e17941cf00ecae7bb.tar.gz tutor-module-83983b4b4d2e3ccc18b2327e17941cf00ecae7bb.tar.xz tutor-module-83983b4b4d2e3ccc18b2327e17941cf00ecae7bb.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module
Diffstat (limited to 'Dozentenmodulserver/src/server')
| -rw-r--r-- | Dozentenmodulserver/src/server/ServerHandler.java | 2 | ||||
| -rw-r--r-- | Dozentenmodulserver/src/server/startServer.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index c1ba8254..12985219 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -181,7 +181,7 @@ public class ServerHandler implements Server.Iface { new Date(), pk_institution); //OS impl Select and write - + //ACHTUNG: Anzahl der Leerzeichen muss eingehalten werden: 'Windows 7 32 bit" String pk_os=sql.getOSpk(os.substring(0, nthIndexOf(os, " ", 2)),os.substring(nthIndexOf(os," ", 2), os.lastIndexOf(" ")).replace(" ", "")); sql.setImageData(pk_person, license, internet, cpu, ram, imagename,desc, diff --git a/Dozentenmodulserver/src/server/startServer.java b/Dozentenmodulserver/src/server/startServer.java index 99189780..eb34d3a1 100644 --- a/Dozentenmodulserver/src/server/startServer.java +++ b/Dozentenmodulserver/src/server/startServer.java @@ -32,7 +32,7 @@ public class startServer { public static void main(String[] args) { String version = "Version: 1.0"; - String buildDate = "Build Date: 21.08.2014"; + String buildDate = "Build Date: 22.08.2014"; //get going and show basic information in logfile BasicConfigurator.configure(); |