Repository: tomee Updated Branches: refs/heads/master 19256095b -> 11368bb56
not needed Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/11368bb5 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/11368bb5 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/11368bb5 Branch: refs/heads/master Commit: 11368bb560fce9d3dbafbcc49b898c8eea674c6a Parents: 1925609 Author: Romain Manni-Bucau <[email protected]> Authored: Sun May 17 22:55:14 2015 +0200 Committer: Romain Manni-Bucau <[email protected]> Committed: Sun May 17 22:55:14 2015 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/openejb/config/ReadDescriptors.java | 2 -- 1 file changed, 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/11368bb5/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java b/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java index 1d3a978..b2bd6fa 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java @@ -151,8 +151,6 @@ public class ReadDescriptors implements DynamicDeployer { final String parent = parentFile.getName(); if (parent.equalsIgnoreCase("WEB-INF") || parent.equalsIgnoreCase("META-INF")) { file = parentFile.getParentFile(); - } else if (parent.equalsIgnoreCase("lib") && "WEB-INF".equals(parentFile.getParentFile().getName())) { - file = parentFile.getParentFile().getParentFile(); } else { // we don't really know so simply go back (users will often put persistence.xml in root resource folder with arquillian) file = file.getParentFile(); }
