diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2018-02-28 14:06:05 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2018-02-28 14:06:05 +0100 |
| commit | 3ebfc186aff324aa103ec96e8180894a78625fc7 (patch) | |
| tree | 409ce6642ae1a6c11fa34a594b1d4a4378a5f0fe | |
| parent | 968cccd28e486b5d41f4d652fcb4924863889ad4 (diff) | |
| download | moa-id-spss-3ebfc186aff324aa103ec96e8180894a78625fc7.tar.gz moa-id-spss-3ebfc186aff324aa103ec96e8180894a78625fc7.tar.bz2 moa-id-spss-3ebfc186aff324aa103ec96e8180894a78625fc7.zip | |
remove workaround for unofficial release
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 = |