taylor 2004/08/03 20:57:08
Modified: portal/src/test/org/apache/jetspeed/deployment
TestSimpleDeployment.java
Log:
adjust Simple Deployment test to match FileSystemPAM new constructor
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
1.17 +11 -6
jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/deployment/TestSimpleDeployment.java
Index: TestSimpleDeployment.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/deployment/TestSimpleDeployment.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TestSimpleDeployment.java 1 Aug 2004 15:50:23 -0000 1.16
+++ TestSimpleDeployment.java 4 Aug 2004 03:57:08 -0000 1.17
@@ -38,6 +38,8 @@
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.common.portlet.MutablePortletEntity;
import org.apache.jetspeed.tools.pamanager.FileSystemPAM;
+import
org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager;
+import org.apache.jetspeed.tools.pamanager.servletcontainer.TomcatManager;
import org.apache.jetspeed.util.DirectoryHelper;
import org.apache.jetspeed.util.JarHelper;
import org.apache.jetspeed.util.descriptor.PortletApplicationWar;
@@ -72,7 +74,7 @@
protected PortletWindowAccessor windowAccess;
protected PortletCache portletCache;
protected PortletFactory portletFactory;
-
+ protected ApplicationServerManager manager;
/**
@@ -141,13 +143,13 @@
{
System.out.println("Deployment src: " + deploySrc);
-
+ manager = new TomcatManager("", 0, "", "");
SimpleRegistry simpleRegistry = new InMemoryRegistryImpl();
DeployDecoratorEventListener ddel = new
DeployDecoratorEventListener(simpleRegistry, deployRootFile
.getAbsolutePath());
DeployPortletAppEventListener dpal = new
DeployPortletAppEventListener(webAppsDir, new FileSystemPAM(
- webAppsDir, portletRegistry, entityAccess, windowAccess,
portletCache), portletRegistry, portletFactory );
+ webAppsDir, portletRegistry, entityAccess, windowAccess,
portletCache, manager), portletRegistry, portletFactory );
ArrayList eventListeners = new ArrayList(2);
eventListeners.add(ddel);
eventListeners.add(dpal);
@@ -242,8 +244,10 @@
public void testUndeployVersusRedeploy() throws Exception
{
+ manager = new TomcatManager("", 0, "", "");
+
DeployPortletAppEventListener dpal = new
DeployPortletAppEventListener(webAppsDir, new FileSystemPAM(
- webAppsDir, portletRegistry, entityAccess, windowAccess,
portletCache), portletRegistry, portletFactory );
+ webAppsDir, portletRegistry, entityAccess, windowAccess,
portletCache, manager), portletRegistry, portletFactory );
ArrayList eventListeners = new ArrayList(1);
eventListeners.add(dpal);
@@ -457,7 +461,8 @@
*/
public void tearDown() throws Exception
{
- FileSystemPAM pam = new FileSystemPAM(webAppsDir, portletRegistry,
entityAccess, windowAccess, portletCache);
+ manager = new TomcatManager("", 0, "", "");
+ FileSystemPAM pam = new FileSystemPAM(webAppsDir, portletRegistry,
entityAccess, windowAccess, portletCache, manager);
try
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
