weaver      2004/06/24 13:22:52

  Modified:    portal/src/java/org/apache/jetspeed/util/descriptor
                        PortletApplicationWar.java
  Log:
  cleaned up copyWar code
  
  Revision  Changes    Path
  1.8       +19 -6     
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationWar.java
  
  Index: PortletApplicationWar.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationWar.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- PortletApplicationWar.java        14 Jun 2004 17:18:16 -0000      1.7
  +++ PortletApplicationWar.java        24 Jun 2004 20:22:52 -0000      1.8
  @@ -292,13 +292,26 @@
       public void copyWar( String targetAppRoot ) throws IOException
       {
           FileObject target = fsManager.resolveFile(new 
File(targetAppRoot).getAbsolutePath());
  -        if (!target.exists())
  +        
  +        try
           {
  -            target.createFolder();
  +            // fsManager.getFilesCache().clear(target.getFileSystem());
  +           
  +            target.createFolder();            
  +            target.copyFrom(warStruct, new AllFileSelector());
  +            
           }
  -
  -        target.copyFrom(warStruct, new AllFileSelector());
  -        target.close();
  +        catch (FileSystemException e)
  +        {
  +            throw e;
  +        }
  +        finally
  +        {
  +            target.close();
  +            
  +        }
  +       
  +        
   
       }
   
  
  
  

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

Reply via email to