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 we...@apache.org on 2004/06/03 16:20:53 UTC

cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager FileSystemPAM.java

weaver      2004/06/03 07:20:53

  Modified:    portal/src/java/org/apache/jetspeed/tools/pamanager
                        FileSystemPAM.java
  Log:
  FileSystemPAM now continues to remove a web application directory even if unregister fails.
  There have been SO many times when I needed this and undeploy fails.
  
  PortletApplicationManager fails to undeploy with FileSystemPAM because it does not implement
  Lifecycle.  Removed the lifecycle check, now everything works fine.
  
  Revision  Changes    Path
  1.29      +11 -2     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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- FileSystemPAM.java	26 May 2004 01:56:49 -0000	1.28
  +++ FileSystemPAM.java	3 Jun 2004 14:20:53 -0000	1.29
  @@ -180,6 +180,15 @@
           {
               // First unergister the application from Registry
               unregister(webAppsDir, paName);
  +        }
  +        catch (PortletApplicationException e)
  +        {
  +            log.warn("Undeploy could not unregister portlet application, "+paName+", from the database.  "+
  +                          "Continuing removal of web application directory.");
  +        }
  +        
  +        try
  +        {           
   
               // Call into DeplyUtilities class
               DeployUtilities util = new DeployUtilities();
  @@ -214,7 +223,7 @@
           catch (Exception re)
           {
   
  -            log.error("Failed to undeploy portlet application: " + re.toString() + " attempting to rollback changes", re);
  +            log.error("Failed to undeploy portlet application: " + re.toString(), re);
   
               throw new PortletApplicationException(re.getMessage());
           }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org