[patch] Patch for enhancement to Get task

patchfile.txt (text/plain), 17.77 KB, created by Robert Dobbins on 2002-12-10 16:26:36 UTC

(hide)

Description: Patch for enhancement to Get task

Filename:

MIME Type:

Creator: Robert Dobbins

Created: 2002-12-10 16:26:36 UTC

Size: 17.77 KB

patch

obsolete

>--- Get.java.Orig Tue Dec 3 12:47:26 2002 >+++ Get.java Tue Dec 3 12:48:19 2002 >@@ -56,17 +56,22 @@ > > import java.io.File; > import java.io.FileOutputStream; >-import java.io.IOException; > import java.io.InputStream; >-import java.net.HttpURLConnection; >+import java.io.IOException; >+import java.io.FileReader; >+import java.io.BufferedReader; > import java.net.URL; >+import java.net.MalformedURLException; > import java.net.URLConnection; >+import java.net.HttpURLConnection; > import java.util.Date; > import org.apache.tools.ant.BuildException; >-import org.apache.tools.ant.Project; > import org.apache.tools.ant.Task; >+import org.apache.tools.ant.Project; > import org.apache.tools.ant.util.FileUtils; >+import org.apache.tools.ant.util.StringUtils; > import org.apache.tools.ant.util.JavaEnvUtils; >+import java.util.ArrayList; > > /** > * Gets a particular file from a URL source. >@@ -84,11 +89,13 @@ > public class Get extends Task { > private URL source; // required > private File dest; // required >+ private File file; // optional > private boolean verbose = false; > private boolean useTimestamp = false; //off by default > private boolean ignoreErrors = false; > private String uname = null; > private String pword = null; >+ private int i; > > > /** >@@ -97,174 +104,57 @@ > * @exception BuildException Thrown in unrecoverable error. > */ > public void execute() throws BuildException { >+ ArrayList modules = null; >+ > if (source == null) { >- throw new BuildException("src attribute is required", getLocation()); >+ throw new BuildException("src attribute is required", location); > } > > if (dest == null) { >- throw new BuildException("dest attribute is required", getLocation()); >- } >- >- if (dest.exists() && dest.isDirectory()) { >- throw new BuildException("The specified destination is a directory", >- getLocation()); >+ throw new BuildException("dest attribute is required", location); > } > > if (dest.exists() && !dest.canWrite()) { > throw new BuildException("Can't write to " + dest.getAbsolutePath(), >- getLocation()); >+ location); > } > >- try { >- >- log("Getting: " + source); >- >- //set the timestamp to the file date. >- long timestamp = 0; >- >- boolean hasTimestamp = false; >- if (useTimestamp && dest.exists()) { >- timestamp = dest.lastModified(); >- if (verbose) { >- Date t = new Date(timestamp); >- log("local file date : " + t.toString()); >- } >- >- hasTimestamp = true; >- } >- >- //set up the URL connection >- URLConnection connection = source.openConnection(); >- //modify the headers >- //NB: things like user authentication could go in here too. >- if (useTimestamp && hasTimestamp) { >- connection.setIfModifiedSince(timestamp); >- } >- // prepare Java 1.1 style credentials >- if (uname != null || pword != null) { >- String up = uname + ":" + pword; >- String encoding; >- // check to see if sun's Base64 encoder is available. >- try { >- sun.misc.BASE64Encoder encoder = >- (sun.misc.BASE64Encoder) >- Class.forName("sun.misc.BASE64Encoder").newInstance(); >- encoding = encoder.encode (up.getBytes()); >- >- } catch (Exception ex) { // sun's base64 encoder isn't available >- Base64Converter encoder = new Base64Converter(); >- encoding = encoder.encode(up.getBytes()); >- } >- connection.setRequestProperty ("Authorization", >- "Basic " + encoding); >- } >- >- //connect to the remote site (may take some time) >- connection.connect(); >- //next test for a 304 result (HTTP only) >- if (connection instanceof HttpURLConnection) { >- HttpURLConnection httpConnection >- = (HttpURLConnection) connection; >- if (httpConnection.getResponseCode() >- == HttpURLConnection.HTTP_NOT_MODIFIED) { >- //not modified so no file download. just return >- //instead and trace out something so the user >- //doesn't think that the download happened when it >- //didnt >- log("Not modified - so not downloaded"); >- return; >- } >- // test for 401 result (HTTP only) >- if (httpConnection.getResponseCode() >- == HttpURLConnection.HTTP_UNAUTHORIZED) { >- String message="HTTP Authorization failure"; >- if(ignoreErrors) { >- log(message,Project.MSG_WARN); >- return; >- } else { >- throw new BuildException(message); >- } >- } >- >+ /** >+ * Check for file designation, if present dest must be a dir. and source must not contain a filename >+ */ >+ if (file != null){ >+ if (dest.exists() && !dest.isDirectory()) { >+ throw new BuildException("The specified destination must be a directory", >+ location); >+ } >+ if (!dest.exists()){ >+ if(!dest.mkdirs()) >+ throw new BuildException("Could not make new directory."); >+ } >+ modules = loadFile(file); >+ >+ FileUtils fu = FileUtils.newFileUtils(); >+ StringUtils su = new StringUtils(); >+ >+ try{ >+ source = new URL(su.replace(source.toString() + "/","//","/")); >+ source = new URL(su.replace(source.toString(),":/","://")); >+ for (i = 0; i < modules.size(); i++){ >+ doWork(new URL(source.toString() + modules.get(i)), fu.normalize(dest.toString() + "/" + modules.get(i))); >+ } >+ } >+ catch(MalformedURLException mfURL){ >+ throw new BuildException("mfURL " + mfURL.toString()); >+ } >+ >+ } else { >+ if (dest.exists() && dest.isDirectory()) { >+ throw new BuildException("The specified destination is a directory", >+ location); > } >- >- //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. >- >- InputStream is = null; >- for (int i = 0; i < 3 ; i++) { >- try { >- is = connection.getInputStream(); >- break; >- } catch (IOException ex) { >- log("Error opening connection " + ex); >- } >- } >- if (is == null) { >- log("Can't get " + source + " to " + dest); >- if (ignoreErrors) { >- return; >- } >- throw new BuildException("Can't get " + source + " to " + dest, >- getLocation()); >- } >- >- FileOutputStream fos = new FileOutputStream(dest); >- boolean finished = false; >- try { >- byte[] buffer = new byte[100 * 1024]; >- int length; >- >- while ((length = is.read(buffer)) >= 0) { >- fos.write(buffer, 0, length); >- if (verbose) { >- System.out.print("."); >- } >- } >- if (verbose) { >- System.out.println(); >- } >- finished = true; >- } finally { >- if (fos != null) { >- fos.close(); >- } >- is.close(); >- // we have started to (over)write dest, but failed. >- // Try to delete the garbage we'd otherwise leave >- // behind. >- if (!finished) { >- dest.delete(); >- } >- } >- >- //if (and only if) the use file time option is set, then >- //the saved file now has its timestamp set to that of the >- //downloaded file >- if (useTimestamp) { >- long remoteTimestamp = connection.getLastModified(); >- if (verbose) { >- Date t = new Date(remoteTimestamp); >- log("last modified = " + t.toString() >- + ((remoteTimestamp == 0) >- ? " - using current time instead" >- : "")); >- } >- if (remoteTimestamp != 0) { >- FileUtils.newFileUtils() >- .setFileLastModified(dest, remoteTimestamp); >- } >- } >- } catch (IOException ioe) { >- log("Error getting " + source + " to " + dest); >- if (ignoreErrors) { >- return; >- } >- throw new BuildException(ioe, getLocation()); >+ doWork(source, dest); > } >+ > } > > /** >@@ -286,6 +176,15 @@ > } > > /** >+ * Where to copy the source file. >+ * >+ * @param dest Path to file. >+ */ >+ public void setFile(File file) { >+ this.file = file; >+ } >+ >+ /** > * If true, show verbose progress information. > * > * @param v if "true" then be verbose >@@ -428,4 +327,195 @@ > return new String(out); > } > } >+ /** >+ * load properties from a file >+ * @param file file to load >+ */ >+ protected ArrayList loadFile(File file) throws BuildException { >+ ArrayList _al = null; >+ >+ log("Loading " + file.getAbsolutePath(), Project.MSG_VERBOSE); >+ try { >+ if (file.exists()) { >+ BufferedReader in = new BufferedReader(new FileReader(file)); >+ //Create the list to act on. >+ _al = new ArrayList(); >+ try { >+ String _st = in.readLine(); >+ while (_st != null){ >+ if (!_st.trim().equals("") && >+ !_st.trim().substring(0,1).equals("#")){ >+ _al.add(_st.trim()); >+ } >+ _st = in.readLine(); >+ } >+ } finally { >+ if (in != null) { >+ in.close(); >+ } >+ } >+ } else { >+ log("Unable to find file: " + file.getAbsolutePath(), >+ Project.MSG_VERBOSE); >+ throw new BuildException("Unable to find file: " + file.getAbsolutePath()); >+ } >+ return _al; >+ } catch (IOException ex) { >+ throw new BuildException(ex, getLocation()); >+ } >+ } >+ private void doWork(URL source, File dest){ >+ try { >+ >+ log("Getting: " + source); >+ >+ //set the timestamp to the file date. >+ long timestamp = 0; >+ >+ boolean hasTimestamp = false; >+ if (useTimestamp && dest.exists()) { >+ timestamp = dest.lastModified(); >+ if (verbose) { >+ Date t = new Date(timestamp); >+ log("local file date : " + t.toString()); >+ } >+ >+ hasTimestamp = true; >+ } >+ >+ //set up the URL connection >+ URLConnection connection = source.openConnection(); >+ //modify the headers >+ //NB: things like user authentication could go in here too. >+ if (useTimestamp && hasTimestamp) { >+ connection.setIfModifiedSince(timestamp); >+ } >+ // prepare Java 1.1 style credentials >+ if (uname != null || pword != null) { >+ String up = uname + ":" + pword; >+ String encoding; >+ // check to see if sun's Base64 encoder is available. >+ try { >+ sun.misc.BASE64Encoder encoder = >+ (sun.misc.BASE64Encoder) >+ Class.forName("sun.misc.BASE64Encoder").newInstance(); >+ encoding = encoder.encode (up.getBytes()); >+ >+ } catch (Exception ex) { // sun's base64 encoder isn't available >+ Base64Converter encoder = new Base64Converter(); >+ encoding = encoder.encode(up.getBytes()); >+ } >+ connection.setRequestProperty ("Authorization", >+ "Basic " + encoding); >+ } >+ >+ //connect to the remote site (may take some time) >+ connection.connect(); >+ //next test for a 304 result (HTTP only) >+ if (connection instanceof HttpURLConnection) { >+ HttpURLConnection httpConnection >+ = (HttpURLConnection) connection; >+ if (httpConnection.getResponseCode() >+ == HttpURLConnection.HTTP_NOT_MODIFIED) { >+ //not modified so no file download. just return >+ //instead and trace out something so the user >+ //doesn't think that the download happened when it >+ //didnt >+ log("Not modified - so not downloaded"); >+ return; >+ } >+ // test for 401 result (HTTP only) >+ if (httpConnection.getResponseCode() >+ == HttpURLConnection.HTTP_UNAUTHORIZED) { >+ String message="HTTP Authorization failure"; >+ if(ignoreErrors) { >+ log(message,Project.MSG_WARN); >+ return; >+ } else { >+ throw new BuildException(message); >+ } >+ } >+ >+ } >+ >+ //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. >+ >+ InputStream is = null; >+ for (int i = 0; i < 3 ; i++) { >+ try { >+ is = connection.getInputStream(); >+ break; >+ } catch (IOException ex) { >+ log("Error opening connection " + ex); >+ } >+ } >+ if (is == null) { >+ log("Can't get " + source + " to " + dest); >+ if (ignoreErrors) { >+ return; >+ } >+ throw new BuildException("Can't get " + source + " to " + dest, >+ location); >+ } >+ >+ FileOutputStream fos = new FileOutputStream(dest); >+ boolean finished = false; >+ try { >+ byte[] buffer = new byte[100 * 1024]; >+ int length; >+ >+ while ((length = is.read(buffer)) >= 0) { >+ fos.write(buffer, 0, length); >+ if (verbose) { >+ System.out.print("."); >+ } >+ } >+ if (verbose) { >+ System.out.println(); >+ } >+ finished = true; >+ } finally { >+ if (fos != null) { >+ fos.close(); >+ } >+ is.close(); >+ // we have started to (over)write dest, but failed. >+ // Try to delete the garbage we'd otherwise leave >+ // behind. >+ if (!finished) { >+ dest.delete(); >+ } >+ } >+ >+ //if (and only if) the use file time option is set, then >+ //the saved file now has its timestamp set to that of the >+ //downloaded file >+ if (useTimestamp) { >+ long remoteTimestamp = connection.getLastModified(); >+ if (verbose) { >+ Date t = new Date(remoteTimestamp); >+ log("last modified = " + t.toString() >+ + ((remoteTimestamp == 0) >+ ? " - using current time instead" >+ : "")); >+ } >+ if (remoteTimestamp != 0) { >+ FileUtils.newFileUtils() >+ .setFileLastModified(dest, remoteTimestamp); >+ } >+ } >+ } catch (IOException ioe) { >+ log("Error getting " + source + " to " + dest); >+ if (ignoreErrors) { >+ return; >+ } >+ throw new BuildException(ioe, location); >+ } >+ >+ } >+ > } View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]