Author: dblevins
Date: Fri Apr  8 04:01:26 2011
New Revision: 1090100

URL: http://svn.apache.org/viewvc?rev=1090100&view=rev
Log:
Assume this property should be false if the EmbeddedContainer was used to boot 
the ConfigurationFactory

Modified:
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=1090100&r1=1090099&r2=1090100&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
 Fri Apr  8 04:01:26 2011
@@ -47,6 +47,7 @@ import org.apache.openejb.util.SuperProp
 import org.apache.openejb.util.URISupport;
 import org.apache.openejb.util.URLs;
 
+import javax.ejb.embeddable.EJBContainer;
 import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -352,7 +353,8 @@ public class ConfigurationFactory implem
             }
         }
 
-        if 
(SystemInstance.get().getOptions().get(DEPLOYMENTS_CLASSPATH_PROPERTY, true)) {
+        final boolean embedded = 
SystemInstance.get().hasProperty(EJBContainer.class.getName());
+        if 
(SystemInstance.get().getOptions().get(DEPLOYMENTS_CLASSPATH_PROPERTY, 
!embedded)) {
             ClassLoader classLoader = 
Thread.currentThread().getContextClassLoader();
 
             ArrayList<File> jarFiles = getModulesFromClassPath(declaredApps, 
classLoader);


Reply via email to