*/\r
package org.onap.aai.sa;\r
\r
-// import org.eclipse.jetty.util.security.Password;\r
-\r
-import org.springframework.boot.SpringApplication;\r
+import java.util.HashMap;\r
+import org.eclipse.jetty.util.security.Password;\r
import org.springframework.boot.autoconfigure.SpringBootApplication;\r
+import org.springframework.boot.builder.SpringApplicationBuilder;\r
+import org.springframework.boot.web.support.SpringBootServletInitializer;\r
\r
@SpringBootApplication\r
-public class Application {\r
+public class Application extends SpringBootServletInitializer {\r
+\r
\r
-// public static String[] deobfuscateArgs(String[] args, String ... attrnames) {\r
-//\r
-// String[] deobfuscatedArgs = args.clone();\r
-//\r
-// Password.deobfuscate("HI");\r
-//\r
-// //System.setProperty(arg0, arg1)\r
-//\r
-// return deobfuscatedArgs;\r
-// }\r
-//\r
public static void main(String[] args) {\r
- \r
- //server.ssl.key-store-password=onapSecret\r
- //server.ssl.key-password=onapSecret\r
-// args = new String[]{"-Dserver.ssl.key-store-password", "onapSecret",\r
-// "-Dserver.ssl.key-password", "onapSecret"};\r
- \r
- SpringApplication.run(Application.class, args);\r
\r
- //deobfuscateArgs(args, "server.ssl.key-store-password", "server.ssl.key-password"));\r
+ String keyStorePassword = System.getProperty("KEY_STORE_PASSWORD");\r
+ if (keyStorePassword == null || keyStorePassword.isEmpty()) {\r
+ throw new RuntimeException("Env property KEY_STORE_PASSWORD not set");\r
+ }\r
+ HashMap<String, Object> props = new HashMap<>();\r
+ props.put("server.ssl.key-store-password", Password.deobfuscate(keyStorePassword));\r
+ new Application().configure(new SpringApplicationBuilder(Application.class).properties(props)).run(args);\r
}\r
}\r