geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jinmeil...@apache.org
Subject [2/2] geode git commit: GEODE-2194: Fix Pulse webapp context
Date Thu, 12 Jan 2017 22:58:23 GMT
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 <jstewart@pivotal.io>
Authored: Tue Jan 10 10:53:49 2017 -0800
Committer: Jinmei Liao <jiliao@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"));
   }


Mime
View raw message