You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/04/20 23:42:16 UTC
tomee git commit: TOMEE-1552
openejb.activemq.deploymentId-as-clientId property
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 86f930d5d -> b4aa121b9
TOMEE-1552 openejb.activemq.deploymentId-as-clientId property
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/b4aa121b
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/b4aa121b
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/b4aa121b
Branch: refs/heads/tomee-1.7.x
Commit: b4aa121b90c6081b7f5794c592760eb77aa3beeb
Parents: 86f930d
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon Apr 20 23:42:06 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon Apr 20 23:42:06 2015 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/config/AutoConfig.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/b4aa121b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
index 740a854..40ed875 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
@@ -418,7 +418,11 @@ public class AutoConfig implements DynamicDeployer, JndiConstants {
// topics need a clientId and subscriptionName
if ("javax.jms.Topic".equals(destinationType)) {
- if (!properties.containsKey("clientId")) {
+ if (Boolean.parseBoolean(
+ SystemInstance.get().getProperty(
+ "openejb.activemq.deploymentId-as-clientId",
+ ejbModule.getProperties().getProperty("openejb.activemq.deploymentId-as-clientId", "true")))
+ && !properties.containsKey("clientId")) {
mdb.getActivationConfig().addProperty("clientId", ejbDeployment.getDeploymentId());
}
if (!properties.containsKey("subscriptionName")) {