taylor 2004/08/03 21:52:18
Modified: fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager
FusionPAM.java FusionAppServerPAM.java
Log:
updating fusion for JBoss support
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.10 +9 -3
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FusionPAM.java 3 Aug 2004 05:06:36 -0000 1.9
+++ FusionPAM.java 4 Aug 2004 04:52:18 -0000 1.10
@@ -48,6 +48,7 @@
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.servletcontainer.ApplicationServerManager;
import org.apache.jetspeed.util.FileSystemHelper;
import org.apache.jetspeed.util.descriptor.PortletApplicationWar;
import org.apache.pluto.om.common.Description;
@@ -85,9 +86,14 @@
private static final String JS1_REFERENCE_TYPE = "ref";
- public FusionPAM(String webAppsDir, PortletRegistryComponent registry,
PortletEntityAccessComponent entityAccess, PortletWindowAccessor windowAccess,
PortletCache portletCache)
+ public FusionPAM(String webAppsDir,
+ PortletRegistryComponent registry,
+ PortletEntityAccessComponent entityAccess,
+ PortletWindowAccessor windowAccess,
+ PortletCache portletCache,
+ ApplicationServerManager appServerManager)
{
- super(webAppsDir, registry, entityAccess, windowAccess, portletCache);
+ super(webAppsDir, registry, entityAccess, windowAccess, portletCache,
appServerManager);
initJetspeedOne(null);
}
1.7 +2 -2
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FusionAppServerPAM.java 1 Aug 2004 15:53:34 -0000 1.6
+++ FusionAppServerPAM.java 4 Aug 2004 04:52:18 -0000 1.7
@@ -53,7 +53,7 @@
PortletEntityAccessComponent entityAccess, PortletWindowAccessor
windowAccess,
ApplicationServerManager appServerManager, PortletCache portletCache )
{
- super(webAppsDir, registry, entityAccess, windowAccess, portletCache);
+ super(webAppsDir, registry, entityAccess, windowAccess, portletCache,
appServerManager);
ArgUtil.assertNotNull(ApplicationServerManager.class, appServerManager,
this);
this.appServerManager = appServerManager;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
