moves the properties
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f7e0578a Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f7e0578a Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f7e0578a Branch: refs/heads/master Commit: f7e0578aa0a97d99be24efa68ace696824b3a419 Parents: 9c14be9 Author: Otavio Santana <[email protected]> Authored: Tue Jul 11 08:30:06 2017 -0300 Committer: Otavio Santana <[email protected]> Committed: Tue Jul 11 08:42:48 2017 -0300 ---------------------------------------------------------------------- .../apache/openejb/config/ActivationConfigPropertyOverride.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/f7e0578a/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 e4674cd..1a6e27c 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 @@ -88,8 +88,6 @@ public class ActivationConfigPropertyOverride implements DynamicDeployer { } } - //get all the configurations here - Properties configuration = mdb.getConfiguration(); // now try to use special keys @@ -97,8 +95,7 @@ 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")); - +// overrides.putAll(ConfigurationFactory.getOverrides(configuration, "mdb.activation", "EnterpriseBean")); //overides any configuration there already exist // If we don't have any overrides, skip to the next
