weaver 2004/08/01 08:53:34
Modified: fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager
FusionPAM.java FusionAppServerPAM.java
Log:
Changes due to refactoring of portlet factory and cache
Revision Changes Path
1.8 +5 -4
jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager/FusionPAM.java
Index: FusionPAM.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager/FusionPAM.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FusionPAM.java 23 Jul 2004 07:43:27 -0000 1.7
+++ FusionPAM.java 1 Aug 2004 15:53:34 -0000 1.8
@@ -22,6 +22,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.Jetspeed;
+import org.apache.jetspeed.cache.PortletCache;
import org.apache.jetspeed.components.persistence.store.PersistenceStore;
import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
@@ -41,10 +42,10 @@
import org.apache.jetspeed.services.PsmlManager;
import org.apache.jetspeed.services.Registry;
import org.apache.jetspeed.tools.pamanager.Deployment;
+import org.apache.jetspeed.tools.pamanager.DeploymentRegistration;
import org.apache.jetspeed.tools.pamanager.FileSystemPAM;
import org.apache.jetspeed.tools.pamanager.PortletApplicationException;
import org.apache.jetspeed.tools.pamanager.Registration;
-import org.apache.jetspeed.tools.pamanager.DeploymentRegistration;
import org.apache.jetspeed.util.FileSystemHelper;
import org.apache.jetspeed.util.descriptor.PortletApplicationWar;
import org.apache.pluto.om.common.Description;
@@ -82,9 +83,9 @@
private static final String JS1_REFERENCE_TYPE = "ref";
- public FusionPAM(String webAppsDir, PortletRegistryComponent registry,
PortletEntityAccessComponent entityAccess, PortletWindowAccessor windowAccess)
+ public FusionPAM(String webAppsDir, PortletRegistryComponent registry,
PortletEntityAccessComponent entityAccess, PortletWindowAccessor windowAccess,
PortletCache portletCache)
{
- super(webAppsDir, registry, entityAccess, windowAccess);
+ super(webAppsDir, registry, entityAccess, windowAccess, portletCache);
initJetspeedOne(null);
}
1.6 +4 -3
jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager/FusionAppServerPAM.java
Index: FusionAppServerPAM.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager/FusionAppServerPAM.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FusionAppServerPAM.java 23 Jul 2004 07:06:54 -0000 1.5
+++ FusionAppServerPAM.java 1 Aug 2004 15:53:34 -0000 1.6
@@ -20,6 +20,7 @@
import org.apache.commons.httpclient.HttpException;
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;
@@ -50,9 +51,9 @@
public FusionAppServerPAM( String webAppsDir, PortletRegistryComponent
registry,
PortletEntityAccessComponent entityAccess, PortletWindowAccessor
windowAccess,
- ApplicationServerManager appServerManager )
+ ApplicationServerManager appServerManager, PortletCache portletCache )
{
- super(webAppsDir, registry, entityAccess, windowAccess);
+ super(webAppsDir, registry, entityAccess, windowAccess, portletCache);
ArgUtil.assertNotNull(ApplicationServerManager.class, appServerManager,
this);
this.appServerManager = appServerManager;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
