[server] Refactor printing of app information from MANIFEST.MF

2 files changed, 14 insertions, 12 deletions

diff --git a/dozentenmodulserver/pom.xml b/dozentenmodulserver/pom.xml
index 15c297e9..28ad80b6 100644
--- a/dozentenmodulserver/pom.xml
+++ b/dozentenmodulserver/pom.xml
@@ -16,7 +16,6 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<main.class>org.openslx.bwlp.sat.App</main.class>
-		<maven.build.timestamp.format>yyyy.MM.dd HH:mm</maven.build.timestamp.format>
 		<dozmod.server.master.host>bwlp-masterserver.ruf.uni-freiburg.de</dozmod.server.master.host>
 		<dozmod.server.master.port>9091</dozmod.server.master.port>
 		<dozmod.server.master.ssl>true</dozmod.server.master.ssl>
@@ -124,14 +123,16 @@
 						<phase>package</phase>
 						<goals>
 							<goal>create</goal>
-							<goal>create-timestamp</goal>
 						</goals>
 					</execution>
 				</executions>
 				<configuration>
 					<doCheck>false</doCheck>
 					<doUpdate>false</doUpdate>
-					<timestampPropertyName>revision.timestamp</timestampPropertyName>
+					<timezone>UTC</timezone>
+					<timestampPropertyName>build.time</timestampPropertyName>
+					<scmBranchPropertyName>revision.branch</scmBranchPropertyName>
+					<buildNumberPropertyName>revision.version</buildNumberPropertyName>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -175,9 +176,9 @@
 							<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
 						</manifest>
 						<manifestEntries>
-							<Build-Timestamp>${maven.build.timestamp}</Build-Timestamp>
-							<Build-Revision>${buildNumber}</Build-Revision>
-							<Build-Revision-Timestamp>${revision.timestamp}</Build-Revision-Timestamp>
+							<Build-Timestamp>${build.time}</Build-Timestamp>
+							<Revision-Branch>${revision.branch}</Revision-Branch>
+							<Revision-Version>${revision.version}</Revision-Version>
 						</manifestEntries>
 					</archive>
 					<descriptorRefs>
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java
index 2023d6b8..f41fe666 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java
@@ -34,12 +34,15 @@ import org.openslx.bwlp.thrift.iface.TInvalidTokenException;
 import org.openslx.sat.thrift.version.Version;
 import org.openslx.thrifthelper.ThriftManager;
 import org.openslx.thrifthelper.ThriftManager.ErrorCallback;
+import org.openslx.util.AppUtil;
 import org.openslx.util.QuickTimer;
 
 public class App {
 
 	private static Logger LOGGER = Logger.getLogger(App.class);
 
+	private static final String NAME = "bwLehrpool-Server";
+
 	private static final Set<String> failFastMethods = new HashSet<>();
 
 	public static void main(String[] args) throws TTransportException, NoSuchAlgorithmException, IOException,
@@ -49,12 +52,10 @@ public class App {
 		if (LogManager.getRootLogger().getAllAppenders() == null) {
 			BasicConfigurator.configure();
 		}
-		
-		LOGGER.info("****************************************************************");
-		LOGGER.info("******************* Starting Application ***********************");
-		LOGGER.info("****************************************************************");
-		LOGGER.info("RPC version " + Version.VERSION);
-		LOGGER.info("Features: " + SupportedFeatures.getFeatureString());
+
+		AppUtil.logHeader(LOGGER, App.NAME, App.class.getPackage().getImplementationVersion());
+		AppUtil.logProperty(LOGGER, "rpc.version", Long.toString(Version.VERSION));
+		AppUtil.logProperty(LOGGER, "server.features", SupportedFeatures.getFeatureString());
 
 		// get Configuration
 		try {