git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272326 13f79535-47bb-0310-9956-ffa450edef68master
| @@ -53,10 +53,7 @@ | |||||
| */ | */ | ||||
| package org.apache.tools.ant.filters; | package org.apache.tools.ant.filters; | ||||
| import java.io.FilterReader; | |||||
| import java.io.IOException; | |||||
| import java.io.Reader; | import java.io.Reader; | ||||
| import java.io.StringReader; | |||||
| import org.apache.tools.ant.types.Parameter; | import org.apache.tools.ant.types.Parameter; | ||||
| import org.apache.tools.ant.types.Parameterizable; | import org.apache.tools.ant.types.Parameterizable; | ||||
| @@ -53,13 +53,11 @@ | |||||
| */ | */ | ||||
| package org.apache.tools.ant.filters; | package org.apache.tools.ant.filters; | ||||
| import java.io.ByteArrayInputStream; | |||||
| import java.io.IOException; | import java.io.IOException; | ||||
| import java.io.Reader; | import java.io.Reader; | ||||
| import java.lang.reflect.InvocationTargetException; | import java.lang.reflect.InvocationTargetException; | ||||
| import java.lang.reflect.Method; | import java.lang.reflect.Method; | ||||
| import org.apache.tools.ant.Project; | |||||
| /** | /** | ||||
| * Assemble the constants declared in a Java class in | * Assemble the constants declared in a Java class in | ||||
| @@ -65,9 +65,11 @@ import org.apache.tools.ant.types.Parameter; | |||||
| import org.apache.tools.ant.types.Parameterizable; | import org.apache.tools.ant.types.Parameterizable; | ||||
| import org.apache.tools.ant.util.FileUtils; | import org.apache.tools.ant.util.FileUtils; | ||||
| import java.io.*; | |||||
| import java.lang.reflect.Constructor; | import java.lang.reflect.Constructor; | ||||
| import java.lang.reflect.InvocationTargetException; | import java.lang.reflect.InvocationTargetException; | ||||
| import java.io.FilterReader; | |||||
| import java.io.Reader; | |||||
| import java.io.IOException; | |||||
| import java.util.Vector; | import java.util.Vector; | ||||
| /** | /** | ||||
| @@ -59,7 +59,6 @@ import java.io.BufferedOutputStream; | |||||
| import java.io.FileOutputStream; | import java.io.FileOutputStream; | ||||
| import java.io.IOException; | import java.io.IOException; | ||||
| import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
| import org.apache.tools.ant.taskdefs.Pack; | |||||
| import org.apache.tools.bzip2.CBZip2OutputStream; | import org.apache.tools.bzip2.CBZip2OutputStream; | ||||
| /** | /** | ||||
| @@ -70,7 +70,6 @@ import org.apache.tools.ant.BuildException; | |||||
| import org.apache.tools.ant.DirectoryScanner; | import org.apache.tools.ant.DirectoryScanner; | ||||
| import org.apache.tools.ant.Project; | import org.apache.tools.ant.Project; | ||||
| import org.apache.tools.ant.taskdefs.condition.Condition; | import org.apache.tools.ant.taskdefs.condition.Condition; | ||||
| import org.apache.tools.ant.taskdefs.MatchingTask; | |||||
| import org.apache.tools.ant.types.FileSet; | import org.apache.tools.ant.types.FileSet; | ||||
| /** | /** | ||||
| @@ -55,7 +55,6 @@ | |||||
| package org.apache.tools.ant.taskdefs; | package org.apache.tools.ant.taskdefs; | ||||
| import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
| import org.apache.tools.ant.taskdefs.Pack; | |||||
| import java.io.IOException; | import java.io.IOException; | ||||
| import java.io.FileOutputStream; | import java.io.FileOutputStream; | ||||
| @@ -59,7 +59,12 @@ import org.apache.tools.ant.BuildException; | |||||
| import org.apache.tools.ant.types.FilterChain; | import org.apache.tools.ant.types.FilterChain; | ||||
| import org.apache.tools.ant.filters.util.ChainReaderHelper; | import org.apache.tools.ant.filters.util.ChainReaderHelper; | ||||
| import java.io.*; | |||||
| import java.io.File; | |||||
| import java.io.FileInputStream; | |||||
| import java.io.BufferedInputStream; | |||||
| import java.io.Reader; | |||||
| import java.io.InputStreamReader; | |||||
| import java.io.IOException; | |||||
| import java.util.Vector; | import java.util.Vector; | ||||
| /** | /** | ||||
| @@ -54,13 +54,17 @@ | |||||
| package org.apache.tools.ant.taskdefs; | package org.apache.tools.ant.taskdefs; | ||||
| import org.apache.tools.ant.Task; | import org.apache.tools.ant.Task; | ||||
| import org.apache.tools.ant.Project; | |||||
| import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
| import org.apache.tools.ant.types.FilterChain; | import org.apache.tools.ant.types.FilterChain; | ||||
| import org.apache.tools.ant.filters.StringInputStream; | import org.apache.tools.ant.filters.StringInputStream; | ||||
| import org.apache.tools.ant.filters.util.ChainReaderHelper; | import org.apache.tools.ant.filters.util.ChainReaderHelper; | ||||
| import java.io.*; | |||||
| import java.io.File; | |||||
| import java.io.FileInputStream; | |||||
| import java.io.BufferedInputStream; | |||||
| import java.io.InputStreamReader; | |||||
| import java.io.Reader; | |||||
| import java.io.IOException; | |||||
| import java.util.Enumeration; | import java.util.Enumeration; | ||||
| import java.util.Properties; | import java.util.Properties; | ||||
| import java.util.Vector; | import java.util.Vector; | ||||
| @@ -62,7 +62,6 @@ import org.apache.tools.ant.types.PatternSet; | |||||
| import java.io.File; | import java.io.File; | ||||
| import java.util.StringTokenizer; | import java.util.StringTokenizer; | ||||
| import java.util.Vector; | |||||
| /** | /** | ||||
| * This is an abstract task that should be used by all those tasks that | * This is an abstract task that should be used by all those tasks that | ||||
| @@ -62,7 +62,6 @@ import org.apache.tools.ant.types.FileSet; | |||||
| import org.apache.tools.ant.util.FileUtils; | import org.apache.tools.ant.util.FileUtils; | ||||
| import java.io.File; | import java.io.File; | ||||
| import java.io.FileOutputStream; | |||||
| import java.io.IOException; | import java.io.IOException; | ||||
| @@ -55,12 +55,6 @@ | |||||
| package org.apache.tools.ant.taskdefs.cvslib; | package org.apache.tools.ant.taskdefs.cvslib; | ||||
| import org.apache.tools.ant.taskdefs.LogOutputStream; | import org.apache.tools.ant.taskdefs.LogOutputStream; | ||||
| import org.apache.tools.ant.Project; | |||||
| import org.apache.tools.ant.Task; | |||||
| import java.io.IOException; | |||||
| import java.io.OutputStream; | |||||
| import java.io.ByteArrayOutputStream; | |||||
| /** | /** | ||||
| * A dummy stream that just passes stuff to the parser. | * A dummy stream that just passes stuff to the parser. | ||||
| @@ -53,13 +53,8 @@ | |||||
| */ | */ | ||||
| package org.apache.tools.ant.taskdefs.cvslib; | package org.apache.tools.ant.taskdefs.cvslib; | ||||
| import java.io.BufferedReader; | |||||
| import java.io.IOException; | import java.io.IOException; | ||||
| import java.io.InputStream; | |||||
| import java.io.InputStreamReader; | |||||
| import java.io.OutputStream; | |||||
| import java.io.ByteArrayOutputStream; | import java.io.ByteArrayOutputStream; | ||||
| import org.apache.tools.ant.taskdefs.ExecuteStreamHandler; | |||||
| import org.apache.tools.ant.taskdefs.PumpStreamHandler; | import org.apache.tools.ant.taskdefs.PumpStreamHandler; | ||||
| import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
| @@ -60,9 +60,6 @@ import java.io.InputStream; | |||||
| import java.io.FileOutputStream; | import java.io.FileOutputStream; | ||||
| import java.util.Hashtable; | import java.util.Hashtable; | ||||
| import java.util.List; | import java.util.List; | ||||
| import java.util.Set; | |||||
| import java.util.TreeSet; | |||||
| import java.util.HashSet; | |||||
| import java.util.Iterator; | import java.util.Iterator; | ||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||
| import java.util.jar.JarOutputStream; | import java.util.jar.JarOutputStream; | ||||
| @@ -56,7 +56,6 @@ package org.apache.tools.ant.taskdefs.optional.j2ee; | |||||
| import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
| import org.apache.tools.ant.types.Path; | import org.apache.tools.ant.types.Path; | ||||
| import org.apache.tools.ant.taskdefs.optional.j2ee.ServerDeploy; | |||||
| /** | /** | ||||
| * Abstract class to support vendor-specific hot deployment tools. | * Abstract class to support vendor-specific hot deployment tools. | ||||
| @@ -57,8 +57,6 @@ package org.apache.tools.ant.taskdefs.optional.j2ee; | |||||
| import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
| import org.apache.tools.ant.types.Commandline; | import org.apache.tools.ant.types.Commandline; | ||||
| import org.apache.tools.ant.taskdefs.Java; | import org.apache.tools.ant.taskdefs.Java; | ||||
| import org.apache.tools.ant.taskdefs.optional.j2ee.ServerDeploy; | |||||
| import org.apache.tools.ant.taskdefs.optional.j2ee.AbstractHotDeploymentTool; | |||||
| /** | /** | ||||
| * A generic tool for J2EE server hot deployment. | * A generic tool for J2EE server hot deployment. | ||||
| @@ -54,7 +54,6 @@ | |||||
| package org.apache.tools.ant.taskdefs.optional.j2ee; | package org.apache.tools.ant.taskdefs.optional.j2ee; | ||||
| import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
| import org.apache.tools.ant.taskdefs.optional.j2ee.ServerDeploy; | |||||
| /** | /** | ||||
| * An interface for vendor-specific "hot" deployment tools. | * An interface for vendor-specific "hot" deployment tools. | ||||
| @@ -57,9 +57,6 @@ import java.io.File; | |||||
| import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
| import org.apache.tools.ant.taskdefs.Java; | import org.apache.tools.ant.taskdefs.Java; | ||||
| import org.apache.tools.ant.taskdefs.optional.j2ee.AbstractHotDeploymentTool; | |||||
| import org.apache.tools.ant.taskdefs.optional.j2ee.HotDeploymentTool; | |||||
| import org.apache.tools.ant.taskdefs.optional.j2ee.ServerDeploy; | |||||
| import org.apache.tools.ant.types.Path; | import org.apache.tools.ant.types.Path; | ||||
| /** | /** | ||||
| @@ -56,9 +56,6 @@ package org.apache.tools.ant.taskdefs.optional.j2ee; | |||||
| import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
| import org.apache.tools.ant.taskdefs.Java; | import org.apache.tools.ant.taskdefs.Java; | ||||
| import org.apache.tools.ant.taskdefs.optional.j2ee.ServerDeploy; | |||||
| import org.apache.tools.ant.taskdefs.optional.j2ee.AbstractHotDeploymentTool; | |||||
| import org.apache.tools.ant.taskdefs.optional.j2ee.HotDeploymentTool; | |||||
| /** | /** | ||||
| * An Ant wrapper task for the weblogic.deploy tool. This is used to | * An Ant wrapper task for the weblogic.deploy tool. This is used to | ||||
| @@ -69,7 +69,6 @@ import org.apache.tools.ant.taskdefs.optional.jsp.compilers.JspCompilerAdapter; | |||||
| import org.apache.tools.ant.taskdefs.optional.jsp.compilers.JspCompilerAdapterFactory; | import org.apache.tools.ant.taskdefs.optional.jsp.compilers.JspCompilerAdapterFactory; | ||||
| import org.apache.tools.ant.types.Path; | import org.apache.tools.ant.types.Path; | ||||
| import org.apache.tools.ant.types.FileSet; | |||||
| import org.apache.tools.ant.types.Reference; | import org.apache.tools.ant.types.Reference; | ||||
| /** Ant task to run the jsp compiler. | /** Ant task to run the jsp compiler. | ||||
| @@ -53,7 +53,6 @@ | |||||
| */ | */ | ||||
| package org.apache.tools.ant.taskdefs.optional.jsp; | package org.apache.tools.ant.taskdefs.optional.jsp; | ||||
| import java.io.File; | import java.io.File; | ||||
| import java.io.IOException; | |||||
| /** | /** | ||||
| * This is a class derived from the Jasper code | * This is a class derived from the Jasper code | ||||
| @@ -72,13 +72,6 @@ import javax.xml.parsers.DocumentBuilderFactory; | |||||
| import javax.xml.parsers.DocumentBuilder; | import javax.xml.parsers.DocumentBuilder; | ||||
| import org.w3c.dom.Document; | import org.w3c.dom.Document; | ||||
| import org.w3c.dom.Element; | |||||
| /** | /** | ||||
| * Transform a JUnit xml report. | * Transform a JUnit xml report. | ||||
| @@ -54,13 +54,10 @@ | |||||
| package org.apache.tools.ant.taskdefs.optional.metamata; | package org.apache.tools.ant.taskdefs.optional.metamata; | ||||
| import java.io.BufferedReader; | import java.io.BufferedReader; | ||||
| import java.io.File; | |||||
| import java.io.IOException; | import java.io.IOException; | ||||
| import java.io.InputStream; | import java.io.InputStream; | ||||
| import java.io.InputStreamReader; | import java.io.InputStreamReader; | ||||
| import java.io.OutputStream; | import java.io.OutputStream; | ||||
| import java.io.OutputStreamWriter; | |||||
| import java.io.Writer; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.Enumeration; | import java.util.Enumeration; | ||||
| import java.util.Hashtable; | import java.util.Hashtable; | ||||
| @@ -78,10 +75,6 @@ import org.apache.tools.ant.taskdefs.LogOutputStream; | |||||
| import org.apache.tools.ant.taskdefs.StreamPumper; | import org.apache.tools.ant.taskdefs.StreamPumper; | ||||
| import org.apache.tools.ant.util.DOMElementWriter; | import org.apache.tools.ant.util.DOMElementWriter; | ||||
| import org.apache.tools.ant.util.DateUtils; | import org.apache.tools.ant.util.DateUtils; | ||||
| import org.apache.tools.ant.util.StringUtils; | |||||
| import org.apache.tools.ant.util.regexp.RegexpMatcher; | |||||
| import org.apache.tools.ant.util.regexp.RegexpMatcherFactory; | |||||
| /** | /** | ||||
| * This is a very bad stream handler for the MAudit task. | * This is a very bad stream handler for the MAudit task. | ||||
| @@ -57,9 +57,19 @@ package org.apache.tools.ant.taskdefs.optional.splash; | |||||
| import org.apache.tools.ant.BuildEvent; | import org.apache.tools.ant.BuildEvent; | ||||
| import org.apache.tools.ant.BuildListener; | import org.apache.tools.ant.BuildListener; | ||||
| import javax.swing.*; | |||||
| import java.awt.*; | |||||
| import java.awt.event.*; | |||||
| import javax.swing.JWindow; | |||||
| import javax.swing.JLabel; | |||||
| import javax.swing.JPanel; | |||||
| import javax.swing.JProgressBar; | |||||
| import javax.swing.BorderFactory; | |||||
| import javax.swing.ImageIcon; | |||||
| import java.awt.event.ActionListener; | |||||
| import java.awt.event.ActionEvent; | |||||
| import java.awt.BorderLayout; | |||||
| import java.awt.Color; | |||||
| import java.awt.Dimension; | |||||
| import java.awt.Font; | |||||
| import java.awt.Toolkit; | |||||
| class SplashScreen extends JWindow implements ActionListener, BuildListener { | class SplashScreen extends JWindow implements ActionListener, BuildListener { | ||||
| @@ -54,14 +54,17 @@ | |||||
| package org.apache.tools.ant.taskdefs.optional.splash; | package org.apache.tools.ant.taskdefs.optional.splash; | ||||
| import java.io.InputStream; | |||||
| import java.io.DataInputStream; | |||||
| import java.io.ByteArrayOutputStream; | |||||
| import java.io.IOException; | |||||
| import java.net.URL; | |||||
| import java.net.URLConnection; | |||||
| import javax.swing.ImageIcon; | import javax.swing.ImageIcon; | ||||
| import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
| import org.apache.tools.ant.Project; | import org.apache.tools.ant.Project; | ||||
| import org.apache.tools.ant.Task; | import org.apache.tools.ant.Task; | ||||
| import java.io.*; | |||||
| import java.net.*; | |||||
| public class SplashTask extends Task { | public class SplashTask extends Task { | ||||
| private String imgurl = null; | private String imgurl = null; | ||||
| @@ -58,8 +58,6 @@ import org.apache.tools.ant.BuildException; | |||||
| import org.apache.tools.ant.types.Commandline; | import org.apache.tools.ant.types.Commandline; | ||||
| import org.apache.tools.ant.types.Path; | import org.apache.tools.ant.types.Path; | ||||
| import java.io.File; | |||||
| /** | /** | ||||
| * Task to perform Add commands to Microsoft Visual Source Safe. | * Task to perform Add commands to Microsoft Visual Source Safe. | ||||
| * Based on the VSS Checkin code by Martin Poeschl | * Based on the VSS Checkin code by Martin Poeschl | ||||
| @@ -56,9 +56,6 @@ package org.apache.tools.ant.taskdefs.optional.vss; | |||||
| import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
| import org.apache.tools.ant.types.Commandline; | import org.apache.tools.ant.types.Commandline; | ||||
| import org.apache.tools.ant.types.Path; | |||||
| import java.io.File; | |||||
| /** | /** | ||||
| * Task to perform CP (Change Project) commands to Microsoft Visual Source Safe. | * Task to perform CP (Change Project) commands to Microsoft Visual Source Safe. | ||||
| @@ -53,13 +53,8 @@ | |||||
| */ | */ | ||||
| package org.apache.tools.ant.types; | package org.apache.tools.ant.types; | ||||
| import java.io.FilterReader; | |||||
| import java.util.Hashtable; | |||||
| import java.util.Vector; | import java.util.Vector; | ||||
| import org.apache.tools.ant.BuildException; | |||||
| import org.apache.tools.ant.Project; | |||||
| /** | /** | ||||
| * An AntFileReader is a wrapper class that encloses the classname | * An AntFileReader is a wrapper class that encloses the classname | ||||
| * and configuration of a Configurable FilterReader. | * and configuration of a Configurable FilterReader. | ||||
| @@ -54,7 +54,6 @@ | |||||
| package org.apache.tools.ant.types; | package org.apache.tools.ant.types; | ||||
| import java.io.File; | |||||
| import java.util.Properties; | import java.util.Properties; | ||||
| import java.util.Enumeration; | import java.util.Enumeration; | ||||
| import java.util.Vector; | import java.util.Vector; | ||||
| @@ -53,8 +53,6 @@ | |||||
| */ | */ | ||||
| package org.apache.tools.ant.types; | package org.apache.tools.ant.types; | ||||
| import java.util.Vector; | |||||
| /** | /** | ||||
| * Parameterizable objects take genric key value pairs. | * Parameterizable objects take genric key value pairs. | ||||
| * | * | ||||
| @@ -57,7 +57,6 @@ package org.apache.tools.ant.types; | |||||
| import java.util.Stack; | import java.util.Stack; | ||||
| import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
| import org.apache.tools.ant.Project; | import org.apache.tools.ant.Project; | ||||
| import org.apache.tools.ant.types.DataType; | |||||
| /*** | /*** | ||||
| * A regular expression substitution datatype. It is an expression | * A regular expression substitution datatype. It is an expression | ||||