Return-Path: Delivered-To: apmail-hadoop-chukwa-commits-archive@minotaur.apache.org Received: (qmail 41883 invoked from network); 12 May 2009 16:51:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 12 May 2009 16:51:48 -0000 Received: (qmail 20949 invoked by uid 500); 12 May 2009 16:51:47 -0000 Delivered-To: apmail-hadoop-chukwa-commits-archive@hadoop.apache.org Received: (qmail 20938 invoked by uid 500); 12 May 2009 16:51:47 -0000 Mailing-List: contact chukwa-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: chukwa-dev@hadoop.apache.org Delivered-To: mailing list chukwa-commits@hadoop.apache.org Received: (qmail 20928 invoked by uid 99); 12 May 2009 16:51:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 May 2009 16:51:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 May 2009 16:51:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8896B23889CF; Tue, 12 May 2009 16:51:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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/ Date: Tue, 12 May 2009 16:51:22 -0000 To: chukwa-commits@hadoop.apache.org From: eyang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090512165122.8896B23889CF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ <% 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());