Return-Path: Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org Received: (qmail 80409 invoked from network); 26 Apr 2005 23:17:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 26 Apr 2005 23:17:22 -0000 Received: (qmail 10720 invoked by uid 500); 26 Apr 2005 23:18:08 -0000 Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org Received: (qmail 10690 invoked by uid 500); 26 Apr 2005 23:18:08 -0000 Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Jetspeed Developers List" Delivered-To: mailing list jetspeed-dev@portals.apache.org Received: (qmail 10676 invoked by uid 500); 26 Apr 2005 23:18:08 -0000 Delivered-To: apmail-jakarta-jetspeed-dev@jakarta.apache.org Received: (qmail 10673 invoked by uid 500); 26 Apr 2005 23:18:08 -0000 Delivered-To: apmail-jakarta-jetspeed-cvs@jakarta.apache.org Received: (qmail 10669 invoked by uid 500); 26 Apr 2005 23:18:07 -0000 Delivered-To: apmail-jakarta-jetspeed-2-cvs@apache.org Received: (qmail 10666 invoked by uid 99); 26 Apr 2005 23:18:07 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 26 Apr 2005 16:18:07 -0700 Received: (qmail 80403 invoked by uid 1265); 26 Apr 2005 23:17:18 -0000 Date: 26 Apr 2005 23:17:18 -0000 Message-ID: <20050426231718.80402.qmail@minotaur.apache.org> From: taylor@apache.org To: jakarta-jetspeed-2-cvs@apache.org Subject: cvs commit: jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/profiler ProfileRulesExtent.java ProfilerAdminPortlet.java ProfileRuleForm.java ProfileCriterionForm.java X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N taylor 2005/04/26 16:17:18 Modified: applications/pam/src/java/org/apache/jetspeed/portlets/profiler ProfileRulesExtent.java ProfilerAdminPortlet.java ProfileRuleForm.java ProfileCriterionForm.java Log: centralizing all references to CPS_ Revision Changes Path 1.3 +3 -3 jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/profiler/ProfileRulesExtent.java Index: ProfileRulesExtent.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/profiler/ProfileRulesExtent.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ProfileRulesExtent.java 21 Oct 2004 01:45:50 -0000 1.2 +++ ProfileRulesExtent.java 26 Apr 2005 23:17:18 -0000 1.3 @@ -22,7 +22,7 @@ import javax.faces.context.FacesContext; -import org.apache.jetspeed.portlets.pam.PortletApplicationResources; +import org.apache.jetspeed.CommonPortletServices; import org.apache.jetspeed.profiler.Profiler; /** @@ -37,7 +37,7 @@ public Collection getExtent() { Map appMap = (Map)FacesContext.getCurrentInstance().getExternalContext().getApplicationMap(); - Profiler profiler = (Profiler)appMap.get(PortletApplicationResources.CPS_PROFILER_COMPONENT); + Profiler profiler = (Profiler)appMap.get(CommonPortletServices.CPS_PROFILER_COMPONENT); return profiler.getRules(); // TODO: optimize with cache } } 1.5 +3 -3 jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/profiler/ProfilerAdminPortlet.java Index: ProfilerAdminPortlet.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/profiler/ProfilerAdminPortlet.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ProfilerAdminPortlet.java 8 Mar 2005 04:28:25 -0000 1.4 +++ ProfilerAdminPortlet.java 26 Apr 2005 23:17:18 -0000 1.5 @@ -18,7 +18,7 @@ import javax.portlet.PortletConfig; import javax.portlet.PortletException; -import org.apache.jetspeed.portlets.pam.PortletApplicationResources; +import org.apache.jetspeed.CommonPortletServices; import org.apache.jetspeed.profiler.Profiler; import org.apache.portals.bridges.jsf.FacesPortlet; @@ -38,7 +38,7 @@ { super.init(config); profiler = (Profiler) getPortletContext().getAttribute( - PortletApplicationResources.CPS_PROFILER_COMPONENT); + CommonPortletServices.CPS_PROFILER_COMPONENT); if (null == profiler) { throw new PortletException("Failed to find the Profiler on portlet initialization"); 1.3 +3 -3 jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/profiler/ProfileRuleForm.java Index: ProfileRuleForm.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/profiler/ProfileRuleForm.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ProfileRuleForm.java 21 Oct 2004 01:45:50 -0000 1.2 +++ ProfileRuleForm.java 26 Apr 2005 23:17:18 -0000 1.3 @@ -23,7 +23,7 @@ import javax.faces.event.ActionEvent; import javax.faces.model.SelectItem; -import org.apache.jetspeed.portlets.pam.PortletApplicationResources; +import org.apache.jetspeed.CommonPortletServices; import org.apache.jetspeed.profiler.Profiler; import org.apache.jetspeed.profiler.ProfilerException; import org.apache.jetspeed.profiler.rules.ProfilingRule; @@ -58,7 +58,7 @@ public void listen(ActionEvent event) { Map appMap = (Map)FacesContext.getCurrentInstance().getExternalContext().getApplicationMap(); - profiler = (Profiler)appMap.get(PortletApplicationResources.CPS_PROFILER_COMPONENT); + profiler = (Profiler)appMap.get(CommonPortletServices.CPS_PROFILER_COMPONENT); Map params = (Map)FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap(); String selected = (String)params.get("selectedRule"); if (selected != null && profiler != null) 1.4 +3 -3 jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/profiler/ProfileCriterionForm.java Index: ProfileCriterionForm.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/profiler/ProfileCriterionForm.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ProfileCriterionForm.java 3 Nov 2004 19:20:24 -0000 1.3 +++ ProfileCriterionForm.java 26 Apr 2005 23:17:18 -0000 1.4 @@ -23,7 +23,7 @@ import javax.faces.event.ActionEvent; import javax.faces.model.SelectItem; -import org.apache.jetspeed.portlets.pam.PortletApplicationResources; +import org.apache.jetspeed.CommonPortletServices; import org.apache.jetspeed.profiler.Profiler; import org.apache.jetspeed.profiler.rules.ProfilingRule; import org.apache.jetspeed.profiler.rules.RuleCriterion; @@ -96,7 +96,7 @@ public void listen(ActionEvent event) { Map appMap = (Map)FacesContext.getCurrentInstance().getExternalContext().getApplicationMap(); - profiler = (Profiler)appMap.get(PortletApplicationResources.CPS_PROFILER_COMPONENT); + profiler = (Profiler)appMap.get(CommonPortletServices.CPS_PROFILER_COMPONENT); Map params = (Map)FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap(); String selectedRule = (String)params.get("selectedRule"); --------------------------------------------------------------------- To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org For additional commands, e-mail: jetspeed-dev-help@portals.apache.org