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 we...@apache.org on 2004/07/02 16:45:52 UTC
cvs commit: jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager FusionPAM.java
weaver 2004/07/02 07:45:51
Modified: fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager
FusionPAM.java
Log:
Changes due to refactoring of PAM.
Revision Changes Path
1.2 +15 -16 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FusionPAM.java 26 Jun 2004 01:23:40 -0000 1.1
+++ FusionPAM.java 2 Jul 2004 14:45:51 -0000 1.2
@@ -18,15 +18,16 @@
import java.util.Collection;
import java.util.Enumeration;
import java.util.Iterator;
-import java.util.Locale;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.commons.vfs.FileSystemManager;
import org.apache.jetspeed.Jetspeed;
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.container.window.PortletWindowAccessor;
import org.apache.jetspeed.fusion.services.resources.FusionResources;
-
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.profile.Entry;
import org.apache.jetspeed.om.profile.PSMLDocument;
@@ -43,12 +44,12 @@
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.util.descriptor.PortletApplicationWar;
import org.apache.pluto.om.common.Description;
import org.apache.pluto.om.common.DisplayName;
import org.apache.pluto.om.common.Language;
import org.apache.pluto.om.portlet.ContentType;
import org.apache.pluto.om.portlet.PortletDefinition;
-
import org.apache.turbine.util.TurbineConfig;
//import org.apache.regexp.RE;
@@ -77,9 +78,9 @@
private static final String JS1_REFERENCE_TYPE = "ref";
- public FusionPAM(PortletRegistryComponent registry, Locale defaultLocale)
+ public FusionPAM(String webAppsDir, PortletRegistryComponent registry, FileSystemManager fsManager, PortletEntityAccessComponent entityAccess, PortletWindowAccessor windowAccess)
{
- super(registry, defaultLocale);
+ super(webAppsDir, registry, fsManager, entityAccess, windowAccess);
initJetspeedOne(null);
}
@@ -153,17 +154,13 @@
*/
}
- public void deploy(String webAppsDir,
- String warFile,
- String paName)
+ public void deploy(PortletApplicationWar paWar)
throws PortletApplicationException
{
- System.out.println("***** Deploying now...." + warFile);
- super.deploy(webAppsDir, warFile, paName);
-
- //FIXME: This could be a protected member from FileSystemPAM
- PortletRegistryComponent registry = (PortletRegistryComponent) Jetspeed.getComponentManager().getComponent(PortletRegistryComponent.class);
+ // System.out.println("***** Deploying now...." + paWar.);
+ super.deploy(paWar);
+
//create xreg
PersistenceStore store = registry.getPersistenceStore();
try
@@ -173,6 +170,7 @@
store.getTransaction().begin();
log.info("Saving the portlet.xml in the J1 registry...");
+ String paName = paWar.getPortletApplicationName();
MutablePortletApplication app = registry.getPortletApplication(paName);
Collection pds = app.getPortletDefinitions();
@@ -329,8 +327,9 @@
return entry;
}
- public void undeploy( String webAppsDir, String paName ) throws PortletApplicationException
+ public void undeploy( PortletApplicationWar paWar ) throws PortletApplicationException
{
+ String paName = paWar.getPortletApplicationName();
System.out.println("***** UN Deploying now...." + paName);
PortletRegistryComponent registry = (PortletRegistryComponent) Jetspeed.getComponentManager().getComponent(PortletRegistryComponent.class);
@@ -363,7 +362,7 @@
}
//TurbineServices.getInstance().shutdownServices();
- super.undeploy(webAppsDir, paName);
+ super.undeploy(paWar);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org