aboutsummaryrefslogtreecommitdiff
path: root/id
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2018-02-28 14:06:05 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2018-03-13 14:16:47 +0100
commitc008807d6100660ed3219a29225bff4dc517727b (patch)
tree587bca6f4ae7841d1a68fa0cac49bb47f8444e40 /id
parent5a8fe8348198792a827f0c3b55f70712df7c5020 (diff)
downloadmoa-id-spss-c008807d6100660ed3219a29225bff4dc517727b.tar.gz
moa-id-spss-c008807d6100660ed3219a29225bff4dc517727b.tar.bz2
moa-id-spss-c008807d6100660ed3219a29225bff4dc517727b.zip
remove workaround for unofficial release
Diffstat (limited to 'id')
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java12
-rw-r--r--id/server/moa-id-spring-initializer/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthSpringInitializer.java13
2 files changed, 12 insertions, 13 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
index 1ca5bcc2c..cfb39b15c 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
@@ -139,12 +139,12 @@ public class ConfigurationProvider {
props.load(fis);
fis.close();
- //Workaround -> can be removed in next version
- if (MiscUtil.isEmpty(System.getProperty("spring.profiles.active"))) {
- log.info("Set System-Property to activate 'byteBased' config values");
- System.setProperty("spring.profiles.active", "byteBasedConfig");
-
- }
+// //Workaround -> can be removed in next version
+// if (MiscUtil.isEmpty(System.getProperty("spring.profiles.active"))) {
+// log.info("Set System-Property to activate 'byteBased' config values");
+// System.setProperty("spring.profiles.active", "byteBasedConfig");
+//
+// }
//initialize generic SpringContext to set profiles
GenericApplicationContext rootContext = new GenericApplicationContext();
diff --git a/id/server/moa-id-spring-initializer/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthSpringInitializer.java b/id/server/moa-id-spring-initializer/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthSpringInitializer.java
index 8ed654692..d8146786a 100644
--- a/id/server/moa-id-spring-initializer/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthSpringInitializer.java
+++ b/id/server/moa-id-spring-initializer/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthSpringInitializer.java
@@ -26,7 +26,6 @@ import at.gv.egiz.components.spring.api.SpringLoader;
import at.gv.egovernment.moa.id.commons.api.ConfigurationProvider;
import at.gv.egovernment.moa.id.commons.utils.MOAIDMessageProvider;
import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.util.MiscUtil;
/**
* Web application initializer
@@ -58,12 +57,12 @@ public class MOAIDAuthSpringInitializer implements WebApplicationInitializer {
@Override
public void onStartup(ServletContext servletContext) throws ServletException {
try {
- //Workaround -> can be removed in next version
- if (MiscUtil.isEmpty(System.getProperty("spring.profiles.active"))) {
- Logger.info("Set System-Property to activate 'byteBased' config values");
- System.setProperty("spring.profiles.active", "byteBasedConfig");
-
- }
+// //Workaround -> can be removed in next version
+// if (MiscUtil.isEmpty(System.getProperty("spring.profiles.active"))) {
+// Logger.info("Set System-Property to activate 'byteBased' config values");
+// System.setProperty("spring.profiles.active", "byteBasedConfig");
+//
+// }
Logger.info("=============== Loading Config Root Context! ===============");
ApplicationContext cfgRootContext =