From 26a8af8c5b3426a278fbce988b50c6b8bbff1664 Mon Sep 17 00:00:00 2001 From: Richard Vowles Date: Fri, 3 May 2013 20:05:07 +1200 Subject: [PATCH] add support for having a WAR classpath entry in the classpath --- .../com/avaje/ebeaninternal/server/core/XmlConfigLoader.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/XmlConfigLoader.java b/src/main/java/com/avaje/ebeaninternal/server/core/XmlConfigLoader.java index 077598eb6..4f69efa59 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/XmlConfigLoader.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/XmlConfigLoader.java @@ -87,7 +87,7 @@ public class XmlConfigLoader { if (classPath.isDirectory()) { checkDir(searchFor, xmlList, classPath); - } else if (classPath.getName().endsWith(".jar") || classPath.getName().endsWith(".war")) { + } else if (classPath.getName().endsWith(".jar") || classPath.getName().endsWith(".war") || classPath.getName().endsWith(".war!/WEB-INF/classes")) { checkJar(searchFor, xmlList, classPath); } else { @@ -152,6 +152,9 @@ public class XmlConfigLoader { if (fileName.toLowerCase().startsWith("surefire")){ return; } + if (classPath.getAbsolutePath().endsWith(".war!/WEB-INF/classes")) { + classPath = new File(classPath.getAbsolutePath().substring(0, classPath.getAbsolutePath().lastIndexOf('!'))); + } JarFile module = null; try { module = new JarFile(classPath);