You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2015/05/17 23:37:23 UTC
[2/3] tomee git commit: this part is not needed
this part is not needed
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/39fe3a03
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/39fe3a03
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/39fe3a03
Branch: refs/heads/release-tomee-1.7.2
Commit: 39fe3a03620fe01b7ab17b0e256d0e0c1239658e
Parents: f95d959
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Sun May 17 22:54:38 2015 +0200
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Sun May 17 22:36:43 2015 +0100
----------------------------------------------------------------------
.../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/39fe3a03/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 5cd9f84..81ccd72 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
@@ -150,8 +150,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();
}