From 3ebfc186aff324aa103ec96e8180894a78625fc7 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Wed, 28 Feb 2018 14:06:05 +0100 Subject: remove workaround for unofficial release --- .../egovernment/moa/id/auth/MOAIDAuthSpringInitializer.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'id/server/moa-id-spring-initializer') 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 = -- cgit v1.2.3