weaver 2004/06/23 11:42:39 Modified: portal/src/java/org/apache/jetspeed/tools/pamanager FileSystemPAM.java CatalinaPAM.java Log: removed usage of "Jetspeed" object and use dep injection instead Revision Changes Path 1.33 +9 -8 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/FileSystemPAM.java Index: FileSystemPAM.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/FileSystemPAM.java,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- FileSystemPAM.java 11 Jun 2004 18:01:35 -0000 1.32 +++ FileSystemPAM.java 23 Jun 2004 18:42:39 -0000 1.33 @@ -17,11 +17,11 @@ import java.io.FileNotFoundException; import java.io.IOException; +import java.util.Locale; import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.jetspeed.Jetspeed; import org.apache.jetspeed.components.persistence.store.PersistenceStore; import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent; import org.apache.jetspeed.components.portletregistry.RegistryException; @@ -52,12 +52,13 @@ //private DeployUtilities util; private PortletRegistryComponent registry; private String vfsConfigUri = null; + protected Locale defaultLocale; - public FileSystemPAM() + public FileSystemPAM(PortletRegistryComponent registry, Locale defaultLocale) { super(); - registry = (PortletRegistryComponent) Jetspeed.getComponentManager().getComponent( - PortletRegistryComponent.class); + this.registry = registry; + this.defaultLocale = defaultLocale; } /** @@ -212,7 +213,7 @@ PortletApplicationWar paWar = null; try { - paWar = new PortletApplicationWar(webAppsDir+"/"+paName, paName, "/"+paName, Jetspeed.getDefaultLocale(), paName, vfsConfigUri ); + paWar = new PortletApplicationWar(webAppsDir+"/"+paName, paName, "/"+paName, defaultLocale, paName, vfsConfigUri ); paWar.removeWar(); log.info("FileSystem un-deployment completed successfully."); @@ -273,7 +274,7 @@ PortletApplicationWar paWar = null; try { - paWar = new PortletApplicationWar(warFile, paName, "/"+paName, Jetspeed.getDefaultLocale(), paName, vfsConfigUri ); + paWar = new PortletApplicationWar(warFile, paName, "/"+paName, defaultLocale, paName, vfsConfigUri ); String portletAppDirectory = webAppsDir+"/"+paName; log.info("Portlet application deployment target directory is "+portletAppDirectory); @@ -410,7 +411,7 @@ log.info("Rollback: Remove " + portletAppDir + " and all sub-directories."); - paWar = new PortletApplicationWar(portletAppDir, paName, "/"+paName, Jetspeed.getDefaultLocale(), paName, vfsConfigUri ); + paWar = new PortletApplicationWar(portletAppDir, paName, "/"+paName, defaultLocale, paName, vfsConfigUri ); paWar.removeWar(); } 1.14 +12 -1 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/CatalinaPAM.java Index: CatalinaPAM.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/CatalinaPAM.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- CatalinaPAM.java 9 Jun 2004 14:56:41 -0000 1.13 +++ CatalinaPAM.java 23 Jun 2004 18:42:39 -0000 1.14 @@ -17,10 +17,12 @@ +import java.util.Locale; import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent; import org.apache.jetspeed.tools.pamanager.servletcontainer.TomcatManager; @@ -44,6 +46,15 @@ protected static final Log log = LogFactory.getLog("deployment"); + /** + * @param registry + * @param defaultLocale + */ + public CatalinaPAM( PortletRegistryComponent registry, Locale defaultLocale ) + { + super(registry, defaultLocale); + + } public void connect(Map params) throws PortletApplicationException {
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]