X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2FDashboardApplication.java;h=4819e345388075396e9269eef4764328331bd8fc;hb=3f812ea25d352ec33d07f5ffa4c2aa2a77e8e793;hp=15c082f9b4f8ad7c4b0ff0ca32dccca231297d35;hpb=f660cae7a447b60d84ef75f7c2bcbf62412d4579;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/DashboardApplication.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/DashboardApplication.java
index 15c082f9..4819e345 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/DashboardApplication.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/DashboardApplication.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
@@ -19,6 +19,8 @@
  */
 package org.oransc.ric.portal.dashboard;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.lang.invoke.MethodHandles;
 
 import org.slf4j.Logger;
@@ -28,29 +30,42 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication
-// Limit the annotation scan to the dashboard classes;
-// exclude the generated client classes!
+// Limit scan to dashboard classes; exclude generated API classes
 @ComponentScan("org.oransc.ric.portal.dashboard")
 public class DashboardApplication {
 
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
-	public static void main(String[] args) {
+	// Unfortunately these names are not available as constants
+	private static final String[] propertyFiles = { "ESAPI.properties", "key.properties", "portal.properties",
+			"validation.properties" };
+
+	public static void main(String[] args) throws IOException {
 		SpringApplication.run(DashboardApplication.class, args);
+		for (String pf : propertyFiles) {
+			InputStream in = MethodHandles.lookup().lookupClass().getClassLoader().getResourceAsStream(pf);
+			if (in == null)
+				logger.warn("Failed to find property file on classpath: {}", pf);
+			else
+				in.close();
+		}
 		// Force this onto the console by using level WARN
-		logger.warn("main: version '{}' successful start", getVersion());
+		logger.warn("main: version '{}' successful start",
+				getImplementationVersion(MethodHandles.lookup().lookupClass()));
 	}
 
 	/**
-	 * Gets version details.
+	 * Gets version details for the specified class.
+	 * 
+	 * @param clazz
+	 *                  Class to get the version
 	 * 
 	 * @return the value of the MANIFEST.MF property Implementation-Version as
 	 *         written by maven when packaged in a jar; 'unknown' otherwise.
 	 */
-	private static String getVersion() {
-		Class<?> clazz = MethodHandles.lookup().lookupClass();
+	public static String getImplementationVersion(Class<?> clazz) {
 		String classPath = clazz.getResource(clazz.getSimpleName() + ".class").toString();
-		return classPath.startsWith("jar") ? clazz.getPackage().getImplementationVersion() : "unknown";
+		return classPath.startsWith("jar") ? clazz.getPackage().getImplementationVersion() : "unknown-not-jar";
 	}
 
 }