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/security/users UserManagerPortlet.java
Date Tue, 26 Apr 2005 23:17:33 GMT
taylor      2005/04/26 16:17:33

  Modified:    applications/pam/src/java/org/apache/jetspeed/portlets/site
                        SiteBrowserPortlet.java SiteDetailsPortlet.java
                        SiteDetailPortlet.java
               applications/pam/src/java/org/apache/jetspeed/portlets/security/users
                        UserManagerPortlet.java
  Log:
  centralizing all references to CPS_
  
  Revision  Changes    Path
  1.8       +3 -2      jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/site/SiteBrowserPortlet.java
  
  Index: SiteBrowserPortlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/site/SiteBrowserPortlet.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- SiteBrowserPortlet.java	3 Dec 2004 04:26:51 -0000	1.7
  +++ SiteBrowserPortlet.java	26 Apr 2005 23:17:33 -0000	1.8
  @@ -27,6 +27,7 @@
   import javax.portlet.RenderRequest;
   import javax.portlet.RenderResponse;
   
  +import org.apache.jetspeed.CommonPortletServices;
   import org.apache.jetspeed.om.folder.Folder;
   import org.apache.jetspeed.om.folder.FolderNotFoundException;
   import org.apache.jetspeed.om.folder.InvalidFolderException;
  @@ -59,7 +60,7 @@
       {
           super.init(config);
           context = getPortletContext();
  -        pageManager = (PageManager) context.getAttribute(PortletApplicationResources.CPS_PAGE_MANAGER_COMPONENT);
  +        pageManager = (PageManager) context.getAttribute(CommonPortletServices.CPS_PAGE_MANAGER_COMPONENT);
           if (null == pageManager) { throw new PortletException(
                   "Failed to find the Page Manager on portlet initialization"); }
       }
  
  
  
  1.4       +3 -2      jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/site/SiteDetailsPortlet.java
  
  Index: SiteDetailsPortlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/site/SiteDetailsPortlet.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SiteDetailsPortlet.java	3 Dec 2004 04:27:02 -0000	1.3
  +++ SiteDetailsPortlet.java	26 Apr 2005 23:17:33 -0000	1.4
  @@ -27,6 +27,7 @@
   import javax.portlet.RenderRequest;
   import javax.portlet.RenderResponse;
   
  +import org.apache.jetspeed.CommonPortletServices;
   import org.apache.jetspeed.page.PageManager;
   import org.apache.jetspeed.portlets.pam.PortletApplicationResources;
   import org.apache.portals.bridges.frameworks.VelocityFrameworkPortlet;
  @@ -49,7 +50,7 @@
       {
           super.init(config);        
           PortletContext context = getPortletContext();
  -        pageManager = (PageManager) context.getAttribute(PortletApplicationResources.CPS_PAGE_MANAGER_COMPONENT);
  +        pageManager = (PageManager) context.getAttribute(CommonPortletServices.CPS_PAGE_MANAGER_COMPONENT);
           if (null == pageManager) { throw new PortletException(
                   "Failed to find the Page Manager on portlet initialization"); }
   
  
  
  
  1.10      +3 -2      jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/site/SiteDetailPortlet.java
  
  Index: SiteDetailPortlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/site/SiteDetailPortlet.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- SiteDetailPortlet.java	22 Dec 2004 17:49:18 -0000	1.9
  +++ SiteDetailPortlet.java	26 Apr 2005 23:17:33 -0000	1.10
  @@ -27,6 +27,7 @@
   import javax.portlet.RenderRequest;
   import javax.portlet.RenderResponse;
   
  +import org.apache.jetspeed.CommonPortletServices;
   import org.apache.jetspeed.om.folder.Folder;
   import org.apache.jetspeed.om.folder.FolderNotFoundException;
   import org.apache.jetspeed.om.folder.InvalidFolderException;
  @@ -58,7 +59,7 @@
       {
           super.init(config);
           context = getPortletContext();                
  -        pageManager = (PageManager)context.getAttribute(PortletApplicationResources.CPS_PAGE_MANAGER_COMPONENT);
  +        pageManager = (PageManager)context.getAttribute(CommonPortletServices.CPS_PAGE_MANAGER_COMPONENT);
           if (null == pageManager)
           {
               throw new PortletException("Failed to find the Page Manager on portlet initialization");
  
  
  
  1.9       +3 -3      jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/security/users/UserManagerPortlet.java
  
  Index: UserManagerPortlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/security/users/UserManagerPortlet.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- UserManagerPortlet.java	8 Mar 2005 04:28:25 -0000	1.8
  +++ UserManagerPortlet.java	26 Apr 2005 23:17:33 -0000	1.9
  @@ -23,7 +23,7 @@
   import javax.portlet.PortletException;
   import javax.security.auth.Subject;
   
  -import org.apache.jetspeed.portlets.pam.PortletApplicationResources;
  +import org.apache.jetspeed.CommonPortletServices;
   import org.apache.jetspeed.security.SecurityException;
   import org.apache.jetspeed.security.User;
   import org.apache.jetspeed.security.UserManager;
  @@ -42,7 +42,7 @@
   	public void init(PortletConfig config) throws PortletException {
   		super.init(config);
   		userManager = (UserManager) getPortletContext().getAttribute(
  -				PortletApplicationResources.CPS_USER_MANAGER_COMPONENT);
  +                CommonPortletServices.CPS_USER_MANAGER_COMPONENT);
   		if (null == userManager) {
   			throw new PortletException(
   					"Failed to find the User Manager on portlet initialization");
  
  
  

---------------------------------------------------------------------
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