weaver      2004/07/09 11:34:47

  Modified:    fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager
                        FusionAppServerPAM.java
  Log:
  Added redploy logic
  removed vfs
  
  Revision  Changes    Path
  1.3       +36 -5     
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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FusionAppServerPAM.java   8 Jul 2004 03:48:05 -0000       1.2
  +++ FusionAppServerPAM.java   9 Jul 2004 18:34:47 -0000       1.3
  @@ -20,7 +20,6 @@
   import org.apache.commons.httpclient.HttpException;
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.apache.commons.vfs.FileSystemManager;
   import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
   import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
   import org.apache.jetspeed.container.window.PortletWindowAccessor;
  @@ -48,11 +47,11 @@
       private ApplicationServerManager appServerManager = null;
       protected static final Log log = LogFactory.getLog("deployment");
   
  -    public FusionAppServerPAM( String webAppsDir, PortletRegistryComponent 
registry, FileSystemManager fsManager,
  +    public FusionAppServerPAM( String webAppsDir, PortletRegistryComponent 
registry, 
               PortletEntityAccessComponent entityAccess, PortletWindowAccessor 
windowAccess,
               ApplicationServerManager appServerManager )
  -    {
  -        super(webAppsDir, registry, fsManager, entityAccess, windowAccess);
  +    {     
  +        super(webAppsDir, registry,  entityAccess, windowAccess);
           ArgUtil.assertNotNull(ApplicationServerManager.class, appServerManager, 
this);
           this.appServerManager  = appServerManager;
       }
  @@ -223,6 +222,38 @@
               throw new PortletApplicationException(e);
           }
           catch (IOException e)
  +        {
  +            throw new PortletApplicationException(e);
  +        }
  +    }
  +    
  +    /**
  +     * 
  +     * <p>
  +     * redeploy
  +     * </p>
  +     *
  +     * @see 
org.apache.jetspeed.tools.pamanager.Deployment#redeploy(org.apache.jetspeed.util.descriptor.PortletApplicationWar)
  +     * @param paWar
  +     * @throws PortletApplicationException
  +     */
  +    public void redeploy( PortletApplicationWar paWar ) throws 
PortletApplicationException
  +    {
  +        try
  +        {
  +            super.redeploy(paWar);
  +            String paName = paWar.getPortletApplicationName();
  +            if(isServerAvailable())
  +            {
  +                checkResponse(appServerManager.reload("/" + paName));
  +            }
  +
  +        }
  +        catch (PortletApplicationException pe)
  +        {
  +            throw pe;
  +        }
  +        catch (Exception e)
           {
               throw new PortletApplicationException(e);
           }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to