You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2008/03/24 22:05:22 UTC
svn commit: r640578 -
/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
Author: dblevins
Date: Mon Mar 24 14:05:21 2008
New Revision: 640578
URL: http://svn.apache.org/viewvc?rev=640578&view=rev
Log:
OPENEJB-778: Application in apps dir are some times not loaded at startup
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java?rev=640578&r1=640577&r2=640578&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java Mon Mar 24 14:05:21 2008
@@ -106,6 +106,12 @@
if (jarList.contains(file.getAbsolutePath())) continue;
jarList.add(file.getAbsolutePath());
hasNestedArchives = true;
+ } else if (new File(file, "META-INF").exists()){ // Unpacked ear or jar
+ jarList.add(file.getAbsolutePath());
+ hasNestedArchives = true;
+ } else if (new File(file, "WEB-INF").exists()){ // Unpacked webapp
+ jarList.add(file.getAbsolutePath());
+ hasNestedArchives = true;
}
}