aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/util/DashboardProperties.java2
-rw-r--r--ccsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/util/DashboardProperties.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/util/DashboardProperties.java
index 63ace9c..d167f9c 100644
--- a/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/util/DashboardProperties.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/util/DashboardProperties.java
@@ -131,7 +131,7 @@ public class DashboardProperties {
*/
@Autowired
public void setEnvironment(final Environment environment) {
- this.environment = environment;
+ DashboardProperties.environment = environment;
}
/**
diff --git a/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java b/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
index b49add1..9c6b95e 100644
--- a/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
+++ b/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
@@ -19,6 +19,7 @@
*/
package org.onap.portalapp.conf;
+import org.onap.ccsdk.dashboard.util.DashboardProperties;
import org.onap.portalsdk.core.conf.AppInitializer;
public class ExternalAppInitializer extends AppInitializer {
@@ -34,7 +35,7 @@ public class ExternalAppInitializer extends AppInitializer {
// Show something on stdout to indicate the app is starting.
System.out.println(
"ExternalAppInitializer: servlet configuration class is " + appConfigClass.getName());
- return new Class[] {appConfigClass};
+ return new Class[] {appConfigClass, DashboardProperties.class};
}
/*