- For example: -
- ignore="package.html, foo.class" -
- The ignored files will be logged.
-
- @author Jon S. Stevens jon@clearink.com
- */
- public void setIgnore(String ignoreString) {
- project.log("The ignore attribute is deprecated. "+
- "Please use the excludes attribute.",
- Project.MSG_WARN);
- if (ignoreString != null && ignoreString.length() > 0) {
- Vector tmpExcludes = new Vector();
- StringTokenizer tok = new StringTokenizer(ignoreString, ", ", false);
- while (tok.hasMoreTokens()) {
- tmpExcludes.addElement("**/"+tok.nextToken().trim()+"/**");
- }
- this.excludes = new String[tmpExcludes.size()];
- for (int i = 0; i < tmpExcludes.size(); i++) {
- this.excludes[i] = (String)tmpExcludes.elementAt(i);
+ if (filecopyList.size() > 0) {
+ project.log("Copying " + filecopyList.size() + " files to "
+ + destDir.getAbsolutePath());
+ Enumeration enum = filecopyList.keys();
+ while (enum.hasMoreElements()) {
+ String fromFile = (String)enum.nextElement();
+ String toFile = (String)filecopyList.get(fromFile);
+ try {
+ copyFile(fromFile, toFile);
+ } catch (IOException ioe) {
+ String msg = "Failed to copy " + fromFile + " to " + toFile
+ + " due to " + ioe.getMessage();
+ throw new BuildException(msg);
+ }
}
- } else {
- this.excludes = null;
}
}
@@ -218,7 +117,7 @@ public class Copydir extends Task {
File destFile = new File(to, filename);
if (srcFile.lastModified() > destFile.lastModified()) {
filecopyList.put(srcFile.getAbsolutePath(),
- destFile.getAbsolutePath());
+ destFile.getAbsolutePath());
}
}
}
diff --git a/src/main/org/apache/tools/ant/taskdefs/GZip.java b/src/main/org/apache/tools/ant/taskdefs/GZip.java
index 28f38157f..b1f9b06d9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/GZip.java
+++ b/src/main/org/apache/tools/ant/taskdefs/GZip.java
@@ -57,23 +57,20 @@ package org.apache.tools.ant.taskdefs;
import org.apache.tools.ant.*;
import java.io.*;
-import java.util.Enumeration;
-import java.util.StringTokenizer;
-import java.util.Vector;
import java.util.zip.*;
/**
- * Allows one to create a .gz file from another file such as a tar file.
+ * Compresses a file with the GZIP algorightm. Normally used to compress
+ * non-compressed archives such as TAR files.
*
- * @author duncan@x180.com
+ * @author James Davidson duncan@x180.com
* @author Jon S. Stevens jon@clearink.com
*/
+
public class GZip extends Task {
private File zipFile;
private File source;
- private Vector items = new Vector();
- private Vector ignoreList = new Vector();
public void setZipfile(String zipFilename) {
zipFile = project.resolveFile(zipFilename);
diff --git a/src/main/org/apache/tools/ant/taskdefs/Jar.java b/src/main/org/apache/tools/ant/taskdefs/Jar.java
index 3b9364d44..564853fec 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Jar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Jar.java
@@ -60,9 +60,9 @@ import java.io.*;
import java.util.zip.*;
/**
- *
- *
- * @author duncan@x180.com
+ * Creates a JAR archive.
+ *
+ * @author James Davidson duncan@x180.com
*/
public class Jar extends Zip {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Java.java b/src/main/org/apache/tools/ant/taskdefs/Java.java
index db82d1047..220765a92 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Java.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Java.java
@@ -69,6 +69,7 @@ public class Java extends Exec {
private String classname = null;
private String args = null;
private String jvmargs = null;
+ private String classpath = null;
private boolean fork = false;
/**
@@ -85,6 +86,11 @@ public class Java extends Exec {
if (fork) {
StringBuffer b = new StringBuffer();
b.append("java ");
+ if (classpath != null) {
+ b.append("-cp ");
+ b.append(classpath);
+ b.append(" ");
+ }
if (jvmargs != null) {
b.append(jvmargs);
b.append(" ");
@@ -98,11 +104,18 @@ public class Java extends Exec {
run(b.toString());
} else {
Vector argList = tokenize(args);
- if (jvmargs != null) project.log("JVM args ignored when same JVM is used.", "java", project.MSG_VERBOSE);
+ if (jvmargs != null) project.log("JVM args and classpath ignored when same JVM is used.", "java", project.MSG_VERBOSE);
project.log("Java args: " + argList.toString(), "java", project.MSG_VERBOSE);
run(classname, argList);
}
}
+
+ /**
+ * Set the classpath to be used for this compilation.
+ */
+ public void setClasspath(String s) {
+ this.classpath = Project.translatePath(s);
+ }
/**
* Set the source file.
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java b/src/main/org/apache/tools/ant/taskdefs/Javac.java
index 7c77f7006..da2d8440f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javac.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java
@@ -57,10 +57,7 @@ package org.apache.tools.ant.taskdefs;
import org.apache.tools.ant.*;
import java.io.*;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-import java.util.Vector;
+import java.util.*;
/**
* Task to compile Java source files. This task can take the following
@@ -84,10 +81,10 @@ import java.util.Vector;
* sourcedir will be copied to the destdir allowing support files to be
* located properly in the classpath.
*
- * @author duncan@x180.com
+ * @author James Davidson duncan@x180.com
*/
-public class Javac extends Task {
+public class Javac extends MatchingTask {
private File srcDir;
private File destDir;
@@ -98,9 +95,6 @@ public class Javac extends Task {
private String target;
private String bootclasspath;
private String extdirs;
- private String[] includes;
- private String[] excludes;
- private boolean useDefaultExcludes = true;
private Vector compileList = new Vector();
private Hashtable filecopyList = new Hashtable();
@@ -108,7 +102,6 @@ public class Javac extends Task {
/**
* Set the source dir to find the source Java files.
*/
-
public void setSrcdir(String srcDirName) {
srcDir = project.resolveFile(srcDirName);
}
@@ -117,7 +110,6 @@ public class Javac extends Task {
* Set the destination directory into which the Java source
* files should be compiled.
*/
-
public void setDestdir(String destDirName) {
destDir = project.resolveFile(destDirName);
}
@@ -125,7 +117,6 @@ public class Javac extends Task {
/**
* Set the classpath to be used for this compilation.
*/
-
public void setClasspath(String classpath) {
compileClasspath = Project.translatePath(classpath);
}
@@ -134,7 +125,6 @@ public class Javac extends Task {
* Sets the bootclasspath that will be used to compile the classes
* against.
*/
-
public void setBootclasspath(String bootclasspath) {
this.bootclasspath = Project.translatePath(bootclasspath);
}
@@ -143,113 +133,39 @@ public class Javac extends Task {
* Sets the extension directories that will be used during the
* compilation.
*/
-
public void setExtdirs(String extdirs) {
this.extdirs = Project.translatePath(extdirs);
}
-
/**
- * Set the deprecation flag. Valid strings are "on", "off", "true", and
- * "false".
+ * Set the deprecation flag.
*/
-
- public void setDeprecation(String deprecation) {
- this.deprecation = Project.toBoolean(deprecation);
+ public void setDeprecation(String deprecationString) {
+ this.deprecation = Project.toBoolean(deprecationString);
}
-
/**
- * Set the debug flag. Valid strings are "on", "off", "true", and "false".
+ * Set the debug flag.
*/
-
public void setDebug(String debugString) {
- if (debugString.equalsIgnoreCase("on") ||
- debugString.equalsIgnoreCase("true")) {
- debug = true;
- } else {
- debug = false;
- }
+ this.debug = Project.toBoolean(debugString);
}
/**
- * Set the optimize flag. Valid strings are "on", "off", "true", and
- * "false".
+ * Set the optimize flag.
*/
-
public void setOptimize(String optimizeString) {
- if (optimizeString.equalsIgnoreCase("on") ||
- optimizeString.equalsIgnoreCase("true")) {
- optimize = true;
- } else {
- optimize = false;
- }
+ this.optimize = Project.toBoolean(optimizeString);
}
/**
* Sets the target VM that the classes will be compiled for. Valid
* strings are "1.1", "1.2", and "1.3".
*/
-
public void setTarget(String target) {
this.target = target;
}
- /**
- * Sets the set of include patterns. Patterns may be separated by a comma
- * or a space.
- *
- * @param includes the string containing the include patterns
- */
- public void setIncludes(String includes) {
- if (includes != null && includes.length() > 0) {
- Vector tmpIncludes = new Vector();
- StringTokenizer tok = new StringTokenizer(includes, ", ", false);
- while (tok.hasMoreTokens()) {
- tmpIncludes.addElement(tok.nextToken().trim());
- }
- this.includes = new String[tmpIncludes.size()];
- for (int i = 0; i < tmpIncludes.size(); i++) {
- this.includes[i] = (String)tmpIncludes.elementAt(i);
- }
- } else {
- this.includes = null;
- }
- }
-
- /**
- * Sets the set of exclude patterns. Patterns may be separated by a comma
- * or a space.
- *
- * @param excludes the string containing the exclude patterns
- */
- public void setExcludes(String excludes) {
- if (excludes != null && excludes.length() > 0) {
- Vector tmpExcludes = new Vector();
- StringTokenizer tok = new StringTokenizer(excludes, ", ", false);
- while (tok.hasMoreTokens()) {
- tmpExcludes.addElement(tok.nextToken().trim());
- }
- this.excludes = new String[tmpExcludes.size()];
- for (int i = 0; i < tmpExcludes.size(); i++) {
- this.excludes[i] = (String)tmpExcludes.elementAt(i);
- }
- } else {
- this.excludes = null;
- }
- }
-
- /**
- * Sets whether default exclusions should be used or not.
- *
- * @param useDefaultExcludes "true" or "on" when default exclusions should
- * be used, "false" or "off" when they
- * shouldn't be used.
- */
- public void setDefaultexcludes(String useDefaultExcludes) {
- this.useDefaultExcludes = Project.toBoolean(useDefaultExcludes);
- }
-
/**
* Executes the task.
*/
@@ -269,14 +185,7 @@ public class Javac extends Task {
// scan source and dest dirs to build up both copy lists and
// compile lists
- DirectoryScanner ds = new DirectoryScanner();
- ds.setBasedir(srcDir);
- ds.setIncludes(includes);
- ds.setExcludes(excludes);
- if (useDefaultExcludes) {
- ds.addDefaultExcludes();
- }
- ds.scan();
+ DirectoryScanner ds = super.getDirectoryScanner(srcDir);
String[] files = ds.getIncludedFiles();
@@ -412,7 +321,6 @@ public class Javac extends Task {
}
-
/**
* Peforms a copmile using the classic compiler that shipped with
* JDK 1.1 and 1.2.
diff --git a/src/main/org/apache/tools/ant/taskdefs/Jikes.java b/src/main/org/apache/tools/ant/taskdefs/Jikes.java
index dba4db80a..b543d8b6c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Jikes.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Jikes.java
@@ -17,9 +17,9 @@ public class Jikes {
* @param command - name of jikes executeable
*/
protected Jikes(JikesOutputParser jop,String command) {
- super();
- this.jop = jop;
- this.command = command;
+ super();
+ this.jop = jop;
+ this.command = command;
}
/**
@@ -27,21 +27,21 @@ public class Jikes {
* @param args - arguments to pass to process on command line
*/
protected void compile(String[] args) {
- String[] commandArray = new String[args.length+1];
- commandArray[0] = command;
- System.arraycopy(args,0,commandArray,1,args.length);
-
- // We assume, that everything jikes writes goes to
- // standard output, not to standard error. The option
- // -Xstdout that is given to Jikes in Javac.doJikesCompile()
- // should guarantee this. At least I hope so. :)
- try {
- Process jikes = Runtime.getRuntime().exec(commandArray);
- BufferedReader reader = new BufferedReader(new InputStreamReader(jikes.getInputStream()));
- jop.parseOutput(reader);
- } catch (IOException e) {
- // Where could we log this to? We don't have an instance
- // of project. Perhaps we should add one to our constructor?
- }
+ String[] commandArray = new String[args.length+1];
+ commandArray[0] = command;
+ System.arraycopy(args,0,commandArray,1,args.length);
+
+ // We assume, that everything jikes writes goes to
+ // standard output, not to standard error. The option
+ // -Xstdout that is given to Jikes in Javac.doJikesCompile()
+ // should guarantee this. At least I hope so. :)
+ try {
+ Process jikes = Runtime.getRuntime().exec(commandArray);
+ BufferedReader reader = new BufferedReader(new InputStreamReader(jikes.getInputStream()));
+ jop.parseOutput(reader);
+ } catch (IOException e) {
+ // Where could we log this to? We don't have an instance
+ // of project. Perhaps we should add one to our constructor?
+ }
}
}
diff --git a/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java b/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
new file mode 100644
index 000000000..e57ed451f
--- /dev/null
+++ b/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
@@ -0,0 +1,205 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999 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 acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * Foundation" 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"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * 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
+ *
- For example: -
- ignore="package.html, foo.class" -
- The ignored files will be logged. - - @author Jon S. Stevens jon@clearink.com - */ - public void setIgnore(String ignoreString) { - project.log("The ignore attribute is deprecated. "+ - "Please use the excludes attribute.", - Project.MSG_WARN); - if (ignoreString == null) { - this.excludes = null; - } else { - Vector tmpExcludes = new Vector(); - StringTokenizer tok = new StringTokenizer(ignoreString, ", "); - while (tok.hasMoreTokens()) { - String pattern = tok.nextToken().trim(); - if (pattern.length() > 0) { - tmpExcludes.addElement("**/"+pattern+"/**"); - } - } - this.excludes = new String[tmpExcludes.size()]; - for (int i = 0; i < tmpExcludes.size(); i++) { - this.excludes[i] = (String)tmpExcludes.elementAt(i); - } - } - } - - /** - * Sets the set of include patterns. Patterns may be separated by a comma - * or a space. - * - * @param includes the string containing the include patterns - */ - public void setIncludes(String includes) { - if (includes == null) { - this.includes = null; - } else { - Vector tmpIncludes = new Vector(); - StringTokenizer tok = new StringTokenizer(includes, ", "); - while (tok.hasMoreTokens()) { - String pattern = tok.nextToken().trim(); - if (pattern.length() > 0) { - tmpIncludes.addElement(pattern); - } - } - this.includes = new String[tmpIncludes.size()]; - for (int i = 0; i < tmpIncludes.size(); i++) { - this.includes[i] = (String)tmpIncludes.elementAt(i); - } - } - } - - /** - * Sets the set of exclude patterns. Patterns may be separated by a comma - * or a space. - * - * @param excludes the string containing the exclude patterns - */ - public void setExcludes(String excludes) { - if (excludes == null) { - this.excludes = null; - } else { - Vector tmpExcludes = new Vector(); - StringTokenizer tok = new StringTokenizer(excludes, ", ", false); - while (tok.hasMoreTokens()) { - String pattern = tok.nextToken().trim(); - if (pattern.length() > 0) { - tmpExcludes.addElement(pattern); - } - } - this.excludes = new String[tmpExcludes.size()]; - for (int i = 0; i < tmpExcludes.size(); i++) { - this.excludes[i] = (String)tmpExcludes.elementAt(i); - } - } - } - - /** - * Sets whether default exclusions should be used or not. - * - * @param useDefaultExcludes "true" or "on" when default exclusions should - * be used, "false" or "off" when they - * shouldn't be used. - */ - public void setDefaultexcludes(String useDefaultExcludes) { - this.useDefaultExcludes = Project.toBoolean(useDefaultExcludes); - } - public void execute() throws BuildException { project.log("Building "+ archiveType +": "+ zipFile.getAbsolutePath()); @@ -235,14 +100,7 @@ public class Zip extends Task { throw new BuildException("basedir does not exist!"); } - DirectoryScanner ds = new DirectoryScanner(); - ds.setBasedir(baseDir); - ds.setIncludes(includes); - ds.setExcludes(excludes); - if (useDefaultExcludes) { - ds.addDefaultExcludes(); - } - ds.scan(); + DirectoryScanner ds = super.getDirectoryScanner(baseDir); String[] files = ds.getIncludedFiles(); String[] dirs = ds.getIncludedDirectories();