You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chukwa.apache.org by ey...@apache.org on 2009/05/12 18:51:22 UTC
svn commit: r773975 - in /hadoop/chukwa:
branches/chukwa-0.1/src/web/hicc/js/workspace/
branches/chukwa-0.1/src/web/hicc/jsp/ trunk/src/web/hicc/js/workspace/
trunk/src/web/hicc/jsp/
Author: eyang
Date: Tue May 12 16:51:21 2009
New Revision: 773975
URL: http://svn.apache.org/viewvc?rev=773975&view=rev
Log:
CHUKWA-223. Renamed read only session caching object to cache.*, and skip those values for caching. (Eric Yang)
Modified:
hadoop/chukwa/branches/chukwa-0.1/src/web/hicc/js/workspace/workspace.js
hadoop/chukwa/branches/chukwa-0.1/src/web/hicc/jsp/host_selector_dropdown.jsp
hadoop/chukwa/branches/chukwa-0.1/src/web/hicc/jsp/permlink.jsp
hadoop/chukwa/trunk/src/web/hicc/js/workspace/workspace.js
hadoop/chukwa/trunk/src/web/hicc/jsp/host_selector_dropdown.jsp
hadoop/chukwa/trunk/src/web/hicc/jsp/permlink.jsp
Modified: hadoop/chukwa/branches/chukwa-0.1/src/web/hicc/js/workspace/workspace.js
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.1/src/web/hicc/js/workspace/workspace.js?rev=773975&r1=773974&r2=773975&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.1/src/web/hicc/js/workspace/workspace.js (original)
+++ hadoop/chukwa/branches/chukwa-0.1/src/web/hicc/js/workspace/workspace.js Tue May 12 16:51:21 2009
@@ -3221,7 +3221,7 @@
{
asynchronous: false,
method: 'get',
- parameters: "cluster="+cluster+"&_delete=machine_names"
+ parameters: "cluster="+cluster+"&_delete=cache.machine_names"
}
);
if (myAjax.success()) {
Modified: hadoop/chukwa/branches/chukwa-0.1/src/web/hicc/jsp/host_selector_dropdown.jsp
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.1/src/web/hicc/jsp/host_selector_dropdown.jsp?rev=773975&r1=773974&r2=773975&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.1/src/web/hicc/jsp/host_selector_dropdown.jsp (original)
+++ hadoop/chukwa/branches/chukwa-0.1/src/web/hicc/jsp/host_selector_dropdown.jsp Tue May 12 16:51:21 2009
@@ -40,8 +40,8 @@
<select id="<%= boxId %>group_items" name="<%= boxId %>group_items" MULTIPLE size=10 class="formSelect" style="width:200px;">
<%
JSONArray machineNames = null;
- if(session.getAttribute("machine_names")!=null) {
- machineNames = new JSONArray(session.getAttribute("machine_names").toString());
+ if(session.getAttribute("cache.machine_names")!=null) {
+ machineNames = new JSONArray(session.getAttribute("cache.machine_names").toString());
}
String cluster=xf.getParameter("cluster");
if(cluster!=null && !cluster.equals("null")) {
@@ -108,7 +108,7 @@
i++;
}
if(jobId==null || jobId.equals("null") || jobId.equals("")) {
- session.setAttribute("machine_names",machineNames.toString());
+ session.setAttribute("cache.machine_names",machineNames.toString());
}
}
} else {
Modified: hadoop/chukwa/branches/chukwa-0.1/src/web/hicc/jsp/permlink.jsp
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.1/src/web/hicc/jsp/permlink.jsp?rev=773975&r1=773974&r2=773975&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.1/src/web/hicc/jsp/permlink.jsp (original)
+++ hadoop/chukwa/branches/chukwa-0.1/src/web/hicc/jsp/permlink.jsp Tue May 12 16:51:21 2009
@@ -37,7 +37,9 @@
StringBuffer buf = new StringBuffer();
for (Enumeration e = session.getAttributeNames() ; e.hasMoreElements() ;) {
String name = (String) e.nextElement();
- buf.append("_session."+name+"="+URLEncoder.encode(session.getAttribute(name).toString(),"UTF-8"));
+ if(name.indexOf("_session.cache.")==-1) {
+ buf.append("_session."+name+"="+URLEncoder.encode(session.getAttribute(name).toString(),"UTF-8"));
+ }
buf.append("&");
}
out.println(buf.toString());
Modified: hadoop/chukwa/trunk/src/web/hicc/js/workspace/workspace.js
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/js/workspace/workspace.js?rev=773975&r1=773974&r2=773975&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/js/workspace/workspace.js (original)
+++ hadoop/chukwa/trunk/src/web/hicc/js/workspace/workspace.js Tue May 12 16:51:21 2009
@@ -3221,7 +3221,7 @@
{
asynchronous: false,
method: 'get',
- parameters: "cluster="+cluster+"&_delete=machine_names"
+ parameters: "cluster="+cluster+"&_delete=cache.machine_names"
}
);
if (myAjax.success()) {
Modified: hadoop/chukwa/trunk/src/web/hicc/jsp/host_selector_dropdown.jsp
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/jsp/host_selector_dropdown.jsp?rev=773975&r1=773974&r2=773975&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/jsp/host_selector_dropdown.jsp (original)
+++ hadoop/chukwa/trunk/src/web/hicc/jsp/host_selector_dropdown.jsp Tue May 12 16:51:21 2009
@@ -40,8 +40,8 @@
<select id="<%= boxId %>group_items" name="<%= boxId %>group_items" MULTIPLE size=10 class="formSelect" style="width:200px;">
<%
JSONArray machineNames = null;
- if(session.getAttribute("machine_names")!=null) {
- machineNames = new JSONArray(session.getAttribute("machine_names").toString());
+ if(session.getAttribute("cache.machine_names")!=null) {
+ machineNames = new JSONArray(session.getAttribute("cache.machine_names").toString());
}
String cluster=xf.getParameter("cluster");
if(cluster!=null && !cluster.equals("null")) {
@@ -108,7 +108,7 @@
i++;
}
if(jobId==null || jobId.equals("null") || jobId.equals("")) {
- session.setAttribute("machine_names",machineNames.toString());
+ session.setAttribute("cache.machine_names",machineNames.toString());
}
}
} else {
Modified: hadoop/chukwa/trunk/src/web/hicc/jsp/permlink.jsp
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/jsp/permlink.jsp?rev=773975&r1=773974&r2=773975&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/jsp/permlink.jsp (original)
+++ hadoop/chukwa/trunk/src/web/hicc/jsp/permlink.jsp Tue May 12 16:51:21 2009
@@ -37,7 +37,9 @@
StringBuffer buf = new StringBuffer();
for (Enumeration e = session.getAttributeNames() ; e.hasMoreElements() ;) {
String name = (String) e.nextElement();
- buf.append("_session."+name+"="+URLEncoder.encode(session.getAttribute(name).toString(),"UTF-8"));
+ if(name.indexOf("_session.cache.")==-1) {
+ buf.append("_session."+name+"="+URLEncoder.encode(session.getAttribute(name).toString(),"UTF-8"));
+ }
buf.append("&");
}
out.println(buf.toString());