From b6ca732a94b0087ff1ea80191b79be4345ed46a7 Mon Sep 17 00:00:00 2001 From: skublik Date: Wed, 14 Nov 2018 15:12:00 +0100 Subject: [PATCH] fixing of weblogic build --- .../web/boot/MidPointSpringApplication.java | 2 +- weblogic-build/pom.xml | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java index fb9afa779c6..3275c57e7b8 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java @@ -185,7 +185,7 @@ private static SpringApplicationBuilder configureApplication(SpringApplicationBu System.setProperty(MIDPOINT_HOME_PROPERTY, mpHome); } - System.setProperty("spring.config.location", MidPointSpringApplication.class.getResource("/") + ",${midpoint.home}/"); + System.setProperty("spring.config.additional-location", "${midpoint.home}/"); application.bannerMode(Banner.Mode.LOG); diff --git a/weblogic-build/pom.xml b/weblogic-build/pom.xml index eb2370df2d4..aec8798dee4 100644 --- a/weblogic-build/pom.xml +++ b/weblogic-build/pom.xml @@ -40,8 +40,9 @@ com.evolveum.midpoint.gui admin-gui - 3.9 + 4.0-SNAPSHOT war + executable org.apache.abdera @@ -54,6 +55,17 @@ + + org.glassfish.jersey.media + jersey-media-sse + 2.27 + + + * + * + + + org.apache.abdera abdera-i18n @@ -178,6 +190,11 @@ cache-ri-impl /APP-INF/lib/ + + org.glassfish.jersey.media + jersey-media-sse + /APP-INF/lib/ +