geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jinmeil...@apache.org
Subject [1/2] geode git commit: GEODE-1114: RemoveGemfireXD references from Pulse
Date Thu, 12 Jan 2017 22:58:22 GMT
Repository: geode
Updated Branches:
  refs/heads/develop a5e24a7c1 -> 9081128bb


GEODE-1114: RemoveGemfireXD references from Pulse


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/239a8767
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/239a8767
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/239a8767

Branch: refs/heads/develop
Commit: 239a87677cda24984f6bfe09ab2595b49845b54f
Parents: a5e24a7
Author: Jared Stewart <jstewart@pivotal.io>
Authored: Thu Jan 5 14:44:58 2017 -0800
Committer: Jinmei Liao <jiliao@pivotal.io>
Committed: Thu Jan 12 14:56:28 2017 -0800

----------------------------------------------------------------------
 .../tools/pulse/internal/PulseAppListener.java  |  15 --
 .../internal/controllers/PulseController.java   |  14 --
 .../pulse/internal/data/JMXDataUpdater.java     | 168 +------------------
 .../internal/service/ClusterMemberService.java  |   8 +-
 .../internal/service/ClusterRegionService.java  |  10 +-
 .../internal/service/ClusterRegionsService.java |  13 +-
 .../service/ClusterSelectedRegionService.java   |  18 +-
 .../internal/service/MemberDetailsService.java  |   7 +-
 .../internal/service/MemberRegionsService.java  |   9 +-
 .../src/main/webapp/WEB-INF/spring-security.xml |   1 -
 .../webapp/scripts/pulsescript/MemberDetails.js |  27 +--
 .../webapp/scripts/pulsescript/clusterDetail.js |  46 +----
 .../main/webapp/scripts/pulsescript/common.js   |   5 +-
 .../scripts/pulsescript/pages/DataBrowser.js    |  16 +-
 .../webapp/scripts/pulsescript/pages/Login.js   |  24 ---
 .../scripts/pulsescript/queryStatistics.js      |   7 +-
 .../webapp/scripts/pulsescript/regionView.js    |  11 +-
 .../controllers/PulseControllerJUnitTest.java   |   9 +-
 .../pulse/tests/ui/PulseAutomatedTest.java      |   6 +-
 19 files changed, 44 insertions(+), 370 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/239a8767/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/PulseAppListener.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/PulseAppListener.java
b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/PulseAppListener.java
index 8740288..5408a56 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/PulseAppListener.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/PulseAppListener.java
@@ -114,12 +114,6 @@ public class PulseAppListener implements ServletContextListener {
       // in present deployment
       String pulseProduct =
           pulseProperties.getProperty(PulseConstants.APPLICATION_PROPERTY_PULSE_PRODUCTSUPPORT);
-      // default is gemfire
-
-      if ((pulseProduct != null)
-          && (pulseProduct.trim().equalsIgnoreCase(PulseConstants.PRODUCT_NAME_SQLFIRE)))
{
-        PulseController.setPulseProductSupport(PulseConstants.PRODUCT_NAME_SQLFIRE);
-      }
     }
 
     pulseSecurityProperties = loadProperties(PulseConstants.PULSE_SECURITY_PROPERTIES_FILE);
@@ -164,15 +158,6 @@ public class PulseAppListener implements ServletContextListener {
       }
       sysPulsePort = PulseConstants.GEMFIRE_DEFAULT_PORT;
 
-      boolean pulseEmbededSqlf =
-          Boolean.getBoolean(PulseConstants.SYSTEM_PROPERTY_PULSE_EMBEDDED_SQLF);
-      if (pulseEmbededSqlf) {
-        PulseController.setPulseProductSupport(PulseConstants.PRODUCT_NAME_SQLFIRE);
-        if (LOGGER.infoEnabled()) {
-          LOGGER.info(resourceBundle.getString("LOG_MSG_APP_RUNNING_EMBEDDED_SQLF_MODE"));
-        }
-      }
-
     } else {
       // Application Pulse is running in Non-Embedded Mode
       if (LOGGER.infoEnabled()) {

http://git-wip-us.apache.org/repos/asf/geode/blob/239a8767/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java
b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java
index 4bf107f..1fd2361 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java
@@ -501,18 +501,4 @@ public class PulseController {
       }
     }
   }
