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:53:30 UTC
svn commit: r640597 -
/openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
Author: dblevins
Date: Mon Mar 24 14:53:27 2008
New Revision: 640597
URL: http://svn.apache.org/viewvc?rev=640597&view=rev
Log:
Merging r640578 - http://svn.apache.org/viewvc?rev=640578&view=rev
svn merge -r 640577:640578 https://svn.apache.org/repos/asf/openejb/trunk/openejb3 .
------------------------------------------------------------------------
r640578 | dblevins | 2008-03-24 14:05:21 -0700 (Mon, 24 Mar 2008) | 2 lines
OPENEJB-778: Application in apps dir are some times not loaded at startup
------------------------------------------------------------------------
Modified:
openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
Modified: openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java?rev=640597&r1=640596&r2=640597&view=diff
==============================================================================
--- openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java (original)
+++ openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java Mon Mar 24 14:53:27 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;
}
}