You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/05/17 22:54:45 UTC
tomee git commit: this part is not needed
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 0da70c87d -> 166d71c6d
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/166d71c6
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/166d71c6
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/166d71c6
Branch: refs/heads/tomee-1.7.x
Commit: 166d71c6dac241cdcf37da6d2a21b6c638bfae1a
Parents: 0da70c8
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Sun May 17 22:54:38 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Sun May 17 22:54:38 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/166d71c6/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();
}