Author: dblevins Date: Thu May 27 20:54:36 2010 New Revision: 948986 URL: http://svn.apache.org/viewvc?rev=948986&view=rev Log: svn merge -r 946860:946861 https://svn.apache.org/repos/asf/openejb/trunk/openejb3
http://svn.apache.org/viewvc?rev=946861&view=rev ------------------------------------------------------------------------ r946861 | djencks | 2010-05-20 20:56:10 -0700 (Thu, 20 May 2010) | 1 line OPENEJB-1284 Put overriding env-entry xml by env-entries.properties under control of an option ------------------------------------------------------------------------ Modified: openejb/branches/openejb-3.1.x/ (props changed) openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java (props changed) openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml (props changed) Propchange: openejb/branches/openejb-3.1.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 27 20:54:36 2010 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1:779593 -/openejb/trunk/openejb3:943472,943862,943965,944757,945989,946792,946814 +/openejb/trunk/openejb3:943472,943862,943965,944757,945989,946792,946814,946861 Modified: openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java?rev=948986&r1=948985&r2=948986&view=diff ============================================================================== --- openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java (original) +++ openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java Thu May 27 20:54:36 2010 @@ -17,6 +17,7 @@ package org.apache.openejb.config; import org.apache.openejb.OpenEJBException; +import org.apache.openejb.loader.SystemInstance; import org.apache.openejb.util.Logger; import org.apache.openejb.util.LogCategory; import org.apache.openejb.jee.EnvEntry; @@ -100,8 +101,10 @@ public class EnvEntriesPropertiesDeploye private void apply(JndiConsumer bean, EnvEntry newEntry, String componentName) { EnvEntry entry = bean.getEnvEntryMap().get(newEntry.getName()); if (entry != null){ - log.debug("envprops.override", componentName, entry.getName(), entry.getEnvEntryValue(), newEntry.getEnvEntryValue()); - entry.setEnvEntryValue(newEntry.getEnvEntryValue()); + if (SystemInstance.get().getOptions().get("envprops.override", false)) { + log.debug("envprops.override", componentName, entry.getName(), entry.getEnvEntryValue(), newEntry.getEnvEntryValue()); + entry.setEnvEntryValue(newEntry.getEnvEntryValue()); + } return; } Propchange: openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 27 20:54:36 2010 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593 -/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:943472,943862,943965,944757,945989,946792,946814 +/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:943472,943862,943965,944757,945989,946792,946814,946861 Propchange: openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 27 20:54:36 2010 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593 -/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:943472,943862,943965,944757,945989,946792,946814 +/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:943472,943862,943965,944757,945989,946792,946814,946861
