Author: dblevins
Date: Fri Dec 7 01:24:23 2012
New Revision: 1418157
URL: http://svn.apache.org/viewvc?rev=1418157&view=rev
Log:
TOMEE-633 More understandable "tomee.autoconfig" property to control auto
creation of resources
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=1418157&r1=1418156&r2=1418157&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
Fri Dec 7 01:24:23 2012
@@ -109,7 +109,13 @@ public class ConfigurationFactory implem
static final String OFFLINE_PROPERTY = "openejb.offline";
public ConfigurationFactory() {
-
this(SystemInstance.get().getOptions().get(ConfigurationFactory.OFFLINE_PROPERTY,
false));
+ this(shouldAutoDeploy());
+ }
+
+ private static boolean shouldAutoDeploy() {
+ final Options options = SystemInstance.get().getOptions();
+ final boolean b = options.get(ConfigurationFactory.OFFLINE_PROPERTY,
false);
+ return options.get("tomee.autoconfig", !b);
}
public ConfigurationFactory(final boolean offline) {
