You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2017/01/12 22:58:22 UTC
[1/2] geode git commit: GEODE-1114: RemoveGemfireXD references from
Pulse
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 <js...@pivotal.io>
Authored: Thu Jan 5 14:44:58 2017 -0800
Committer: Jinmei Liao <ji...@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);
}
[2/2] geode git commit: GEODE-2194: Fix Pulse webapp context
Posted by ji...@apache.org.
GEODE-2194: Fix Pulse webapp context
* Pulse no longer has redundant URLs like http://localhost/pulse/pulse/pulseVersion
* this closes #335
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/9081128b
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/9081128b
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/9081128b
Branch: refs/heads/develop
Commit: 9081128bb37abb46ea298b87400a4c84e9615d3b
Parents: 239a876
Author: Jared Stewart <js...@pivotal.io>
Authored: Tue Jan 10 10:53:49 2017 -0800
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Thu Jan 12 14:56:29 2017 -0800
----------------------------------------------------------------------
geode-pulse/src/main/webapp/DataBrowser.html | 2 +-
geode-pulse/src/main/webapp/MemberDetails.html | 2 +-
geode-pulse/src/main/webapp/QueryStatistics.html | 2 +-
.../webapp/WEB-INF/mvc-dispatcher-servlet.xml | 2 +-
.../src/main/webapp/WEB-INF/spring-security.xml | 16 ++++++++--------
geode-pulse/src/main/webapp/clusterDetail.html | 2 +-
geode-pulse/src/main/webapp/regionDetail.html | 2 +-
.../webapp/scripts/pulsescript/PulseFunctions.js | 2 +-
.../webapp/scripts/pulsescript/clusterDetail.js | 18 +++++++++---------
.../src/main/webapp/scripts/pulsescript/common.js | 18 +++++++++---------
.../scripts/pulsescript/pages/DataBrowser.js | 6 +++---
.../scripts/pulsescript/pages/DataBrowserQuery.js | 4 ++--
.../pulsescript/pages/DataBrowserQueryHistory.js | 2 +-
.../webapp/scripts/pulsescript/pages/Login.js | 2 +-
.../webapp/scripts/pulsescript/queryStatistics.js | 2 +-
.../geode/tools/pulse/tests/rules/ServerRule.java | 4 ++--
.../tools/pulse/tests/rules/WebDriverRule.java | 4 ++--
.../pulse/tests/ui/PulseAnonymousUserTest.java | 6 +++---
.../tools/pulse/tests/ui/PulseAutomatedTest.java | 1 +
.../geode/tools/pulse/tests/ui/PulseBase.java | 4 ++--
20 files changed, 51 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/9081128b/geode-pulse/src/main/webapp/DataBrowser.html
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/DataBrowser.html b/geode-pulse/src/main/webapp/DataBrowser.html
index a01df6b..dac5a4d 100644
--- a/geode-pulse/src/main/webapp/DataBrowser.html
+++ b/geode-pulse/src/main/webapp/DataBrowser.html
@@ -142,7 +142,7 @@
<div class="left headerTopLinks welcomeLabelPRZero">Welcome</div>
<div class="left headerTopLinks textbold font-size12" id="userName"></div>
<div class="left headerTopSeperator"></div>
- <div class="left"><a href="pulse/clusterLogout" class="left headerTopLinks">Sign Out</a></div>
+ <div class="left"><a href="clusterLogout" class="left headerTopLinks">Sign Out</a></div>
</div>
</div>
<!-- Header block-->
http://git-wip-us.apache.org/repos/asf/geode/blob/9081128b/geode-pulse/src/main/webapp/MemberDetails.html
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/MemberDetails.html b/geode-pulse/src/main/webapp/MemberDetails.html
index bc946da..18a5eac 100644
--- a/geode-pulse/src/main/webapp/MemberDetails.html
+++ b/geode-pulse/src/main/webapp/MemberDetails.html
@@ -133,7 +133,7 @@
<div class="left headerTopLinks welcomeLabelPRZero">Welcome</div>
<div class="left headerTopLinks textbold font-size12" id="userName"></div>
<div class="left headerTopSeperator"></div>
- <div class="left"><a href="pulse/clusterLogout" class="left headerTopLinks">Sign Out</a></div>
+ <div class="left"><a href="clusterLogout" class="left headerTopLinks">Sign Out</a></div>
</div>
</div>
<!-- Header block-->
http://git-wip-us.apache.org/repos/asf/geode/blob/9081128b/geode-pulse/src/main/webapp/QueryStatistics.html
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/QueryStatistics.html b/geode-pulse/src/main/webapp/QueryStatistics.html
index 543e003..0b0e3e1 100644
--- a/geode-pulse/src/main/webapp/QueryStatistics.html
+++ b/geode-pulse/src/main/webapp/QueryStatistics.html
@@ -158,7 +158,7 @@
<div class="left headerTopLinks textbold font-size12" id="userName"></div>
<div class="left headerTopSeperator"></div>
<div class="left">
- <a href="pulse/clusterLogout" class="left headerTopLinks">Sign
+ <a href="clusterLogout" class="left headerTopLinks">Sign
Out</a>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/geode/blob/9081128b/geode-pulse/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml b/geode-pulse/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
index 8cdbac9..95e09db 100644
--- a/geode-pulse/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
+++ b/geode-pulse/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
@@ -31,5 +31,5 @@
<context:component-scan base-package="org.apache.geode.tools.pulse.internal" />
<mvc:annotation-driven />
-
+ <mvc:default-servlet-handler />
</beans>
http://git-wip-us.apache.org/repos/asf/geode/blob/9081128b/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 47d1811..cac6caf 100644
--- a/geode-pulse/src/main/webapp/WEB-INF/spring-security.xml
+++ b/geode-pulse/src/main/webapp/WEB-INF/spring-security.xml
@@ -28,31 +28,31 @@
<csrf disabled="true"/>
<!-- Can be invoked w/o auth -->
<intercept-url pattern="/Login.html" access="permitAll" />
- <intercept-url pattern="/pulse/authenticateUser" access="permitAll" />
+ <intercept-url pattern="/authenticateUser" access="permitAll" />
<!-- Can be invoked w/o auth -->
<!-- Restricted urls -->
- <intercept-url pattern="/clusterDetail.html" access="hasRole('CLUSTER:READ')" />
+ <intercept-url pattern="/*" access="hasRole('CLUSTER:READ')" />
+ <intercept-url pattern="/clusterDetail.html" access="hasRole('CLUSTER:READ')" />
<intercept-url pattern="/MemberDetails.html" access="hasRole('CLUSTER:READ')" />
<intercept-url pattern="/regionDetail.html" access="hasRole('CLUSTER:READ')" />
- <intercept-url pattern="/pulse/*" access="hasRole('CLUSTER:READ')" />
<intercept-url pattern="/clearAlerts" access="hasRole('CLUSTER:READ')" />
<intercept-url pattern="/acknowledgeAlert" access="hasRole('CLUSTER:READ')" />
- <!-- /dataBrowserRegions, /dataBrowserQuery, /dataBrowserQueryHistory, /dataBrowserExport -->
<intercept-url pattern="/dataBrowser*" access="hasRole('CLUSTER:READ') and hasRole('DATA:READ')" />
<intercept-url pattern="/getQueryStatisticsGridModel/*" access="hasRole('CLUSTER:READ') and hasRole('DATA:READ')" />
<!-- Restricted urls -->
- <form-login login-page="/Login.html"
- authentication-failure-handler-ref="authenticationFailureHandler"
- default-target-url="/clusterDetail.html" />
+ <form-login login-page="/Login.html"
+ authentication-failure-handler-ref="authenticationFailureHandler"
+ default-target-url="/clusterDetail.html"
+ always-use-default-target="true"/>
<headers>
<frame-options policy="DENY" />
<content-type-options />
<xss-protection enabled="true" block="true" />
</headers>
- <logout logout-url="/pulse/clusterLogout" success-handler-ref="customLogoutSuccessHandler"/>
+ <logout logout-url="/clusterLogout" success-handler-ref="customLogoutSuccessHandler"/>
</http>
http://git-wip-us.apache.org/repos/asf/geode/blob/9081128b/geode-pulse/src/main/webapp/clusterDetail.html
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/clusterDetail.html b/geode-pulse/src/main/webapp/clusterDetail.html
index b1fc1e0..26ae3d1 100644
--- a/geode-pulse/src/main/webapp/clusterDetail.html
+++ b/geode-pulse/src/main/webapp/clusterDetail.html
@@ -123,7 +123,7 @@
<div class="left headerTopLinks welcomeLabelPRZero">Welcome</div>
<div class="left headerTopLinks textbold font-size12" id="userName"></div>
<div class="left headerTopSeperator"></div>
- <div class="left"><a href="pulse/clusterLogout" class="left headerTopLinks">Sign Out</a></div>
+ <div class="left"><a href="clusterLogout" class="left headerTopLinks">Sign Out</a></div>
</div>
</div>
<!-- Header block-->
http://git-wip-us.apache.org/repos/asf/geode/blob/9081128b/geode-pulse/src/main/webapp/regionDetail.html
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/regionDetail.html b/geode-pulse/src/main/webapp/regionDetail.html
index 711ef31..94d3b88 100644
--- a/geode-pulse/src/main/webapp/regionDetail.html
+++ b/geode-pulse/src/main/webapp/regionDetail.html
@@ -215,7 +215,7 @@
<div class="left headerTopLinks welcomeLabelPRZero">Welcome</div>
<div class="left headerTopLinks textbold font-size12" id="userName"></div>
<div class="left headerTopSeperator"></div>
- <div class="left"><a href="pulse/clusterLogout" class="left headerTopLinks">Sign Out</a></div>
+ <div class="left"><a href="clusterLogout" class="left headerTopLinks">Sign Out</a></div>
</div>
</div>
<!-- Header block-->
http://git-wip-us.apache.org/repos/asf/geode/blob/9081128b/geode-pulse/src/main/webapp/scripts/pulsescript/PulseFunctions.js
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/PulseFunctions.js b/geode-pulse/src/main/webapp/scripts/pulsescript/PulseFunctions.js
index fd1e8de..53fbce0 100644
--- a/geode-pulse/src/main/webapp/scripts/pulsescript/PulseFunctions.js
+++ b/geode-pulse/src/main/webapp/scripts/pulsescript/PulseFunctions.js
@@ -43,7 +43,7 @@ function PulseFunctions() {
PulseFunctions.prototype.pulseVersion = function(responseBack) {
var po = new Object();
po.traceNo = UUIDv4();
- ajaxPost("pulse/pulseVersion", po, responseBack);
+ ajaxPost("pulseVersion", po, responseBack);
};
PulseFunctions.prototype.CluserAlertNotificationFunc = function (funcName, postData) {
http://git-wip-us.apache.org/repos/asf/geode/blob/9081128b/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 f4bddde..3fe49eb 100644
--- a/geode-pulse/src/main/webapp/scripts/pulsescript/clusterDetail.js
+++ b/geode-pulse/src/main/webapp/scripts/pulsescript/clusterDetail.js
@@ -1953,7 +1953,7 @@ function showMembersDefaultRgraphPanel() {
// populateMemberRGraph using pulseUpdate
var pulseData = new Object();
pulseData.ClusterMembersRGraph = "";
- ajaxPost("pulse/pulseUpdate", pulseData, translateGetClusterMemberRGraphBack);
+ ajaxPost("pulseUpdate", pulseData, translateGetClusterMemberRGraphBack);
}
@@ -1965,7 +1965,7 @@ function showMembersDefaultTreemapPanel() {
// populate Member TreeMap using pulseUpdate
var pulseData = new Object();
pulseData.ClusterMembers = "";
- ajaxPost("pulse/pulseUpdate", pulseData, translateGetClusterMemberBack);
+ ajaxPost("pulseUpdate", pulseData, translateGetClusterMemberBack);
}
@@ -1978,7 +1978,7 @@ function showMembersDefaultGridPanel() {
// populate Member Grid using pulseUpdate
var pulseData = new Object();
pulseData.ClusterMembers = ""; // getClusterMembersBack
- ajaxPost("pulse/pulseUpdate", pulseData, translateGetClusterMemberBack);
+ ajaxPost("pulseUpdate", pulseData, translateGetClusterMemberBack);
$('#default_grid_block').hide();
destroyScrollPane('gview_memberList');
@@ -2003,7 +2003,7 @@ function showMembersSGTreemapPanel() {
// populate Member TreeMap using pulseUpdate
var pulseData = new Object();
pulseData.ClusterMembers = "";
- ajaxPost("pulse/pulseUpdate", pulseData, translateGetClusterMemberBack);
+ ajaxPost("pulseUpdate", pulseData, translateGetClusterMemberBack);
}
@@ -2015,7 +2015,7 @@ function showMembersSGGridPanel() {
// populate Member Grid using pulseUpdate
var pulseData = new Object();
pulseData.ClusterMembers = ""; // getClusterMembersBack
- ajaxPost("pulse/pulseUpdate", pulseData, translateGetClusterMemberBack);
+ ajaxPost("pulseUpdate", pulseData, translateGetClusterMemberBack);
$('#servergroups_grid_block').hide();
destroyScrollPane('gview_memberListSG');
@@ -2040,7 +2040,7 @@ function showMembersRZTreemapPanel() {
// populate Member TreeMap using pulseUpdate
var pulseData = new Object();
pulseData.ClusterMembers = "";
- ajaxPost("pulse/pulseUpdate", pulseData, translateGetClusterMemberBack);
+ ajaxPost("pulseUpdate", pulseData, translateGetClusterMemberBack);
}
//Show Members Redundancy Zones Grid View and hide rest
@@ -2051,7 +2051,7 @@ function showMembersRZGridPanel() {
// populate Member Grid using pulseUpdate
var pulseData = new Object();
pulseData.ClusterMembers = "";
- ajaxPost("pulse/pulseUpdate", pulseData, translateGetClusterMemberBack);
+ ajaxPost("pulseUpdate", pulseData, translateGetClusterMemberBack);
$('#redundancyzones_grid_block').hide();
destroyScrollPane('gview_memberListRZ');
@@ -2076,7 +2076,7 @@ function showDataTreemapPanel() {
// populate Region TreeMap using pulseUpdate
var pulseData = new Object();
pulseData.ClusterRegions = "";
- ajaxPost("pulse/pulseUpdate", pulseData, translateGetClusterRegionsBack);
+ ajaxPost("pulseUpdate", pulseData, translateGetClusterRegionsBack);
}
@@ -2088,7 +2088,7 @@ function showDataGridPanel() {
// populate Regions Grid using pulseUpdate
var pulseData = new Object();
pulseData.ClusterRegions = "";
- ajaxPost("pulse/pulseUpdate", pulseData, translateGetClusterRegionsBack);
+ ajaxPost("pulseUpdate", pulseData, translateGetClusterRegionsBack);
$('#data_grid_block').hide();
destroyScrollPane('gview_regionsList');
http://git-wip-us.apache.org/repos/asf/geode/blob/9081128b/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 3d0d994..550af7c 100644
--- a/geode-pulse/src/main/webapp/scripts/pulsescript/common.js
+++ b/geode-pulse/src/main/webapp/scripts/pulsescript/common.js
@@ -174,7 +174,7 @@ function clearAlerts(alertType, flagClearAll) {
requestData.alertType = -1;
}
- $.getJSON("pulse/clearAlerts", requestData, function(data) {
+ $.getJSON("clearAlerts", requestData, function(data) {
// call system alerts callback handler
getSystemAlertsBack(data);
@@ -259,7 +259,7 @@ function displayClusterStatus() {
var data = {
"pulseData" : this.toJSONObj(postData)
};
- $.post("pulse/pulseUpdate", data, function(data) {
+ $.post("pulseUpdate", data, function(data) {
updateRGraphFlags();
clusteRGraph.loadJSON(data.clustor);
clusteRGraph.compute('end');
@@ -277,7 +277,7 @@ function displayClusterStatus() {
"pulseData" : this.toJSONObj(postData)
};
- $.post("pulse/pulseUpdate", data, function(data) {
+ $.post("pulseUpdate", data, function(data) {
var members = data.members;
memberCount = members.length;
var childerensVal = [];
@@ -1174,7 +1174,7 @@ function acknowledgeAlert(divId) {
"alertId" : divId
};
$.getJSON(
- "pulse/acknowledgeAlert",
+ "acknowledgeAlert",
requestData,
function(data) {
// Change color of alert title
@@ -1419,7 +1419,7 @@ function prepareDataAndPost(functionTimingList) {
+ "var funcCall = 'pf.'+functionName + \"('\" +functionName+\"',postData);\";\n"
+ "eval(funcCall);\n"
+ "}\n"
- + "ajaxPost(\"pulse/pulseUpdate\", postData, responseCallbackHandler);\n"
+ + "ajaxPost(\"pulseUpdate\", postData, responseCallbackHandler);\n"
+ "postData = null;\n" + "postData = new Object();\n" + "}," + timing
+ ");";
var loadOnStart = "setTimeout(function() {\n"
@@ -1432,7 +1432,7 @@ function prepareDataAndPost(functionTimingList) {
+ "var funcCall = 'pf.'+functionName + \"('\" +functionName+\"',postData);\";\n"
+ "eval(funcCall);\n"
+ "}\n"
- + "ajaxPost(\"pulse/pulseUpdate\", postData, responseCallbackHandler);\n"
+ + "ajaxPost(\"pulseUpdate\", postData, responseCallbackHandler);\n"
+ "postData = null;\n" + "postData = new Object();\n" + "},0);";
functionArray[i] = func;
functionStartArray[i] = loadOnStart;
@@ -1456,7 +1456,7 @@ function prepareDataAndPost(functionTimingList) {
* j++) { var functionName = listOfPulseFunction[j]; //Create the function call
* from function name and parameter. var funcCall = 'pf.'+functionName + "('" +
* functionName + "',postData);"; //Call the function eval(funcCall); }
- * ajaxPost("pulse/pulseUpdate", postData, responseCallbackHandler); postData =
+ * ajaxPost("pulseUpdate", postData, responseCallbackHandler); postData =
* null; postData = new Object(); }, timing); } }
*/
@@ -1476,13 +1476,13 @@ var responseCallbackHandler = function(data) {
* Use this function to force periodic update of pulse data.
*/
function forcePulseDataUpdate(postData){
- ajaxPost("pulse/pulseUpdate", postData, responseCallbackHandler);
+ ajaxPost("pulseUpdate", postData, responseCallbackHandler);
}
// function used for getting pulse version
function getPulseVersion() {
- $.getJSON("pulse/pulseVersion", function(data) {
+ $.getJSON("pulseVersion", function(data) {
var pulseVersion = data.pulseVersion;
$('#pulseVersion').html(pulseVersion);
http://git-wip-us.apache.org/repos/asf/geode/blob/9081128b/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 9995337..5bbcd75 100644
--- a/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowser.js
+++ b/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowser.js
@@ -52,7 +52,7 @@ $(document).ready(function() {
var requestData = {};
getRequestParams();
- $.getJSON("pulse/authenticateUser", requestData, function(data) {
+ $.getJSON("authenticateUser", requestData, function(data) {
// return isUserLoggedIn
if(!data.isUserLoggedIn){
@@ -172,7 +172,7 @@ function initClusterRegions(){
function updateDataBrowserRegionsData(){
requestData = {};
- $.getJSON("pulse/dataBrowserRegions", requestData, function(data) {
+ $.getJSON("dataBrowserRegions", requestData, function(data) {
// set cluster name on tab link to cluster page
if(data.clusterName != undefined && data.clusterName != null){
@@ -593,7 +593,7 @@ function dynamicSort(property, passedSortOrder) {
* Function to get basic details on Data Browser Page
*/
function getClusterBasicDetails(){
- $.getJSON("pulse/dataBrowserBasicDetails", function(data) {
+ $.getJSON("dataBrowserBasicDetails", function(data) {
$('#userName').html(data.userName);
http://git-wip-us.apache.org/repos/asf/geode/blob/9081128b/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowserQuery.js
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowserQuery.js b/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowserQuery.js
index df78be2..39aae57 100644
--- a/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowserQuery.js
+++ b/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowserQuery.js
@@ -101,7 +101,7 @@ function executeDBQuery(){
$('#memberAccordion').html('');
}
- $.getJSON("pulse/dataBrowserQuery", requestData, function(data) {
+ $.getJSON("dataBrowserQuery", requestData, function(data) {
if(data != undefined && data != null){
if(data.error != undefined && data.error != null){
@@ -958,7 +958,7 @@ function exportResult() {
$.generateFile({
filename : 'export.json',
content : JSON.stringify(responseResult),
- script : 'pulse/dataBrowserExport'
+ script : 'dataBrowserExport'
});
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/9081128b/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowserQueryHistory.js
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowserQueryHistory.js b/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowserQueryHistory.js
index 8da6fe8..77f939e 100644
--- a/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowserQueryHistory.js
+++ b/geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowserQueryHistory.js
@@ -26,7 +26,7 @@ function updateQueryHistory(action,queryId) {
queryId:queryId
};
- $.getJSON("pulse/dataBrowserQueryHistory", requestData, function(data) {
+ $.getJSON("dataBrowserQueryHistory", requestData, function(data) {
var queries = new Array();
if(data.queryHistory != undefined && data.queryHistory != null){
http://git-wip-us.apache.org/repos/asf/geode/blob/9081128b/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 7b483cd..b26e919 100644
--- a/geode-pulse/src/main/webapp/scripts/pulsescript/pages/Login.js
+++ b/geode-pulse/src/main/webapp/scripts/pulsescript/pages/Login.js
@@ -26,7 +26,7 @@ function pageOnLoad(){
// get Pulse Version Details
getPulseVersion();
- $.getJSON("pulse/authenticateUser", function(data) {
+ $.getJSON("authenticateUser", function(data) {
// return isUserLoggedIn
if(data.isUserLoggedIn){
http://git-wip-us.apache.org/repos/asf/geode/blob/9081128b/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 7dee29b..d3b32c4 100644
--- a/geode-pulse/src/main/webapp/scripts/pulsescript/queryStatistics.js
+++ b/geode-pulse/src/main/webapp/scripts/pulsescript/queryStatistics.js
@@ -61,7 +61,7 @@ var customSortFunction = function(cell, rowObject) {
function createQueryStatisticsGrid() {
$.ajax({
- url : 'pulse/getQueryStatisticsGridModel',
+ url : 'getQueryStatisticsGridModel',
type : 'GET',
dataType : 'json',
async : false,
http://git-wip-us.apache.org/repos/asf/geode/blob/9081128b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/ServerRule.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/ServerRule.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/ServerRule.java
index 308489c..7822caa 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/ServerRule.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/ServerRule.java
@@ -30,8 +30,8 @@ import java.io.InputStream;
import java.util.Properties;
public class ServerRule extends ExternalResource {
- public static final String LOCALHOST = "localhost";
- public static final String PULSE_CONTEXT = "/pulse";
+ private static final String LOCALHOST = "localhost";
+ private static final String PULSE_CONTEXT = "/pulse/";
private org.eclipse.jetty.server.Server jetty;
private Server server;
http://git-wip-us.apache.org/repos/asf/geode/blob/9081128b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/WebDriverRule.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/WebDriverRule.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/WebDriverRule.java
index 8a4e7f4..4215615 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/WebDriverRule.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/rules/WebDriverRule.java
@@ -59,7 +59,7 @@ public class WebDriverRule extends ExternalResource {
@Override
protected void before() throws Throwable {
setUpWebDriver();
- driver.get(getPulseURL());
+ driver.get(getPulseURL() + "Login.html");
if (StringUtils.isNotBlank(username) && StringUtils.isNotBlank(password)) {
login();
}
@@ -78,7 +78,7 @@ public class WebDriverRule extends ExternalResource {
passwordElement.sendKeys(password);
passwordElement.submit();
- driver.get(getPulseURL() + "/clusterDetail.html");
+ driver.get(getPulseURL() + "clusterDetail.html");
WebElement userNameOnPulsePage =
(new WebDriverWait(driver, 10)).until(new ExpectedCondition<WebElement>() {
@Override
http://git-wip-us.apache.org/repos/asf/geode/blob/9081128b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java
index 680b11f..b37551b 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java
@@ -48,12 +48,12 @@ public class PulseAnonymousUserTest {
@Before
public void setup() {
- webDriverRule.getDriver().get(serverRule.getPulseURL() + "/clusterDetail.html");
+ webDriverRule.getDriver().get(serverRule.getPulseURL() + "clusterDetail.html");
}
@Test
public void userCanGetToPulseLoginPage() {
- webDriverRule.getDriver().get(serverRule.getPulseURL() + "/Login.html");
+ webDriverRule.getDriver().get(serverRule.getPulseURL() + "Login.html");
WebElement userNameElement = webDriverRule.getDriver().findElement(By.id("user_name"));
WebElement passwordElement = webDriverRule.getDriver().findElement(By.id("user_password"));
@@ -64,7 +64,7 @@ public class PulseAnonymousUserTest {
@Test
public void userCannotGetToPulseDetails() {
- webDriverRule.getDriver().get(serverRule.getPulseURL() + "/pulse/pulseVersion");
+ webDriverRule.getDriver().get(serverRule.getPulseURL() + "pulseVersion");
assertThat(webDriverRule.getDriver().getPageSource()).doesNotContain("sourceRevision");
}
http://git-wip-us.apache.org/repos/asf/geode/blob/9081128b/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 72bd6a7..b19416c 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
@@ -74,6 +74,7 @@ public class PulseAutomatedTest extends PulseBase {
@Before
public void setupPulseTestUtils() {
PulseTestUtils.setDriverProvider(() -> webDriverRule.getDriver());
+ getWebDriver().get(getPulseURL() + "clusterDetail.html");
}
@Test
http://git-wip-us.apache.org/repos/asf/geode/blob/9081128b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseBase.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseBase.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseBase.java
index 25bdef0..9754839 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseBase.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseBase.java
@@ -876,8 +876,8 @@ public abstract class PulseBase {
}
@Test
- public void userCannotGetToPulseDetails() {
- getWebDriver().get(getPulseURL() + "/pulse/pulseVersion");
+ public void userCanGetToPulseDetails() {
+ getWebDriver().get(getPulseURL() + "pulseVersion");
assertTrue(getWebDriver().getPageSource().contains("sourceRevision"));
}