Adds messages by container
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/2b72bc89 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/2b72bc89 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/2b72bc89 Branch: refs/heads/master Commit: 2b72bc89d949420183329dd559c274435c2b1d06 Parents: 8ed192c Author: Otavio Santana <[email protected]> Authored: Fri Jul 7 12:57:10 2017 -0300 Committer: Otavio Santana <[email protected]> Committed: Tue Jul 11 08:42:48 2017 -0300 ---------------------------------------------------------------------- .../config/ActivationConfigPropertyOverride.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/2b72bc89/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java b/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java index 597c13b..dc0d93f 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java @@ -31,6 +31,7 @@ import org.apache.openejb.util.LogCategory; import org.apache.openejb.util.Logger; import org.apache.openejb.util.PropertyPlaceHolderHelper; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Properties; @@ -87,12 +88,23 @@ public class ActivationConfigPropertyOverride implements DynamicDeployer { } } + Map<String, String> containerConfiguration = mdb.getConfiguation(); + List<String> keysToRemove = new ArrayList<>(); + + // now try to use special keys final Properties overrides = ConfigurationFactory.getOverrides(properties, "mdb.activation", "EnterpriseBean"); overrides.putAll(ConfigurationFactory.getOverrides(properties, mdb.getMessagingType() + ".activation", "EnterpriseBean")); overrides.putAll(ConfigurationFactory.getOverrides(properties, ejbName + ".activation", "EnterpriseBean")); overrides.putAll(ConfigurationFactory.getOverrides(properties, ejbDeployment.getDeploymentId() + ".activation", "EnterpriseBean")); + for (String key : containerConfiguration.keySet()) { + String mdbKey = "mdb." + key; + if (overrides.contains(mdbKey)) { + overrides.remove(mdbKey); + overrides.put(mdbKey, containerConfiguration.get(key)); + } + } // If we don't have any overrides, skip to the next if (overrides.size() == 0) { continue;
