weaver 2004/08/01 08:44:35
Modified: portal/src/java/org/apache/jetspeed/deployment/impl
DeployPortletAppEventListener.java
Log:
No takes a PortletFactory as a dep
Revision Changes Path
1.16 +7 -6
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java
Index: DeployPortletAppEventListener.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DeployPortletAppEventListener.java 9 Jul 2004 18:27:45 -0000 1.15
+++ DeployPortletAppEventListener.java 1 Aug 2004 15:44:35 -0000 1.16
@@ -20,7 +20,7 @@
import org.apache.jetspeed.deployment.DeploymentEventListener;
import org.apache.jetspeed.deployment.DeploymentException;
import org.apache.jetspeed.deployment.DeploymentObject;
-import org.apache.jetspeed.factory.JetspeedPortletFactory;
+import org.apache.jetspeed.factory.PortletFactory;
import org.apache.jetspeed.tools.pamanager.PortletApplicationException;
import org.apache.jetspeed.tools.pamanager.PortletApplicationManagement;
import org.apache.jetspeed.util.DirectoryHelper;
@@ -49,6 +49,7 @@
private PortletApplicationManagement pam;
private Map appNameToFile;
protected PortletRegistryComponent registry;
+ private PortletFactory portletFactory;
/**
@@ -60,10 +61,10 @@
* the <code>webAppDir</code> directory does not exist.
*/
public DeployPortletAppEventListener( String webAppDir,
PortletApplicationManagement pam,
- PortletRegistryComponent registry ) throws FileNotFoundException
+ PortletRegistryComponent registry, PortletFactory portletFactory )
throws FileNotFoundException
{
File checkFile = new File(webAppDir);
-
+ this.portletFactory = portletFactory;
if (checkFile.exists())
{
@@ -213,8 +214,8 @@
// undeploy works correctly
appNameToFile.put(deploymentObj.getPath(), id);
if (isLocal)
- {
-
JetspeedPortletFactory.addClassLoader(paWar.createClassloader(getClass().getClassLoader()));
+ {
+
portletFactory.addClassLoader(paWar.createClassloader(getClass().getClassLoader()));
}
return;
}
@@ -228,7 +229,7 @@
{
log.info(fileName + " will be registered as a local portlet
applicaiton.");
pam.register(paWar);
-
JetspeedPortletFactory.addClassLoader(paWar.createClassloader(getClass().getClassLoader()));
+
portletFactory.addClassLoader(paWar.createClassloader(getClass().getClassLoader()));
}
else
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
