maven-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject cvs commit: jakarta-turbine-maven/src/java/org/apache/maven/util HttpUtils.java
Date Tue, 10 Dec 2002 02:19:22 GMT
jvanzyl     2002/12/09 18:19:22

  Modified:    src/java/org/apache/maven/util HttpUtils.java
  Log:
  o Getting rid of username and password parameters. I'm going to parse
    the URL to pick these out to allow Basic Auth.
  
  Revision  Changes    Path
  1.14      +3 -42     jakarta-turbine-maven/src/java/org/apache/maven/util/HttpUtils.java
  
  Index: HttpUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/util/HttpUtils.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- HttpUtils.java	8 Dec 2002 20:32:40 -0000	1.13
  +++ HttpUtils.java	10 Dec 2002 02:19:22 -0000	1.14
  @@ -121,8 +121,6 @@
        *      exception when they happen
        * @param useTimestamp whether to check the modified timestamp on the
        *      <code>destinationFile</code> against the remote <code>source</code>
  -     * @param uname the user name to use for basic authentication
  -     * @param pword the password to use for basic authentication
        * @param proxyHost Proxy Host (if proxy is required), or null
        * @param proxyPort Proxy Port (if proxy is required), or null
        * @param proxyUserName Proxy Username (if authentification is required),
  @@ -136,14 +134,15 @@
                                      String file,
                                      boolean ignoreErrors,
                                      boolean useTimestamp,
  -                                   String uname,
  -                                   String pword,
                                      String proxyHost,
                                      String proxyPort,
                                      String proxyUserName,
                                      String proxyPassword )
       {
           boolean retrievedFile = false;
  +        String uname = null;
  +        String pword = null;
  +
           try
           {
               //set the timestamp to the file date.
  @@ -210,7 +209,6 @@
               }
   
               // REVISIT: at this point even non HTTP connections may support the
  -
               // if-modified-since behaviour - we just check the date of the
               // content and skip the write if it is not newer.
               // Some protocols (FTP) dont include dates, of course.
  @@ -280,43 +278,6 @@
           }
   
           return retrievedFile;
  -    }
  -
  -
  -    /**
  -     * Retrieve a remote file.  Returns true if the file was successfully
  -     * retrieved or if it is up to date (when the useTimestamp flag is set).
  -     * @param source the {@link URL} of the file to retrieve
  -     * @param destinationFile where to store it
  -     * @param file <strong>doesn't appear to be used</strong>
  -     * @param ignoreErrors whether to ignore errors during I/O or throw an
  -     *      exception when they happen
  -     * @param useTimestamp whether to check the modified timestamp on the
  -     *      <code>destinationFile</code> against the remote <code>source</code>
  -     * @param uname the user name to use for basic authentication
  -     * @param pword the password to use for basic authentication
  -     * @return true if the retrieval succeeded, false otherwise
  -     * @deprecated
  -     * @see #getFile(URL,File,String,boolean,boolean,String,String,String,String,String,String)
  -     */
  -    public static boolean getFile( URL source,
  -                                   File destinationFile,
  -                                   String file,
  -                                   boolean ignoreErrors,
  -                                   boolean useTimestamp,
  -                                   String uname,
  -                                   String pword )
  -    {
  -        return getFile( source,
  -                        destinationFile,
  -                        file,
  -                        ignoreErrors, useTimestamp,
  -                        uname,
  -                        pword,
  -                        null,
  -                        null,
  -                        null,
  -                        null );
       }
   
       /**
  
  
  

Mime
View raw message