modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java | 14 +++++----- 1 file changed, 8 insertions(+), 6 deletions(-)
New commits: commit 5f219675f666d2220f5f30b2bca00bc3b82fa719 Author: Jay Shaughnessy jshaughn@jshaughn.csb Date: Fri Sep 21 15:22:39 2012 -0400
The java:app JNDI name isn't applicable to JNDI lookups outside the app, like from our Quartz jobs. The java:global/rhq works as it provides the app namespace.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java index 183fc3e..6fb47ea 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java @@ -668,9 +668,10 @@ public final class LookupUtil {
// Private Methods
- private static <T> String getLocalJNDIName(@NotNull Class<? super T> beanClass) { - return (embeddedDeployment ? "" : ("java:app/rhq-enterprise-server-ejb3/")) + beanClass.getSimpleName() + "!" - + beanClass.getName().replace("Bean", "Local"); + private static <T> String getLocalJNDIName(@NotNull + Class<? super T> beanClass) { + return (embeddedDeployment ? "" : ("java:global/rhq/rhq-enterprise-server-ejb3/")) + beanClass.getSimpleName() + + "!" + beanClass.getName().replace("Bean", "Local"); }
/** @@ -680,9 +681,10 @@ public final class LookupUtil { * * @return JNDI name that the remote interface is registered as */ - private static <T> String getRemoteJNDIName(@NotNull Class<? super T> beanClass) { - return (embeddedDeployment ? "" : ("java:app/rhq-enterprise-server-ejb3/")) + beanClass.getSimpleName() + "!" - + beanClass.getName().replace("Bean", "Remote"); + private static <T> String getRemoteJNDIName(@NotNull + Class<? super T> beanClass) { + return (embeddedDeployment ? "" : ("java:global/rhq/rhq-enterprise-server-ejb3/")) + beanClass.getSimpleName() + + "!" + beanClass.getName().replace("Bean", "Remote"); }
@SuppressWarnings("unchecked")
rhq-commits@lists.fedorahosted.org