You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2004/11/08 10:06:19 UTC

cvs commit: jakarta-turbine-fulcrum/parser/src/java/org/apache/fulcrum/parser DefaultParameterParser.java

epugh       2004/11/08 01:06:19

  Modified:    parser/src/java/org/apache/fulcrum/parser
                        DefaultParameterParser.java
  Log:
  We no longer in upload have a facade class.  Thanks gump!
  
  Revision  Changes    Path
  1.4       +21 -7     jakarta-turbine-fulcrum/parser/src/java/org/apache/fulcrum/parser/DefaultParameterParser.java
  
  Index: DefaultParameterParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/parser/src/java/org/apache/fulcrum/parser/DefaultParameterParser.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultParameterParser.java	30 Oct 2004 12:28:01 -0000	1.3
  +++ DefaultParameterParser.java	8 Nov 2004 09:06:19 -0000	1.4
  @@ -62,7 +62,8 @@
   import java.io.UnsupportedEncodingException;
   import javax.servlet.http.HttpServletRequest;
   import org.apache.fulcrum.pool.Recyclable;
  -import org.apache.fulcrum.upload.UploadServiceFacade;
  +import org.apache.fulcrum.upload.UploadService;
  +import org.apache.avalon.framework.service.ServiceException;
   import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.avalon.framework.service.Serviceable;
   import org.apache.commons.fileupload.FileItem;
  @@ -107,7 +108,11 @@
        * The raw data of a file upload.
        */
       private byte[] uploadData = null;
  -
  +    
  +    /**
  +     * The upload service component to use
  +     */
  +    private UploadService uploadService;
       /**
        * Logger to use
        */
  @@ -191,7 +196,7 @@
           {
               try
               {
  -                ArrayList items = UploadServiceFacade.parseRequest(req);
  +                ArrayList items = uploadService.parseRequest(req,getRepository());
                   Iterator i = items.iterator();
   
                   while (i.hasNext())
  @@ -368,14 +373,23 @@
           }
       }
       
  +    /**
  +     * <p> Retrieves the value of the <code>repository</code> property of
  +     * {@link org.apache.fulcrum.upload.UploadService}.
  +     *
  +     * @return The repository.
  +     */
  +    public String getRepository()
  +    {
  +        return uploadService.getFileUpload().getRepositoryPath();
  +    }    
       // ---------------- Avalon Lifecycle Methods ---------------------    
       /**
        * Avalon component lifecycle method
        */
  -    public void service( ServiceManager manager) {        
  +    public void service( ServiceManager manager) throws ServiceException{        
           
  -        // force a lookup of UploadService
  -        // I don't know if this is needed or not...
  +        uploadService = (UploadService)manager.lookup(UploadService.class.getName());
           
       }      
   }
  
  
  

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