You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2005/04/27 01:17:18 UTC

cvs commit: jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/profiler ProfileRulesExtent.java ProfilerAdminPortlet.java ProfileRuleForm.java ProfileCriterionForm.java

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