[rhq] Branch 'rhq-on-as7' - modules/enterprise

mazz mazz at fedoraproject.org
Fri Aug 17 21:05:42 UTC 2012


 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/RHQConstants.java    |    4 +--
 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java |   12 +++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit e0893ae46b11c618ef537a84794ffe52ccb9c256
Author: John Mazzitelli <mazz at redhat.com>
Date:   Fri Aug 17 17:05:20 2012 -0400

    jndi names are different in AS7

diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/RHQConstants.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/RHQConstants.java
index a7d4d68..63de793 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/RHQConstants.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/RHQConstants.java
@@ -30,9 +30,9 @@ public class RHQConstants {
     public static final String EAR_NAME = "rhq";
     public static final String EAR_FILE_NAME = EAR_NAME + ".ear";
     public static final String ENTITY_MANAGER_JNDI_NAME = "java:/RHQEntityManagerFactory";
-    public static final String DATASOURCE_JNDI_NAME = "java:/RHQDS";
+    public static final String DATASOURCE_JNDI_NAME = "java:jboss/datasources/RHQDS";
     public static final String PERSISTENCE_UNIT_NAME = "rhqpu";
-    public static final String TRANSACTION_MANAGER_JNDI_NAME = "java:/TransactionManager";
+    public static final String TRANSACTION_MANAGER_JNDI_NAME = "java:jboss/TransactionManager";
 
     // JAAS settings      
     @Deprecated public static final String JAASProvider = SystemSetting.LDAP_BASED_JAAS_PROVIDER.getInternalName();
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 304ca93..d690d1d 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
@@ -258,7 +258,11 @@ public final class LookupUtil {
     public static TransactionManager getTransactionManager() {
         try {
             InitialContext context = new InitialContext();
-            TransactionManager tm = (TransactionManager) context.lookup(RHQConstants.TRANSACTION_MANAGER_JNDI_NAME);
+            String jndi = RHQConstants.TRANSACTION_MANAGER_JNDI_NAME;
+            if (embeddedDeployment) {
+                jndi = "java:/TransactionManager";
+            }
+            TransactionManager tm = (TransactionManager) context.lookup(jndi);
             context.close();
             return tm;
         } catch (Exception e) {
@@ -665,7 +669,8 @@ public final class LookupUtil {
     // Private Methods
 
     private static <T> String getLocalJNDIName(@NotNull Class<? super T> beanClass) {
-        return (embeddedDeployment ? "" : (RHQConstants.EAR_NAME + "/")) + beanClass.getSimpleName() + "/local";
+        return (embeddedDeployment ? "" : ("java:app/rhq-enterprise-server-ejb3/")) + beanClass.getSimpleName() + "!"
+            + beanClass.getName().replace("Bean", "Local");
     }
 
     /**
@@ -676,7 +681,8 @@ 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 ? "" : (RHQConstants.EAR_NAME + "/")) + beanClass.getSimpleName() + "/remote";
+        return (embeddedDeployment ? "" : ("java:app/rhq-enterprise-server-ejb3/")) + beanClass.getSimpleName() + "!"
+            + beanClass.getName().replace("Bean", "Remote");
     }
 
     @SuppressWarnings("unchecked")




More information about the rhq-commits mailing list