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 ta...@apache.org on 2004/06/10 01:15:31 UTC
cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/deployment/impl CatalinaAutoDeploymentServiceImpl.java
taylor 2004/06/09 16:15:31
Modified: portal/src/java/org/apache/jetspeed/deployment/impl
CatalinaAutoDeploymentServiceImpl.java
Log:
optional parameter to override PAM used with Auto Deployer
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.7 +8 -4 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/deployment/impl/CatalinaAutoDeploymentServiceImpl.java
Index: CatalinaAutoDeploymentServiceImpl.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/deployment/impl/CatalinaAutoDeploymentServiceImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CatalinaAutoDeploymentServiceImpl.java 21 May 2004 18:31:36 -0000 1.6
+++ CatalinaAutoDeploymentServiceImpl.java 9 Jun 2004 23:15:31 -0000 1.7
@@ -24,6 +24,8 @@
import org.apache.jetspeed.deployment.fs.FileSystemScanner;
import org.apache.jetspeed.deployment.fs.JARObjectHandlerImpl;
import org.apache.jetspeed.tools.pamanager.CatalinaPAM;
+import org.apache.jetspeed.tools.pamanager.Deployment;
+import org.apache.jetspeed.tools.pamanager.PortletApplicationManagement;
/**
* <p>
@@ -117,16 +119,18 @@
try
{
- CatalinaPAM catPAM = new CatalinaPAM();
+ String deployerClass = conf.getString("deployer", "org.apache.jetspeed.pamanager.CatalinaPAM");
+ PortletApplicationManagement pam = (PortletApplicationManagement)Class.forName(deployerClass).newInstance();
+
Map map = new HashMap();
map.put(CatalinaPAM.PAM_PROPERTY_SERVER, server);
map.put(CatalinaPAM.PAM_PROPERTY_PORT, new Integer(port));
map.put(CatalinaPAM.PAM_PROPERTY_USER, userName);
map.put(CatalinaPAM.PAM_PROPERTY_PASSWORD, password);
- catPAM.connect(map);
+ pam.connect(map);
- DeployPortletAppEventListener dpal = new DeployPortletAppEventListener(targetDirFile.getCanonicalPath(), catPAM);
+ DeployPortletAppEventListener dpal = new DeployPortletAppEventListener(targetDirFile.getCanonicalPath(), pam);
DeploymentEventDispatcher dispatcher = new DeploymentEventDispatcher(targetDirFile.getCanonicalPath());
dispatcher.addDeploymentListener(dpal);
HashMap handlers = new HashMap();
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org