Author: dblevins Date: Fri Dec 7 02:26:03 2012 New Revision: 1418171 URL: http://svn.apache.org/viewvc?rev=1418171&view=rev Log: svn merge -r 1418156:1418157 https://svn.apache.org/repos/asf/openejb/trunk/openejb
http://svn.apache.org/viewvc?view=revision&revision=1418157 ------------------------------------------------------------------------ r1418157 | dblevins | 2012-12-06 17:24:23 -0800 (Thu, 06 Dec 2012) | 1 line TOMEE-633 More understandable "tomee.autoconfig" property to control auto creation of resources ------------------------------------------------------------------------ Modified: openejb/branches/openejb-4.5.1/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java Modified: openejb/branches/openejb-4.5.1/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.5.1/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=1418171&r1=1418170&r2=1418171&view=diff ============================================================================== --- openejb/branches/openejb-4.5.1/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java (original) +++ openejb/branches/openejb-4.5.1/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java Fri Dec 7 02:26:03 2012 @@ -136,7 +136,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) {
