1 files changed, 3 insertions, 47 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java
index e7eb31c3..0ac740b2 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java
@@ -7,8 +7,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.output.ByteArrayOutputStream;
@@ -16,6 +14,7 @@ import org.apache.log4j.Logger;
 import org.openslx.dozmod.App;
 import org.openslx.dozmod.Branding;
 import org.openslx.sat.thrift.version.Version;
+import org.openslx.util.AppUtil;
 import org.openslx.util.Json;
 
 public class ClientVersion {
@@ -100,51 +99,8 @@ public class ClientVersion {
 	 * into the fields 'localRevision' and 'localRevisionTime'
 	 */
 	private static void loadLocalVersion() {
-		Class<ClientVersion> clazz = ClientVersion.class;
-		String className = clazz.getSimpleName() + ".class";
-		String classPath = clazz.getResource(className).toString();
-		if (!classPath.startsWith("jar")) {
-			// Class not from JAR
-			return;
-		}
-		String manifestPath = classPath.replaceAll("![^!]*$", "") + "!/META-INF/MANIFEST.MF";
-		Manifest manifest = null;
-		try (InputStream stream = new URL(manifestPath).openStream()) {
-			manifest = new Manifest(stream);
-		} catch (Exception e) {
-			if (manifest == null) {
-				LOGGER.error("Could not open MANIFEST", e);
-				return;
-			}
-		}
-		Attributes attributes = manifest.getMainAttributes();
-		// if attr are null, then we couldn't open the jar's MANIFEST
-		// since we are probably not in a jar context, just do nothing
-		if (attributes == null)
-			return;
-		String manifestRev = null;
-		String manifestRevTime = null;
-		try {
-			manifestRev = attributes.getValue("Build-Revision");
-		} catch (Exception e) {
-			LOGGER.warn("Error while reading revision: ", e);
-		}
-		try {
-			manifestRevTime = attributes.getValue("Build-Revision-Timestamp");
-		} catch (Exception e) {
-			LOGGER.warn("Error while reading timestamp: ", e);
-		}
-		if (manifestRev != null) {
-			localRevision = manifestRev;
-		}
-		if (manifestRevTime != null) {
-			try {
-				// hax since we get milliseconds not seconds
-				localRevisionTime = Long.valueOf(manifestRevTime) / 1000L;
-			} catch (NumberFormatException e) {
-				LOGGER.warn("Build timestamp is not a number!", e);
-			}
-		}
+		localRevision = AppUtil.getRevisionVersion();
+		localRevisionTime = AppUtil.getBuildTimestamp();
 	}
 
 	/**