portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/pam PortletApplicationBrowser.java PortletApplicationDetail.java PortletApplicationResources.java
Date Tue, 26 Apr 2005 23:17:02 GMT
taylor      2005/04/26 16:17:02

  Modified:    applications/pam/src/java/org/apache/jetspeed/portlets/pam
                        PortletApplicationBrowser.java
                        PortletApplicationDetail.java
                        PortletApplicationResources.java
  Log:
  centralizing all references to CPS_
  
  Revision  Changes    Path
  1.20      +9 -4      jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/pam/PortletApplicationBrowser.java
  
  Index: PortletApplicationBrowser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/pam/PortletApplicationBrowser.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- PortletApplicationBrowser.java	22 Dec 2004 17:49:18 -0000	1.19
  +++ PortletApplicationBrowser.java	26 Apr 2005 23:17:01 -0000	1.20
  @@ -30,6 +30,7 @@
   import javax.portlet.RenderRequest;
   import javax.portlet.RenderResponse;
   
  +import org.apache.jetspeed.CommonPortletServices;
   import org.apache.jetspeed.components.portletregistry.PortletRegistry;
   import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
   import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
  @@ -62,12 +63,16 @@
       {
           super.init(config);
           context = getPortletContext();                
  -        registry = (PortletRegistry)context.getAttribute(PortletApplicationResources.CPS_REGISTRY_COMPONENT);
  -        searchEngine = (SearchEngine)context.getAttribute(PortletApplicationResources.CPS_SEARCH_COMPONENT);
  +        registry = (PortletRegistry)context.getAttribute(CommonPortletServices.CPS_REGISTRY_COMPONENT);
           if (null == registry)
           {
               throw new PortletException("Failed to find the Portlet Registry on portlet
initialization");
  -        }
  +        }        
  +        searchEngine = (SearchEngine)context.getAttribute(CommonPortletServices.CPS_SEARCH_COMPONENT);
  +        if (null == searchEngine)
  +        {
  +            throw new PortletException("Failed to find the Search Engine on portlet initialization");
  +        }        
       }
       
       public void doView(RenderRequest request, RenderResponse response)
  
  
  
  1.37      +3 -2      jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/pam/PortletApplicationDetail.java
  
  Index: PortletApplicationDetail.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/pam/PortletApplicationDetail.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- PortletApplicationDetail.java	22 Dec 2004 17:49:18 -0000	1.36
  +++ PortletApplicationDetail.java	26 Apr 2005 23:17:01 -0000	1.37
  @@ -34,6 +34,7 @@
   import javax.portlet.RenderRequest;
   import javax.portlet.RenderResponse;
   
  +import org.apache.jetspeed.CommonPortletServices;
   import org.apache.jetspeed.components.portletregistry.FailedToStorePortletDefinitionException;
   import org.apache.jetspeed.components.portletregistry.PortletRegistry;
   import org.apache.jetspeed.components.portletregistry.RegistryException;
  @@ -82,7 +83,7 @@
       {
           super.init(config);
           context = getPortletContext();
  -        registry = (PortletRegistry)context.getAttribute(PortletApplicationResources.CPS_REGISTRY_COMPONENT);
  +        registry = (PortletRegistry)context.getAttribute(CommonPortletServices.CPS_REGISTRY_COMPONENT);
           if (null == registry)
           {
               throw new PortletException("Failed to find the Portlet Registry on portlet
initialization");
  
  
  
  1.17      +12 -14    jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/pam/PortletApplicationResources.java
  
  Index: PortletApplicationResources.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/pam/PortletApplicationResources.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- PortletApplicationResources.java	23 Mar 2005 22:43:35 -0000	1.16
  +++ PortletApplicationResources.java	26 Apr 2005 23:17:02 -0000	1.17
  @@ -22,19 +22,7 @@
    * @version $Id$
    */
   public interface PortletApplicationResources
  -{
  -    public final static String CPS_SEARCH_COMPONENT = "cps:SearchComponent";
  -    public final static String CPS_REGISTRY_COMPONENT = "cps:PortletRegistryComponent";
  -    public final static String CPS_USER_MANAGER_COMPONENT = "cps:UserManager";
  -    public final static String CPS_PAGE_MANAGER_COMPONENT = "cps:PageManager";
  -    public final static String CPS_ROLE_MANAGER_COMPONENT = "cps:RoleManager";
  -    public final static String CPS_GROUP_MANAGER_COMPONENT = "cps:GroupManager";
  -    public final static String CPS_PROFILER_COMPONENT = "cps:Profiler";
  -    public final static String CPS_SSO_COMPONENT = "cps:SSO";    
  -    public final static String CPS_APPLICATION_SERVER_MANAGER_COMPONENT = "cps:ApplicationServerManager";
  -    public final static String CPS_PORTLET_FACTORY_COMPONENT = "cps:PortletFactory";  
 
  -    public final static String CPS_DEPLOYMENT_MANAGER_COMPONENT = "cps:DeploymentManager";
   
  -    
  +{    
       /** the selected non-leaf node in the tree view */
       public final static String REQUEST_NODE = "node";
       /** the selected leaf node in the tree view */
  @@ -50,4 +38,14 @@
       public final static String REQUEST_SELECT_SITE_TAB = "selected_site_tab";
       public final static String SITE_PORTLET = "SitePortlet";
       
  +    // Message Topics
  +    public final static String TOPIC_PORTLET_SELECTOR = "portlet.selector";
  +    
  +    /** Messages **/
  +    public static final String MESSAGE_SELECTED = "selected";
  +    public static final String MESSAGE_CHANGED = "changed";
  +    public static final String MESSAGE_STATUS = "status";
  +    public static final String MESSAGE_REFRESH = "refresh";
  +    public static final String MESSAGE_FILTERED = "filtered";    
  +    
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message