portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wea...@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager ApplicationServerPAM.java FileSystemPAM.java
Date Sun, 01 Aug 2004 15:49:18 GMT
weaver      2004/08/01 08:49:18

  Modified:    portal/src/java/org/apache/jetspeed/tools/pamanager
                        ApplicationServerPAM.java FileSystemPAM.java
  Log:
  PortletCache is now down in portal, is assmebled as a component and is no longer a staticly
accessible class
  
  Revision  Changes    Path
  1.7       +4 -3      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/ApplicationServerPAM.java
  
  Index: ApplicationServerPAM.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/ApplicationServerPAM.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ApplicationServerPAM.java	23 Jul 2004 02:43:31 -0000	1.6
  +++ ApplicationServerPAM.java	1 Aug 2004 15:49:17 -0000	1.7
  @@ -17,6 +17,7 @@
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  +import org.apache.jetspeed.cache.PortletCache;
   import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
   import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
   import org.apache.jetspeed.container.window.PortletWindowAccessor;
  @@ -55,9 +56,9 @@
        * @param entityAccess
        * @param appServerManager
        */
  -    public ApplicationServerPAM( String webAppsDir, PortletRegistryComponent registry,
PortletEntityAccessComponent entityAccess, PortletWindowAccessor windowAccess, ApplicationServerManager
appServerManager )
  +    public ApplicationServerPAM( String webAppsDir, PortletRegistryComponent registry,
PortletEntityAccessComponent entityAccess, PortletWindowAccessor windowAccess, ApplicationServerManager
appServerManager, PortletCache portletCache )
       {       
  -        super(webAppsDir, registry, entityAccess, windowAccess);
  +        super(webAppsDir, registry, entityAccess, windowAccess, portletCache);
           ArgUtil.assertNotNull(ApplicationServerManager.class, appServerManager, this);
           this.appServerManager = appServerManager;      
       }
  
  
  
  1.38      +6 -5      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/FileSystemPAM.java
  
  Index: FileSystemPAM.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/FileSystemPAM.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- FileSystemPAM.java	23 Jul 2004 05:35:32 -0000	1.37
  +++ FileSystemPAM.java	1 Aug 2004 15:49:18 -0000	1.38
  @@ -27,9 +27,9 @@
   import org.apache.jetspeed.components.persistence.store.PersistenceStore;
   import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
   import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
  -import org.apache.jetspeed.exception.RegistryException;
   import org.apache.jetspeed.container.JetspeedPortletContext;
   import org.apache.jetspeed.container.window.PortletWindowAccessor;
  +import org.apache.jetspeed.exception.RegistryException;
   import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
   import org.apache.jetspeed.om.common.portlet.MutablePortletEntity;
   import org.apache.jetspeed.om.common.servlet.MutableWebApplication;
  @@ -69,9 +69,10 @@
       protected String webAppsDir;
       protected PortletEntityAccessComponent entityAccess;
       protected PortletWindowAccessor windowAccess;
  +    private PortletCache portletCache;
   
       public FileSystemPAM( String webAppsDir, PortletRegistryComponent registry,
  -            PortletEntityAccessComponent entityAccess, PortletWindowAccessor windowAccess
)
  +            PortletEntityAccessComponent entityAccess, PortletWindowAccessor windowAccess,
PortletCache portletCache )
       {
           super();
           ArgUtil.assertNotNull(PortletRegistryComponent.class, registry, this);
  @@ -79,7 +80,7 @@
           this.registry = registry;
           this.entityAccess = entityAccess;
           this.webAppsDir = webAppsDir;
  -
  +        this.portletCache = portletCache;
           this.windowAccess = windowAccess;
       }
   
  @@ -144,7 +145,7 @@
               }
   
               log.info("Removing a portlets from the PortletCache that belong to portlet
application " + paName);
  -            PortletCache.removeAll(app);
  +            portletCache.removeAll(app);
   
               // remove entries from the registry
               log.info("Remove all registry entries defined for portlet application " + paName);
  
  
  

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


Mime
View raw message