makes configuration as a properties
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0d1e10ed Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0d1e10ed Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0d1e10ed Branch: refs/heads/master Commit: 0d1e10edd6449688fe24e940f71098b46df9ca24 Parents: 85799f9 Author: Otavio Santana <[email protected]> Authored: Mon Jul 10 14:41:13 2017 -0300 Committer: Otavio Santana <[email protected]> Committed: Tue Jul 11 08:42:48 2017 -0300 ---------------------------------------------------------------------- .../openejb/config/ActivationConfigPropertyOverride.java | 11 +++-------- .../java/org/apache/openejb/jee/MessageDrivenBean.java | 7 ++++--- 2 files changed, 7 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/0d1e10ed/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 249bfe7..e4674cd 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 @@ -89,7 +89,7 @@ public class ActivationConfigPropertyOverride implements DynamicDeployer { } //get all the configurations here - Map<String, String> containerConfiguration = mdb.getConfiguration(); + Properties configuration = mdb.getConfiguration(); // now try to use special keys @@ -97,15 +97,10 @@ public class ActivationConfigPropertyOverride implements DynamicDeployer { 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")); + overrides.putAll(ConfigurationFactory.getOverrides(configuration, "mdb.activation", "EnterpriseBean")); //overides any configuration there already exist - 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; http://git-wip-us.apache.org/repos/asf/tomee/blob/0d1e10ed/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDrivenBean.java ---------------------------------------------------------------------- diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDrivenBean.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDrivenBean.java index db43e5d..21c6f30 100644 --- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDrivenBean.java +++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDrivenBean.java @@ -32,6 +32,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Properties; /** @@ -176,7 +177,7 @@ public class MessageDrivenBean implements EnterpriseBean, TimerConsumer, Invokab protected String id; @XmlAttribute - protected Map<String, String> configuration = new HashMap<>(); + protected Properties configuration; public MessageDrivenBean() { } @@ -643,11 +644,11 @@ public class MessageDrivenBean implements EnterpriseBean, TimerConsumer, Invokab getAroundTimeout().add(new AroundTimeout(ejbClass, method)); } - public Map<String, String> getConfiguration() { + public Properties getConfiguration() { return configuration; } - public void setConfiguration(Map<String, String> configuration) { + public void setConfiguration(Properties configuration) { this.configuration = configuration; }
