moves properties
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/9c14be97 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/9c14be97 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/9c14be97 Branch: refs/heads/master Commit: 9c14be978c5118469ecae558ed21e1277844af17 Parents: 0d1e10e Author: Otavio Santana <[email protected]> Authored: Tue Jul 11 08:29:15 2017 -0300 Committer: Otavio Santana <[email protected]> Committed: Tue Jul 11 08:42:48 2017 -0300 ---------------------------------------------------------------------- .../java/org/apache/openejb/core/mdb/MdbContainer.java | 11 +++++++++++ .../java/org/apache/openejb/jee/MessageDrivenBean.java | 13 ------------- 2 files changed, 11 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/9c14be97/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java index 17943a3..a6f933d 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java @@ -73,6 +73,7 @@ import java.lang.reflect.Method; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Properties; import java.util.Set; import java.util.TreeSet; import java.util.concurrent.ConcurrentHashMap; @@ -106,6 +107,8 @@ public class MdbContainer implements RpcContainer { private final XAResourceWrapper xaResourceWrapper; private final InboundRecovery inboundRecovery; + private Properties configuration; + public MdbContainer(final Object containerID, final SecurityService securityService, final ResourceAdapter resourceAdapter, final Class messageListenerInterface, final Class activationSpecClass, final int instanceLimit, final boolean failOnUnknownActivationSpec) { @@ -120,6 +123,14 @@ public class MdbContainer implements RpcContainer { inboundRecovery = SystemInstance.get().getComponent(InboundRecovery.class); } + public Properties getConfiguration() { + return configuration; + } + + public void setConfiguration(Properties configuration) { + this.configuration = configuration; + } + public BeanContext[] getBeanContexts() { return deployments.values().toArray(new BeanContext[deployments.size()]); } http://git-wip-us.apache.org/repos/asf/tomee/blob/9c14be97/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 21c6f30..57ae0e0 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 @@ -29,10 +29,8 @@ import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Properties; /** @@ -176,9 +174,6 @@ public class MessageDrivenBean implements EnterpriseBean, TimerConsumer, Invokab @XmlID protected String id; - @XmlAttribute - protected Properties configuration; - public MessageDrivenBean() { } @@ -644,14 +639,6 @@ public class MessageDrivenBean implements EnterpriseBean, TimerConsumer, Invokab getAroundTimeout().add(new AroundTimeout(ejbClass, method)); } - public Properties getConfiguration() { - return configuration; - } - - public void setConfiguration(Properties configuration) { - this.configuration = configuration; - } - @Override public String getTimerConsumerName() { return ejbName;
