Handle finding the skyve json config file by convention in war or ear

deployments.
skyvers · Nov 29, 2016 · 1fbbb57 · 1fbbb57
1 parent aab538c
commit 1fbbb57
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/skyve-web/src/org/skyve/impl/web/SkyveContextListener.java b/skyve-web/src/org/skyve/impl/web/SkyveContextListener.java
@@ -42,10 +42,17 @@ public void contextInitialized(ServletContextEvent evt) {
 		}
 		if (propertiesFilePath == null) {
 			UtilImpl.LOGGER.info("SKYVE CONTEXT REAL PATH = " + UtilImpl.SKYVE_CONTEXT_REAL_PATH);
-			File ear = new File(UtilImpl.SKYVE_CONTEXT_REAL_PATH).getParentFile();
-			String earName = ear.getName();
-			earName = earName.substring(0, earName.length() - 4);
-			propertiesFilePath = ear.getParent() + '/' + earName + ".json";
+			File archive = new File(UtilImpl.SKYVE_CONTEXT_REAL_PATH);
+			String archiveName = null;
+			if (archive.getParentFile().getName().endsWith("ear")) {
+				archive = archive.getParentFile();
+				archiveName = archive.getName();
+			} 
+			else {
+				archiveName = archive.getName();
+			}
+			archiveName = archiveName.substring(0, archiveName.length() - 4);
+			propertiesFilePath = archive.getParent() + '/' + archiveName + ".json";
 		}
 
 		Map<String, Object> properties = null;