Adds configuration
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/1e87ba3a Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1e87ba3a Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1e87ba3a Branch: refs/heads/master Commit: 1e87ba3adb1720270f9edf77d9d2bd6f6c0e0c99 Parents: 3efb124 Author: Otavio Santana <[email protected]> Authored: Tue Jul 11 08:58:12 2017 -0300 Committer: Otavio Santana <[email protected]> Committed: Tue Jul 11 08:58:12 2017 -0300 ---------------------------------------------------------------------- .../openejb/config/ActivationConfigPropertyOverride.java | 1 - .../main/java/org/apache/openejb/core/mdb/MdbContainer.java | 6 ++++++ .../java/org/apache/openejb/activemq/AMQXASupportTest.java | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/1e87ba3a/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 1a6e27c..be29a34 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,6 @@ public class ActivationConfigPropertyOverride implements DynamicDeployer { } - // now try to use special keys final Properties overrides = ConfigurationFactory.getOverrides(properties, "mdb.activation", "EnterpriseBean"); overrides.putAll(ConfigurationFactory.getOverrides(properties, mdb.getMessagingType() + ".activation", "EnterpriseBean")); http://git-wip-us.apache.org/repos/asf/tomee/blob/1e87ba3a/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 ecef1b7..7aec0a2 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 @@ -70,6 +70,7 @@ import javax.validation.ConstraintViolationException; import javax.validation.Validator; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -251,11 +252,13 @@ public class MdbContainer implements RpcContainer { objectRecipe.disallow(Option.FIELD_INJECTION); final Map<String, String> beanContextActivationProperties = beanContext.getActivationProperties(); + List<String> activations = new ArrayList<>(); final Map<String, String> activationProperties = beanContextActivationProperties; for (final Map.Entry<String, String> entry : activationProperties.entrySet()) { objectRecipe.setMethodProperty(entry.getKey(), entry.getValue()); if (entry.getKey().startsWith("activation")) { configuration.put("mdb." + entry.getKey(), entry.getValue()); + activations.add(entry.getKey()); } } objectRecipe.setMethodProperty("beanClass", beanContext.getBeanClass()); @@ -270,6 +273,9 @@ public class MdbContainer implements RpcContainer { unusedProperties.remove("destinationLookup"); unusedProperties.remove("connectionFactoryLookup"); unusedProperties.remove("beanClass"); + for (String activation : activations) { + unusedProperties.remove(activation); + } if (!unusedProperties.isEmpty()) { final String text = "No setter found for the activation spec properties: " + unusedProperties; if (failOnUnknownActivationSpec) { http://git-wip-us.apache.org/repos/asf/tomee/blob/1e87ba3a/container/openejb-core/src/test/java/org/apache/openejb/activemq/AMQXASupportTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/activemq/AMQXASupportTest.java b/container/openejb-core/src/test/java/org/apache/openejb/activemq/AMQXASupportTest.java index 4b79fb5..80fe01f 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/activemq/AMQXASupportTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/activemq/AMQXASupportTest.java @@ -130,7 +130,7 @@ public class AMQXASupportTest { @MessageDriven(activationConfig = { @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"), @ActivationConfigProperty(propertyName = "destination", propertyValue = "target"), - @ActivationConfigProperty(propertyName = "configuration", propertyValue = "aaaa") + @ActivationConfigProperty(propertyName = "activation.configuration", propertyValue = "aaaa") }) public static class Listener implements MessageListener { public static CountDownLatch latch;
