Fixing resource paths for strict servlet compliance (this is default …

…in tomcat8)
Evolveum · Oct 28, 2014 · 62b4732 · 62b4732
1 parent 6708c81
commit 62b4732
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java
@@ -60,8 +60,8 @@ public static Map<String, DisplayableValue<String>[]> getActions() {
     public void loadData(MidPointApplication application) {
         LOGGER.info("Loading data from descriptor files.");
 
-        String baseFileName = "WEB-INF/descriptor.xml";
-        String customFileName = "WEB-INF/classes/descriptor.xml";
+        String baseFileName = "/WEB-INF/descriptor.xml";
+        String customFileName = "/WEB-INF/classes/descriptor.xml";
 
         try (InputStream baseInput = application.getServletContext().getResourceAsStream(baseFileName);
              InputStream customInput = application.getServletContext().getResourceAsStream(customFileName)) {

diff --git a/...src/main/java/com/evolveum/midpoint/model/impl/controller/SystemConfigurationHandler.java b/...src/main/java/com/evolveum/midpoint/model/impl/controller/SystemConfigurationHandler.java
@@ -62,6 +62,7 @@ public class SystemConfigurationHandler implements ChangeHook {
     @Autowired(required = true)
     @Qualifier("cacheRepositoryService")
     private transient RepositoryService cacheRepositoryService;
+
     @Autowired(required = true)
     private MidpointConfiguration startupConfiguration;