portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/util/template JetspeedTool.java
Date Mon, 02 Jul 2001 07:47:53 GMT
taylor      01/07/02 00:47:53

  Modified:    src/java/org/apache/jetspeed/util FileCopy.java
                        PSMLManager.java
               src/java/org/apache/jetspeed/util/customization
                        PSMLDocument.java
               src/java/org/apache/jetspeed/util/servlet
                        EcsServletElement.java
               src/java/org/apache/jetspeed/util/template JetspeedTool.java
  Added:       src/java/org/apache/jetspeed/util DirectoryUtils.java
  Log:
  - implemented new class DirectoryUtils. Method: rmdir() - removes an entire directory tree
  - changed signature on Profiler.createUserProfile
  
  Revision  Changes    Path
  1.4       +31 -0     jakarta-jetspeed/src/java/org/apache/jetspeed/util/FileCopy.java
  
  Index: FileCopy.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/FileCopy.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- FileCopy.java	2001/03/07 06:49:51	1.3
  +++ FileCopy.java	2001/07/02 07:47:48	1.4
  @@ -57,10 +57,26 @@
   import java.io.*;
   import java.net.URL;
   
  +/*
  + * File Copy Utilities. Some utilities that java.io doesn't give us.
  + *
  + *    copy() - copies one file source to another file destination.
  + *    copyFromURL)() - copies from a URL source to a file destination.
  + *
  + *  @author David S. Taylor <a href="mailto:taylor@apache.org">David Sean Taylor</a>
  + */
  +
   public class FileCopy {
   
       public static final int BUFFER_SIZE = 4096;
   
  +    /*
  +     *  Copies one file source to another file destination. 
  +     *
  +     * @param source The source file.
  +     * @param destination The destination file.
  +     * @throws IOException When an IO error occurs, this exception is thrown.
  +     */
       public static final void copy(String source, String destination)
                   throws IOException
       {
  @@ -77,6 +93,13 @@
           output.close();
       }
   
  +    /*
  +     *  Copies from a URL source to a file destination.
  +     *
  +     * @param source The source URL.
  +     * @param destination The destination file.
  +     * @throws IOException When an IO error occurs, this exception is thrown.
  +     */
       public static final void copyFromURL(String source, String destination)
                 throws IOException
       {
  @@ -95,6 +118,14 @@
           output.close();
       }
   
  +    /*
  +     *  Generic copy from a input stream to an output stream.
  +     *
  +     * @param input The source input stream.
  +     * @param output The destination output stream.
  +     * @param buffer The user provided buffer.
  +     * @throws IOException When an IO error occurs, this exception is thrown.
  +     */
       public static final void copyStream(InputStream input,
                                           OutputStream output,
                                           byte[] buffer)
  
  
  
  1.11      +4 -2      jakarta-jetspeed/src/java/org/apache/jetspeed/util/PSMLManager.java
  
  Index: PSMLManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/PSMLManager.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- PSMLManager.java	2001/06/09 15:42:47	1.10
  +++ PSMLManager.java	2001/07/02 07:47:48	1.11
  @@ -76,6 +76,7 @@
   
   import org.apache.turbine.util.RunData;
   import org.apache.turbine.util.Log;
  +import org.apache.turbine.om.security.User;
   
   import java.io.*;
   import java.util.*;
  @@ -159,7 +160,8 @@
        */
       public static boolean setPSMLContent(RunData data, MimeType mimetype, Portlets portlets)
       {
  -        String username = data.getUser().getUserName();
  +        User user = data.getUser();
  +        String username = user.getUserName();
           // Verify a supported MIME-Type is requested!
           if (mimetype == null)
           {
  @@ -185,7 +187,7 @@
               catch (Exception e)
               {
                   // the profile didn't exist - create a specific profile for this mimetype
  -                Profiler.createUserProfile( data, username, mimetype );
  +                Profiler.createUserProfile( data, user, mimetype );
                   profile = Profiler.getProfile( data, mimetype );
               }
   
  
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/util/DirectoryUtils.java
  
  Index: DirectoryUtils.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", nor may "Apache" appear in their name, without
   *    prior written permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jetspeed.util;
  
  import java.io.*;
  import java.net.URL;
  
  import org.apache.turbine.util.Log;
  
  /*
   * File System Directory Utilities. Some utilities that java.io doesn't give us.
   *
   *    rmdir() - removes a directory and all subdirectories and files underneath.
   *
   *  @author David S. Taylor <a href="mailto:taylor@apache.org">David Sean Taylor</a>
   */
  public class DirectoryUtils
  {
              
      public static void main(String[] args)
      {
          DirectoryUtils.rmdir(args[0]);
      }
  
      /*
       *  Removes a directory and all subdirectories and files beneath it.
       *
       * @param directory The name of the root directory to be deleted.
       * @return boolean If all went successful, returns true, otherwise false.
       * 
       */
      public static final boolean rmdir(String directory)
      {    
          try
          {
              File dir = new File(directory);
              if (!dir.isDirectory())            
              {
                  dir.delete();
                  return true;
              }
  
              deleteTraversal(directory);
  
              dir.delete();
              return true;
  
          }
          catch (Exception e)
          {
              Log.error("Error in rmdir utility:" + e);
              return false;
          }
      }
  
      /*
       *  Recursive deletion engine, traverses through all subdirectories, 
       *  attempting to delete every file and directory it comes across.
       *  NOTE: this version doesn't do any security checks, nor does it 
       *  check for file modes and attempt to change them.
       *
       * @param path The directory path to be traversed.
       * 
       */            
      private static void deleteTraversal(String path)
      {
          File file = new File(path);
          if (file.isFile()) 
          {
              try 
              {
                  file.delete();
              }
              catch (Exception e)
              {
                  Log.error("Failed to Delete file: " + path + " : " + e.toString());
                  file.deleteOnExit(); // try to get it later...
              }
          } 
          else if (file.isDirectory()) 
          {
              if (!path.endsWith(File.separator))
                  path += File.separator;
  
              String list[] = file.list();
  
              // Process all files recursivly
              for(int ix = 0; list != null && ix < list.length; ix++)
                  deleteTraversal(path + list[ix]);
  
              // now try to delete the directory
              try 
              {
                  file.delete();
              }
              catch (Exception e)
              {
                  Log.error("Failed to Delete directory: " + path + " : " + e.toString());
                  file.deleteOnExit(); // try to get it later...
              }
              
          }
      }            
  }
  
  
  
  
  
  
  1.5       +2 -3      jakarta-jetspeed/src/java/org/apache/jetspeed/util/customization/PSMLDocument.java
  
  Index: PSMLDocument.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/customization/PSMLDocument.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PSMLDocument.java	2001/06/09 15:42:47	1.4
  +++ PSMLDocument.java	2001/07/02 07:47:50	1.5
  @@ -82,7 +82,7 @@
    *
    *     @author <a href="mailto:pyoo@gluecode.com">Peter Yoo </a>
    *     @author <a href="mailto:eros@gluecode.com">Ernest Ros </a>
  - *     @version $Id: PSMLDocument.java,v 1.4 2001/06/09 15:42:47 raphael Exp $
  + *     @version $Id: PSMLDocument.java,v 1.5 2001/07/02 07:47:50 taylor Exp $
    *
    */
   public class PSMLDocument
  @@ -325,10 +325,9 @@
       }
       catch (Exception e)
       {
  -        String username = rundata.getUser().getUserName();
           try
           {
  -            Profiler.createUserProfile( rundata, username, mimetype );
  +            Profiler.createUserProfile( rundata, rundata.getUser(), mimetype );
               profile = Profiler.getProfile( rundata, mimetype );
           }
           catch (Exception e2)
  
  
  
  1.6       +1 -1      jakarta-jetspeed/src/java/org/apache/jetspeed/util/servlet/EcsServletElement.java
  
  Index: EcsServletElement.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/servlet/EcsServletElement.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- EcsServletElement.java	2001/03/07 06:50:25	1.5
  +++ EcsServletElement.java	2001/07/02 07:47:51	1.6
  @@ -121,7 +121,7 @@
           try
           {
               // try to flush any data before dispatching request
  -            rundata.getResponse().flushBuffer();
  +           // rundata.getResponse().flushBuffer();
   
               // call the servlet/JSP
               dispatcher.include(
  
  
  
  1.8       +1 -2      jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/JetspeedTool.java
  
  Index: JetspeedTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/JetspeedTool.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JetspeedTool.java	2001/06/04 17:44:54	1.7
  +++ JetspeedTool.java	2001/07/02 07:47:52	1.8
  @@ -77,7 +77,7 @@
    * shared between threads and/or requests</strong>
    *
    * @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
  - * @version $Id: JetspeedTool.java,v 1.7 2001/06/04 17:44:54 raphael Exp $
  + * @version $Id: JetspeedTool.java,v 1.8 2001/07/02 07:47:52 taylor Exp $
    */
   public class JetspeedTool implements ApplicationTool
   {
  @@ -157,7 +157,6 @@
               {
                   Log.error(e);
               }
  -
           }
           
           return result;
  
  
  

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


Mime
View raw message