-
-  /**
-   * @return the pulseProductSupport
-   */
-  public static String getPulseProductSupport() {
-    return pulseProductSupport;
-  }
-
-  /**
-   * @param pulseProductSupport the pulseProductSupport to set
-   */
-  public static void setPulseProductSupport(String pulseProductSupport) {
-    PulseController.pulseProductSupport = pulseProductSupport;
-  }
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/239a8767/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java
b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java
index 5b9e446..5c30501 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java
@@ -120,13 +120,6 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener
{
       this.MBEAN_OBJECT_NAME_STATEMENT_DISTRIBUTED =
           new ObjectName(PulseConstants.OBJECT_NAME_STATEMENT_DISTRIBUTED);
 
-      // For SQLFire
-      if (PulseConstants.PRODUCT_NAME_SQLFIRE
-          .equalsIgnoreCase(PulseController.getPulseProductSupport())) {
-        this.MBEAN_OBJECT_NAME_TABLE_AGGREGATE =
-            new ObjectName(PulseConstants.OBJECT_NAME_TABLE_AGGREGATE);
-      }
-
     } catch (MalformedObjectNameException e) {
       if (LOGGER.severeEnabled()) {
         LOGGER.severe(e.getMessage(), e);
@@ -439,27 +432,9 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener
{
       Set<ObjectName> tableMBeans =
           this.mbs.queryNames(this.MBEAN_OBJECT_NAME_TABLE_AGGREGATE, null);
 
-      if (PulseConstants.PRODUCT_NAME_SQLFIRE
-          .equalsIgnoreCase(PulseController.getPulseProductSupport())) {
-        // For SQLfire
-        for (ObjectName tableMBean : tableMBeans) {
-          String regNameFromTable =
-              StringUtils.getRegionNameFromTableName(tableMBean.getKeyProperty("table"));
-          for (ObjectName regionMBean : regionMBeans) {
-            String regionName = regionMBean.getKeyProperty("name");
-            if (regNameFromTable.equals(regionName)) {
-              updateClusterRegion(regionMBean);
-              // Increment cluster region count
-              cluster.setTotalRegionCount(cluster.getTotalRegionCount() + 1);
-              break;
-            }
-          }
-        }
-      } else {
-        // For Gemfire
-        for (ObjectName regMBean : regionMBeans) {
-          updateClusterRegion(regMBean);
-        }
+      // For Gemfire
+      for (ObjectName regMBean : regionMBeans) {
+        updateClusterRegion(regMBean);
       }
 
       // Remove deleted regions from cluster's regions list
@@ -477,22 +452,7 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener
{
         } else {
           switch (service) {
             case PulseConstants.MBEAN_KEY_PROPERTY_SERVICE_VALUE_REGION:
-              if (PulseConstants.PRODUCT_NAME_SQLFIRE
-                  .equalsIgnoreCase(PulseController.getPulseProductSupport())) {
-                // For SQLfire
-                for (ObjectName tableMBean : tableMBeans) {
-                  String regNameFromTable =
-                      StringUtils.getRegionNameFromTableName(tableMBean.getKeyProperty("table"));
-                  String regionName = memMBean.getKeyProperty("name");
-                  if (regNameFromTable.equals(regionName)) {
-                    updateMemberRegion(memMBean);
-                    break;
-                  }
-                }
-              } else {
-                // For Gemfire
-                updateMemberRegion(memMBean);
-              }
+              updateMemberRegion(memMBean);
               break;
             case PulseConstants.MBEAN_KEY_PROPERTY_SERVICE_VALUE_CACHESERVER:
               updateMemberClient(memMBean);
@@ -578,16 +538,9 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener
{
         this.isAddedNotiListner = true;
       }
 
-      if (PulseConstants.PRODUCT_NAME_SQLFIRE
-          .equalsIgnoreCase(PulseController.getPulseProductSupport())) {
-        // Reset to zero
-        cluster.setServerCount(0);
-        cluster.setTotalRegionCount(0);
-      } else {
-        String[] serverCnt = (String[]) (this.mbs.invoke(mbeanName,
-            PulseConstants.MBEAN_OPERATION_LISTSERVERS, null, null));
-        cluster.setServerCount(serverCnt.length);
-      }
+      String[] serverCnt = (String[]) (this.mbs.invoke(mbeanName,
+          PulseConstants.MBEAN_OPERATION_LISTSERVERS, null, null));
+      cluster.setServerCount(serverCnt.length);
 
       TabularData table = (TabularData) (this.mbs.invoke(mbeanName,
           PulseConstants.MBEAN_OPERATION_VIEWREMOTECLUSTERSTATUS, null, null));
@@ -714,64 +667,10 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener
{
             cluster.getGarbageCollectionTrend().add(cluster.getGarbageCollectionCount());
             break;
           case PulseConstants.MBEAN_ATTRIBUTE_TOTALREGIONCOUNT:
-            if (!PulseConstants.PRODUCT_NAME_SQLFIRE
-                .equalsIgnoreCase(PulseController.getPulseProductSupport())) {
-              // for Gemfire
-              cluster.setTotalRegionCount(
-                  getIntegerAttribute(attribute.getValue(), attribute.getName()));
-            }
-            break;
-        }
-      }
-
-      // SQLFIRE attributes
-      if (PulseConstants.PRODUCT_NAME_SQLFIRE
-          .equalsIgnoreCase(PulseController.getPulseProductSupport())) {
-
-        try { // get sqlfire cluster mbean
-
-          ObjectName sfMemberMbeansObjectName =
-              new ObjectName(PulseConstants.OBJECT_NAME_SF_CLUSTER);
-
-          Set<ObjectName> sfCluserMBeans = this.mbs.queryNames(sfMemberMbeansObjectName,
null);
-
-          for (ObjectName sfCluserMBean : sfCluserMBeans) {
-
-            AttributeList attrList =
-                this.mbs.getAttributes(sfCluserMBean, PulseConstants.SF_CLUSTER_MBEAN_ATTRIBUTES);
-
-            for (int i = 0; i < attrList.size(); i++) {
-
-              Attribute attribute = (Attribute) attrList.get(i);
-
-              if (attribute.getName()
-                  .equals(PulseConstants.MBEAN_ATTRIBUTE_PROCEDURECALLSINPROGRESS)) {
-                try {
-                  cluster.setRunningFunctionCount(
-                      getIntegerAttribute(attribute.getValue(), attribute.getName()));
-                } catch (Exception e) {
-                  cluster.setRunningFunctionCount(0);
-                  continue;
-                }
-              } else if (attribute.getName()
-                  .equals(PulseConstants.MBEAN_ATTRIBUTE_NETWORKSERVERCLIENTCONNECTIONSTATS))
{
-                // set number of cluster's clients
-                CompositeData nscConnStats = (CompositeData) attribute.getValue();
-
-                cluster.setClientConnectionCount(getLongAttribute(
-                    nscConnStats.get(PulseConstants.COMPOSITE_DATA_KEY_CONNECTIONSACTIVE),
-                    PulseConstants.COMPOSITE_DATA_KEY_CONNECTIONSACTIVE));
-              }
-            }
+            cluster.setTotalRegionCount(
+                getIntegerAttribute(attribute.getValue(), attribute.getName()));
             break;
-          }
-
-        } catch (MalformedObjectNameException e) {
-          LOGGER.warning(e);
-        } catch (NullPointerException e) {
-          LOGGER.warning(e);
         }
-
       }
 
     } catch (InstanceNotFoundException infe) {
@@ -1684,55 +1583,6 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener
{
       }
     }
 
-    // SQLFire specific attributes
-    if (PulseController.getPulseProductSupport()
-        .equalsIgnoreCase(PulseConstants.PRODUCT_NAME_SQLFIRE)) {
-
-      try {
-        // get sqlfire mbeans
-        String memberName = mbeanName.getKeyProperty(PulseConstants.MBEAN_KEY_PROPERTY_MEMBER);
-
-        ObjectName sfMemberMbeansObjectName =
-            new ObjectName(PulseConstants.OBJECT_NAME_SF_MEMBER_PATTERN + memberName);
-
-        Set<ObjectName> sfMemberMBeans = this.mbs.queryNames(sfMemberMbeansObjectName,
null);
-        for (ObjectName sfMemberMBean : sfMemberMBeans) {
-
-          AttributeList attrList =
-              this.mbs.getAttributes(sfMemberMBean, PulseConstants.SF_MEMBER_MBEAN_ATTRIBUTES);
-          for (int i = 0; i < attrList.size(); i++) {
-
-            Attribute attribute = (Attribute) attrList.get(i);
-
-            if (attribute.getName().equals(PulseConstants.MBEAN_ATTRIBUTE_DATASTORE)) {
-              member.setServer(getBooleanAttribute(attribute.getValue(), attribute.getName()));
-
-              // Update Server count
-              if (member.isServer()) {
-                cluster.setServerCount(cluster.getServerCount() + 1);
-              }
-            } else if (attribute.getName()
-                .equals(PulseConstants.MBEAN_ATTRIBUTE_NETWORKSERVERCLIENTCONNECTIONSTATS))
{
-
-              CompositeData nscConnStats = (CompositeData) attribute.getValue();
-
-              // Update sqlfire client count
-              member.setNumSqlfireClients(getLongAttribute(
-                  nscConnStats.get(PulseConstants.COMPOSITE_DATA_KEY_CONNECTIONSACTIVE),
-                  PulseConstants.COMPOSITE_DATA_KEY_CONNECTIONSACTIVE));
-            }
-          }
-          break;
-        }
-
-      } catch (MalformedObjectNameException e) {
-        LOGGER.warning(e);
-      } catch (NullPointerException e) {
-        LOGGER.warning(e);
-      }
-
-    }
-
     return member;
   }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/239a8767/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMemberService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMemberService.java
b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMemberService.java
index 3cd617c..b6a129d 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMemberService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMemberService.java
@@ -108,12 +108,8 @@ public class ClusterMemberService implements PulseService {
       memberJSON.put("threads", clusterMember.getNumThreads());
 
       // Number of member clients
-      if (PulseController.getPulseProductSupport()
-          .equalsIgnoreCase(PulseConstants.PRODUCT_NAME_SQLFIRE)) {
-        memberJSON.put("clients", clusterMember.getNumSqlfireClients());
-      } else {
-        memberJSON.put("clients", clusterMember.getMemberClientsHMap().size());
-      }
+      memberJSON.put("clients", clusterMember.getMemberClientsHMap().size());
+
       memberJSON.put("queues", clusterMember.getQueueBacklog());
 
       memberListJson.add(memberJSON);

http://git-wip-us.apache.org/repos/asf/geode/blob/239a8767/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionService.java
b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionService.java
index e862615..2e0a6f4 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionService.java
@@ -166,13 +166,9 @@ public class ClusterRegionService implements PulseService {
         regionJSON.put("compressionCodec", VALUE_NA);
       }
 
-      if (PulseConstants.PRODUCT_NAME_SQLFIRE
-          .equalsIgnoreCase(PulseController.getPulseProductSupport())) {
-        // Convert region path to dot separated region path
-        regionJSON.put("regionPath", StringUtils.getTableNameFromRegionName(reg.getFullPath()));
-      } else {
-        regionJSON.put("regionPath", reg.getFullPath());
-      }
+
+      regionJSON.put("regionPath", reg.getFullPath());
+
 
       regionJSON.put("memoryReadsTrend", mapper
           .valueToTree(reg.getRegionStatisticTrend(Cluster.Region.REGION_STAT_GETS_PER_SEC_TREND)));

http://git-wip-us.apache.org/repos/asf/geode/blob/239a8767/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionsService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionsService.java
b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionsService.java
index 0579ccb..7993742 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionsService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionsService.java
@@ -160,15 +160,10 @@ public class ClusterRegionsService implements PulseService {
         regionJSON.put("compressionCodec", this.VALUE_NA);
       }
 
-      if (PulseConstants.PRODUCT_NAME_SQLFIRE
-          .equalsIgnoreCase(PulseController.getPulseProductSupport())) {
-        // Convert region path to dot separated region path
-        regionJSON.put("regionPath", StringUtils.getTableNameFromRegionName(reg.getFullPath()));
-        regionJSON.put("id", StringUtils.getTableNameFromRegionName(reg.getFullPath()));
-      } else {
-        regionJSON.put("regionPath", reg.getFullPath());
-        regionJSON.put("id", reg.getFullPath());
-      }
+
+      regionJSON.put("regionPath", reg.getFullPath());
+      regionJSON.put("id", reg.getFullPath());
+
 
       regionJSON.put("memoryReadsTrend", mapper
           .valueToTree(reg.getRegionStatisticTrend(Cluster.Region.REGION_STAT_GETS_PER_SEC_TREND)));

http://git-wip-us.apache.org/repos/asf/geode/blob/239a8767/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterSelectedRegionService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterSelectedRegionService.java
b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterSelectedRegionService.java
index 2b72e61..e94ef63 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterSelectedRegionService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterSelectedRegionService.java
@@ -170,12 +170,8 @@ public class ClusterSelectedRegionService implements PulseService {
         regionMember.put("sockets", member.getTotalFileDescriptorOpen());
         regionMember.put("threads", member.getNumThreads());
 
-        if (PulseController.getPulseProductSupport()
-            .equalsIgnoreCase(PulseConstants.PRODUCT_NAME_SQLFIRE)) {
-          regionMember.put("clients", member.getNumSqlfireClients());
-        } else {
-          regionMember.put("clients", member.getMemberClientsHMap().size());
-        }
+        regionMember.put("clients", member.getMemberClientsHMap().size());
+
         regionMember.put("queues", member.getQueueBacklog());
         memberArray.add(regionMember);
       }
@@ -196,13 +192,9 @@ public class ClusterSelectedRegionService implements PulseService {
         regionJSON.put("compressionCodec", PulseService.VALUE_NA);
       }
 
-      if (PulseConstants.PRODUCT_NAME_SQLFIRE
-          .equalsIgnoreCase(PulseController.getPulseProductSupport())) {
-        // Convert region path to dot separated region path
-        regionJSON.put("regionPath", StringUtils.getTableNameFromRegionName(reg.getFullPath()));
-      } else {
-        regionJSON.put("regionPath", reg.getFullPath());
-      }
+
+      regionJSON.put("regionPath", reg.getFullPath());
+
 
       regionJSON.put("memoryReadsTrend", mapper.<JsonNode>valueToTree(
           reg.getRegionStatisticTrend(Cluster.Region.REGION_STAT_GETS_PER_SEC_TREND)));

http://git-wip-us.apache.org/repos/asf/geode/blob/239a8767/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDetailsService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDetailsService.java
b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDetailsService.java
index e69bfa5..c311c67 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDetailsService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDetailsService.java
@@ -77,12 +77,7 @@ public class MemberDetailsService implements PulseService {
       responseJSON.put("regionsCount", clusterMember.getMemberRegionsList().length);
 
       // Number of member clients
-      if (PulseController.getPulseProductSupport()
-          .equalsIgnoreCase(PulseConstants.PRODUCT_NAME_SQLFIRE)) {
-        responseJSON.put("numClients", clusterMember.getNumSqlfireClients());
-      } else {
-        responseJSON.put("numClients", clusterMember.getMemberClientsHMap().size());
-      }
+      responseJSON.put("numClients", clusterMember.getMemberClientsHMap().size());
 
       Long diskUsageVal = clusterMember.getTotalDiskUsage();
       Double diskUsage = diskUsageVal.doubleValue() / 1024;

http://git-wip-us.apache.org/repos/asf/geode/blob/239a8767/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberRegionsService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberRegionsService.java
b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberRegionsService.java
index d7e56b1..c8addd9 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberRegionsService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberRegionsService.java
@@ -79,14 +79,7 @@ public class MemberRegionsService implements PulseService {
         ObjectNode regionJSON = mapper.createObjectNode();
         regionJSON.put(this.NAME, memberRegion.getName());
 
-        if (PulseConstants.PRODUCT_NAME_SQLFIRE
-            .equalsIgnoreCase(PulseController.getPulseProductSupport())) {
-          // Convert region path to dot separated region path
-          regionJSON.put("fullPath",
-              StringUtils.getTableNameFromRegionName(memberRegion.getFullPath()));
-        } else {
-          regionJSON.put("fullPath", memberRegion.getFullPath());
-        }
+        regionJSON.put("fullPath", memberRegion.getFullPath());
 
         regionJSON.put("type", memberRegion.getRegionType());
         regionJSON.put("entryCount", memberRegion.getSystemRegionEntryCount());

http://git-wip-us.apache.org/repos/asf/geode/blob/239a8767/geode-pulse/src/main/webapp/WEB-INF/spring-security.xml
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/WEB-INF/spring-security.xml b/geode-pulse/src/main/webapp/WEB-INF/spring-security.xml
index 2842f64..47d1811 100644
--- a/geode-pulse/src/main/webapp/WEB-INF/spring-security.xml
+++ b/geode-pulse/src/main/webapp/WEB-INF/spring-security.xml
@@ -29,7 +29,6 @@
 		<!-- Can be invoked w/o auth -->
 		<intercept-url pattern="/Login.html" access="permitAll"  />
 		<intercept-url pattern="/pulse/authenticateUser" access="permitAll" />
-		<intercept-url pattern="/pulse/pulseProductSupport" access="permitAll" />
 		<!-- Can be invoked w/o auth -->
 
 		<!-- Restricted urls -->

http://git-wip-us.apache.org/repos/asf/geode/blob/239a8767/geode-pulse/src/main/webapp/scripts/pulsescript/MemberDetails.js
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/MemberDetails.js b/geode-pulse/src/main/webapp/scripts/pulsescript/MemberDetails.js
index b41b289..650f30d 100644
--- a/geode-pulse/src/main/webapp/scripts/pulsescript/MemberDetails.js
+++ b/geode-pulse/src/main/webapp/scripts/pulsescript/MemberDetails.js
@@ -35,11 +35,9 @@ $(document).ready(function() {
   // modify UI text as per requirement
   customizeUI();
 
-  if (CONST_BACKEND_PRODUCT_SQLFIRE == productname.toLowerCase()) {
-    alterHtmlContainer(CONST_BACKEND_PRODUCT_SQLFIRE);
-  } else {
-    alterHtmlContainer(CONST_BACKEND_PRODUCT_GEMFIRE);
-  }
+
+  alterHtmlContainer(CONST_BACKEND_PRODUCT_GEMFIRE);
+
 
   scanPageForWidgets();
   createMemberRegionsTreeMap();
@@ -193,19 +191,8 @@ function hideAsyncEventQueuePopup() {
  * is sqlfire or gemfire
  */
 function alterHtmlContainer(prodname) {
-  if (CONST_BACKEND_PRODUCT_SQLFIRE == prodname.toLowerCase()) {
-    // Hide HTML for following
-
-    // Show HTML for following
-    $('#subTabQueryStatistics').show();
-  } else {
     // Hide HTML for following
     $('#subTabQueryStatistics').hide();
-
-    // Show HTML for following
-
-  }
-
 }
 
 // Function to generate HTML for Members list drop down
@@ -1009,14 +996,6 @@ function createMemberRegionsGrid() {
             mRLC.css("position", "relative");
             mRLC.css('right', scrollPositionX);
           });
-
-          // change col names depend on product
-          if (CONST_BACKEND_PRODUCT_SQLFIRE == productname.toLowerCase()) {
-            jQuery("#memberRegionsList").jqGrid('setLabel', 'entryCount',
-                jQuery.i18n.prop('pulse-entrycount-custom'));
-            jQuery("#memberRegionsList").jqGrid('setLabel', 'entrySize',
-                jQuery.i18n.prop('pulse-entrysize-custom'));
-          }
         }
       });
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/239a8767/geode-pulse/src/main/webapp/scripts/pulsescript/clusterDetail.js
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/clusterDetail.js b/geode-pulse/src/main/webapp/scripts/pulsescript/clusterDetail.js
index 78c9cda..f4bddde 100644
--- a/geode-pulse/src/main/webapp/scripts/pulsescript/clusterDetail.js
+++ b/geode-pulse/src/main/webapp/scripts/pulsescript/clusterDetail.js
@@ -42,24 +42,14 @@ $(document).ready(function() {
   // modify UI text as per requirement
   customizeUI();
 
-  if (CONST_BACKEND_PRODUCT_SQLFIRE == productname.toLowerCase()) {
-    alterHtmlContainer(CONST_BACKEND_PRODUCT_SQLFIRE);
+  alterHtmlContainer(CONST_BACKEND_PRODUCT_GEMFIRE);
 
-    // "ClusterDetails" service callback handler
-    getClusterDetailsBack = getClusterDetailsSQLfireBack;
+  // "ClusterDetails" service callback handler
+  getClusterDetailsBack = getClusterDetailsGemfireBack;
 
-    // "ClusterKeyStatistics" service callback handler
-    getClusterKeyStatisticsBack = getClusterKeyStatisticsSQLfireBack;
+  // "ClusterKeyStatistics" service callback handler
+  getClusterKeyStatisticsBack = getClusterKeyStatisticsGemfireBack;
 
-  } else {
-    alterHtmlContainer(CONST_BACKEND_PRODUCT_GEMFIRE);
-    
-    // "ClusterDetails" service callback handler
-    getClusterDetailsBack = getClusterDetailsGemfireBack;
-
-    // "ClusterKeyStatistics" service callback handler
-    getClusterKeyStatisticsBack = getClusterKeyStatisticsGemfireBack;
-  }
 
   // Add hostspot attributes
   hotspotAttributes = new Array();
@@ -106,17 +96,6 @@ $(document).ready(function() {
  * is sqlfire or gemfire 
  */
 function alterHtmlContainer(prodname){
-  if(CONST_BACKEND_PRODUCT_SQLFIRE == prodname.toLowerCase()){
-    // Hide HTML for following
-    $('#clusterUniqueCQsContainer').hide();
-    $('#SubscriptionsContainer').hide();
-    $('#queriesPerSecContainer').hide();
-    
-    // Show HTML for following
-    $('#subTabQueryStatistics').show();
-    $('#TxnCommittedContainer').show();
-    $('#TxnRollbackContainer').show(); 
-  }else{
     // Hide HTML for following
     $('#subTabQueryStatistics').hide();
     $('#TxnCommittedContainer').hide();
@@ -126,8 +105,6 @@ function alterHtmlContainer(prodname){
     $('#clusterUniqueCQsContainer').show();
     $('#SubscriptionsContainer').show();
     $('#queriesPerSecContainer').show();
-  }
-  
 }
 
 // Function called when Hotspot is changed 
@@ -1481,18 +1458,7 @@ function createRegionsGridDefault() {
             mRLC.css("position", "relative");
             mRLC.css('right', scrollPositionX);
           });
-          
-          // change col names depend on product
-          if(CONST_BACKEND_PRODUCT_SQLFIRE == productname.toLowerCase()){
-            jQuery("#regionsList").jqGrid('setLabel', 'name', jQuery.i18n.prop('pulse-regiontableName-custom'));
-            jQuery("#regionsList").jqGrid('setLabel', 'regionPath', jQuery.i18n.prop('pulse-regiontablePathColName-custom'));
-            jQuery("#regionsList").jqGrid('setLabel', 'getsRate', jQuery.i18n.prop('pulse-readsRate-custom'));
-            jQuery("#regionsList").jqGrid('setLabel', 'putsRate', jQuery.i18n.prop('pulse-writesRate-custom'));
-            jQuery("#regionsList").jqGrid('setLabel', 'writes', jQuery.i18n.prop('pulse-writes-custom'));
-            jQuery("#regionsList").jqGrid('setLabel', 'reads', jQuery.i18n.prop('pulse-reads-custom'));
-            jQuery("#regionsList").jqGrid('setLabel', 'systemRegionEntryCount', jQuery.i18n.prop('pulse-entrycount-custom'));
-            jQuery("#regionsList").jqGrid('setLabel', 'entrySize', jQuery.i18n.prop('pulse-entrysize-custom'));
-          }
+
         }
       });
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/239a8767/geode-pulse/src/main/webapp/scripts/pulsescript/common.js
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/common.js b/geode-pulse/src/main/webapp/scripts/pulsescript/common.js
index 15b18d1..3d0d994 100644
--- a/geode-pulse/src/main/webapp/scripts/pulsescript/common.js
+++ b/geode-pulse/src/main/webapp/scripts/pulsescript/common.js
@@ -19,7 +19,6 @@
 
 // CONSTANTS
 var CONST_BACKEND_PRODUCT_GEMFIRE = "gemfire";
-var CONST_BACKEND_PRODUCT_SQLFIRE = "gemfirexd";  // "sqlfire";
 
 var host = '';
 var port = '';
@@ -71,8 +70,6 @@ function changeLocale(language, pagename) {
 
 function customizeUI() {
 
-  productname = getCookie("productname");
-
   // common call back function for default and selected languages
   var propertiesFileLoadedCallBackFunction = function() {
     // $.holdReady(false);
@@ -95,7 +92,7 @@ function customizeUI() {
   // TODO : retrieve locale from VM and use it later i.e. returned from server
   var locale_language = 'en';
   jQuery.i18n.properties({
-    name : [ productname, 'default' ],
+    name : [ "gemfire", 'default' ],
     path : 'properties/',
     mode : 'map',
     cache : true,

http://git-wip-us.apache.org/repos/asf/geode/blob/239a8767/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowser.js
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowser.js b/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowser.js
index 19ac9af..9995337 100644
--- a/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowser.js
+++ b/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowser.js
@@ -45,11 +45,7 @@ $(document).ready(function() {
   // Load Notification HTML  
   generateNotificationsPanel();
 
-  if (CONST_BACKEND_PRODUCT_SQLFIRE == productname.toLowerCase()) {
-    alterHtmlContainer(CONST_BACKEND_PRODUCT_SQLFIRE);
-  } else {
-    alterHtmlContainer(CONST_BACKEND_PRODUCT_GEMFIRE);
-  }
+  alterHtmlContainer(CONST_BACKEND_PRODUCT_GEMFIRE);
 
   scanPageForWidgets();
   $.ajaxSetup({ cache: false });
@@ -133,14 +129,8 @@ var queryHistoryIconOnClick = function(event) {
  * is sqlfire or gemfire 
  */
 function alterHtmlContainer(prodname){
-  if(CONST_BACKEND_PRODUCT_SQLFIRE == prodname.toLowerCase()){
-    // Show HTML for following
-    $('#subTabQueryStatistics').show();
-  }else{
-    // Hide HTML for following
-    $('#subTabQueryStatistics').hide();
-  }
-  
+  // Hide HTML for following
+  $('#subTabQueryStatistics').hide();
 }
 
 

http://git-wip-us.apache.org/repos/asf/geode/blob/239a8767/geode-pulse/src/main/webapp/scripts/pulsescript/pages/Login.js
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/pages/Login.js b/geode-pulse/src/main/webapp/scripts/pulsescript/pages/Login.js
index 57fa39b..7b483cd 100644
--- a/geode-pulse/src/main/webapp/scripts/pulsescript/pages/Login.js
+++ b/geode-pulse/src/main/webapp/scripts/pulsescript/pages/Login.js
@@ -18,31 +18,7 @@
  */
 
 $(document).ready(function() {
-  
-  // determine pulse back end product
-  $.ajax({
-    url : 'pulse/pulseProductSupport',
-    type : 'GET',
-    dataType : 'json',
-    async : true,
-    success : function(data) {
-      // Set product name in cookie
-      setCookie('productname', data.product, 1);
-
-      // modify UI text as per requirement
       customizeUI();
-      
-    },
-    error: function(jqXHR, textStatus, errorThrown){
-
-      $('#user_name').prop('disabled', true);
-      $('#user_password').prop('disabled', true);
-      $('input[type="submit"]').prop('disabled', true);
-      $("#errorText").html("Unable to determine backend product [Gemfire / SQLfire]<br>"+textStatus);
-      $("#errorMasterBlock").show();
-    }
-  });
-  
 });
 
 // this function is called when login page loads

http://git-wip-us.apache.org/repos/asf/geode/blob/239a8767/geode-pulse/src/main/webapp/scripts/pulsescript/queryStatistics.js
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/queryStatistics.js b/geode-pulse/src/main/webapp/scripts/pulsescript/queryStatistics.js
index 9a4b12e..7dee29b 100644
--- a/geode-pulse/src/main/webapp/scripts/pulsescript/queryStatistics.js
+++ b/geode-pulse/src/main/webapp/scripts/pulsescript/queryStatistics.js
@@ -32,12 +32,7 @@ $(document).ready(function() {
   // modify UI text as per requirement
   customizeUI();
 
-  if (CONST_BACKEND_PRODUCT_SQLFIRE == productname.toLowerCase()) {
-    // Do nothing
-  } else {
-    // Redirect to Cluster details page
-    openClusterDetail();
-  }
+  openClusterDetail();
   scanPageForWidgets();
 
   // creating blank query statistics grid

http://git-wip-us.apache.org/repos/asf/geode/blob/239a8767/geode-pulse/src/main/webapp/scripts/pulsescript/regionView.js
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/regionView.js b/geode-pulse/src/main/webapp/scripts/pulsescript/regionView.js
index ce64c42..5ce6300 100644
--- a/geode-pulse/src/main/webapp/scripts/pulsescript/regionView.js
+++ b/geode-pulse/src/main/webapp/scripts/pulsescript/regionView.js
@@ -43,11 +43,7 @@ $(document).ready(function() {
   // Load Notification HTML  
   generateNotificationsPanel();
 
-  if (CONST_BACKEND_PRODUCT_SQLFIRE == productname.toLowerCase()) {
-    alterHtmlContainer(CONST_BACKEND_PRODUCT_SQLFIRE);
-  } else {
-    alterHtmlContainer(CONST_BACKEND_PRODUCT_GEMFIRE);
-  }
+  alterHtmlContainer(CONST_BACKEND_PRODUCT_GEMFIRE);
 
   createMemberTreeMap();
   
@@ -66,13 +62,8 @@ $(document).ready(function() {
  * is sqlfire or gemfire 
  */
 function alterHtmlContainer(prodname){
-  if(CONST_BACKEND_PRODUCT_SQLFIRE == prodname.toLowerCase()){
-    // Show HTML for following
-    $('#subTabQueryStatistics').show();
-  }else{
     // Hide HTML for following
     $('#subTabQueryStatistics').hide();
-  }  
 }
 
 //function used for applying filter of member names in data view screen

http://git-wip-us.apache.org/repos/asf/geode/blob/239a8767/geode-pulse/src/test/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java
b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java
index a4e9903..ddd799f 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java
@@ -122,6 +122,7 @@ public class PulseControllerJUnitTest {
         add(MEMBER_NAME);
       }
     });
+
     region.setPutsRate(12.31D);
     region.setGetsRate(27.99D);
     Cluster.RegionOnMember regionOnMember = new Cluster.RegionOnMember();
@@ -830,14 +831,6 @@ public class PulseControllerJUnitTest {
   }
 
   @Test
-  public void pulseProductSupport() throws Exception {
-    this.mockMvc
-        .perform(get("/pulseProductSupport")
-            .accept(MediaType.parseMediaType(MediaType.APPLICATION_JSON_UTF8_VALUE)))
-        .andExpect(status().isOk()).andExpect(jsonPath("$.product").value("gemfire"));
-  }
-
-  @Test
   public void getQueryStatisticsGridModel() throws Exception {
     this.mockMvc
         .perform(get("/getQueryStatisticsGridModel").principal(principal)

http://git-wip-us.apache.org/repos/asf/geode/blob/239a8767/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java
b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java
index 7c42e44..72bd6a7 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java
@@ -208,11 +208,11 @@ public class PulseAutomatedTest extends PulseBase {
   @Test
   public void clickHostShowsMemberTest() {
     clickElementUsingXpath(PulseTestLocators.TopNavigation.clusterViewLinkXpath);
-    clickElementUsingId(PulseTestLocators.TopologyView.nodeH1Id);
+    PulseTestUtils.waitForElementWithId(PulseTestLocators.TopologyView.nodeH1Id).click();
     verifyElementPresentById(PulseTestLocators.TopologyView.memberM1Id);
-    clickElementUsingId(PulseTestLocators.TopologyView.nodeH2Id);
+    PulseTestUtils.waitForElementWithId(PulseTestLocators.TopologyView.nodeH2Id).click();
     verifyElementPresentById(PulseTestLocators.TopologyView.memberM2Id);
-    clickElementUsingId(PulseTestLocators.TopologyView.nodeH3Id);
+    PulseTestUtils.waitForElementWithId(PulseTestLocators.TopologyView.nodeH3Id).click();
     verifyElementPresentById(PulseTestLocators.TopologyView.memberM3Id);
   }
 


Mime
View raw message