[Hyperic-hq-discuss] hq r14176 - in trunk/src/org/hyperic/hq: appdef/server/session bizapp/server/session ui/taglib

[<dcr...@hy...>]

Author: dcrutchf
Date: 2010-01-13 11:41:12 -0800 (Wed, 13 Jan 2010)
New Revision: 14176
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14176

Modified:
   trunk/src/org/hyperic/hq/appdef/server/session/AppdefStatManagerEJBImpl.java
   trunk/src/org/hyperic/hq/bizapp/server/session/AppdefBossEJBImpl.java
   trunk/src/org/hyperic/hq/ui/taglib/NavMapSupportedTag.java
Log:
[HHQ-3666] - Nav Map are not displayed inORACLE 11g environment ONLY

Modified: trunk/src/org/hyperic/hq/appdef/server/session/AppdefStatManagerEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/appdef/server/session/AppdefStatManagerEJBImpl.java	2010-01-13 19:34:47 UTC (rev 14175)
+++ trunk/src/org/hyperic/hq/appdef/server/session/AppdefStatManagerEJBImpl.java	2010-01-13 19:41:12 UTC (rev 14176)
@@ -485,33 +485,6 @@
         return grpMap;
     }
 
-    /**
-     * Method for determining whether or not to show a nav map
-     * (this is a temporary method)
-     * @ejb:interface-method
-     */
-    public boolean isNavMapSupported () { 
-        try {
-            Connection conn = getDBConn();
-            switch (DBUtil.getDBType(conn)) {
-            case DBUtil.DATABASE_ORACLE_8:
-            case DBUtil.DATABASE_ORACLE_9:
-            case DBUtil.DATABASE_ORACLE_10:
-            case DBUtil.DATABASE_POSTGRESQL_7:
-            case DBUtil.DATABASE_POSTGRESQL_8:
-            case DBUtil.DATABASE_MYSQL5:
-                return true;
-            default:
-                return false;
-            }
-        } catch (SQLException e) {
-            log.error("Unable to determine navmap capability");
-            return false;
-        } finally {
-            disconnect();
-        }
-    }
-
     /**<p>Return directly connected resource tree for node level platform</p>
      * @ejb:interface-method
      * @ejb:transaction type="Supports"

Modified: trunk/src/org/hyperic/hq/bizapp/server/session/AppdefBossEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/bizapp/server/session/AppdefBossEJBImpl.java	2010-01-13 19:34:47 UTC (rev 14175)
+++ trunk/src/org/hyperic/hq/bizapp/server/session/AppdefBossEJBImpl.java	2010-01-13 19:41:12 UTC (rev 14176)
@@ -4136,16 +4136,7 @@
 
         return ret;
     }
-    
-    /** 
-     * temporary method for determining whether or not we're running
-     *  a database that supports navmap 
-     * @ejb:interface-method
-     */
-    public boolean isNavMapSupported () {
-        return getAppdefStatManager().isNavMapSupported();    
-    }
-    
+
     /**
      * @ejb:interface-method
      */

Modified: trunk/src/org/hyperic/hq/ui/taglib/NavMapSupportedTag.java
===================================================================
--- trunk/src/org/hyperic/hq/ui/taglib/NavMapSupportedTag.java	2010-01-13 19:34:47 UTC (rev 14175)
+++ trunk/src/org/hyperic/hq/ui/taglib/NavMapSupportedTag.java	2010-01-13 19:41:12 UTC (rev 14176)
@@ -57,11 +57,11 @@
             HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
             ServletContext ctx = pageContext.getServletContext();
             AppdefBoss ab = ContextUtils.getAppdefBoss(ctx);
-
             boolean navMapSupported = true;
 
             // first try to get the resource ids as eids, then as rid / type
             AppdefEntityID[] eids = null;
+            
             try {
                 eids = RequestUtils.getEntityIds(request);
             } catch (ParameterNotFoundException e) {
@@ -89,7 +89,7 @@
                             int sessionId = RequestUtils.getSessionId(request).intValue();
                             AppdefGroupValue group =
                                 ab.findGroup(sessionId, eids[0].getId());
-
+                            
                             if ( group.isGroupAdhoc() ) {
                                 // mixed-group, not supported
                                 navMapSupported = false;
@@ -120,9 +120,7 @@
                     navMapSupported = true;
                 }
             }
-
-            // now check to see if the server supports the navigation map
-            navMapSupported = navMapSupported && ab.isNavMapSupported();
+            
             setScopedVariable( new Boolean(navMapSupported) );
         } catch (RemoteException e) {
             log.error("Couldn't interact with bizapp layer.  Assuming NavMap not supported.", e);