git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274483 13f79535-47bb-0310-9956-ffa450edef68master
@@ -59,22 +59,6 @@ import org.apache.tools.ant.types.*; | |||||
import java.io.*; | import java.io.*; | ||||
import java.util.*; | import java.util.*; | ||||
import org.xml.sax.Locator; | |||||
import org.xml.sax.InputSource; | |||||
//import org.xml.sax.HandlerBase; | |||||
import org.xml.sax.SAXParseException; | |||||
import org.xml.sax.XMLReader; | |||||
import org.xml.sax.SAXException; | |||||
import org.xml.sax.DocumentHandler; | |||||
import org.xml.sax.Attributes; | |||||
import org.xml.sax.AttributeList; | |||||
import org.xml.sax.helpers.XMLReaderAdapter; | |||||
import org.xml.sax.helpers.DefaultHandler; | |||||
import org.xml.sax.helpers.AttributeListImpl; | |||||
import javax.xml.parsers.SAXParserFactory; | |||||
import javax.xml.parsers.SAXParser; | |||||
import javax.xml.parsers.ParserConfigurationException; | |||||
/** | /** | ||||
* EXPERIMENTAL | * EXPERIMENTAL | ||||
@@ -60,9 +60,7 @@ import java.io.File; | |||||
import java.io.FileInputStream; | import java.io.FileInputStream; | ||||
import java.io.FileOutputStream; | import java.io.FileOutputStream; | ||||
import java.io.FileReader; | import java.io.FileReader; | ||||
import java.io.FileWriter; | |||||
import java.io.IOException; | import java.io.IOException; | ||||
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.OutputStreamWriter; | ||||
@@ -75,7 +73,6 @@ import java.util.Vector; | |||||
import org.apache.tools.ant.BuildException; | 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.ProjectHelper; | |||||
import org.apache.tools.ant.Task; | import org.apache.tools.ant.Task; | ||||
import org.apache.tools.ant.filters.util.ChainReaderHelper; | import org.apache.tools.ant.filters.util.ChainReaderHelper; | ||||
import org.apache.tools.ant.types.FileList; | import org.apache.tools.ant.types.FileList; | ||||
@@ -83,7 +80,6 @@ import org.apache.tools.ant.types.FileSet; | |||||
import org.apache.tools.ant.types.FilterChain; | import org.apache.tools.ant.types.FilterChain; | ||||
import org.apache.tools.ant.types.Path; | import org.apache.tools.ant.types.Path; | ||||
import org.apache.tools.ant.util.FileUtils; | import org.apache.tools.ant.util.FileUtils; | ||||
import org.apache.tools.ant.util.StringUtils; // 1.1 | |||||
/** | /** | ||||
* This class contains the 'concat' task, used to concatenate a series | * This class contains the 'concat' task, used to concatenate a series | ||||
@@ -68,7 +68,6 @@ import org.apache.tools.ant.types.selectors.DateSelector; | |||||
import org.apache.tools.ant.types.selectors.DependSelector; | import org.apache.tools.ant.types.selectors.DependSelector; | ||||
import org.apache.tools.ant.types.selectors.DepthSelector; | import org.apache.tools.ant.types.selectors.DepthSelector; | ||||
import org.apache.tools.ant.types.selectors.ExtendSelector; | import org.apache.tools.ant.types.selectors.ExtendSelector; | ||||
import org.apache.tools.ant.types.selectors.FileSelector; | |||||
import org.apache.tools.ant.types.selectors.FilenameSelector; | import org.apache.tools.ant.types.selectors.FilenameSelector; | ||||
import org.apache.tools.ant.types.selectors.MajoritySelector; | import org.apache.tools.ant.types.selectors.MajoritySelector; | ||||
import org.apache.tools.ant.types.selectors.NoneSelector; | import org.apache.tools.ant.types.selectors.NoneSelector; | ||||
@@ -76,7 +75,6 @@ import org.apache.tools.ant.types.selectors.NotSelector; | |||||
import org.apache.tools.ant.types.selectors.OrSelector; | import org.apache.tools.ant.types.selectors.OrSelector; | ||||
import org.apache.tools.ant.types.selectors.PresentSelector; | import org.apache.tools.ant.types.selectors.PresentSelector; | ||||
import org.apache.tools.ant.types.selectors.SelectSelector; | import org.apache.tools.ant.types.selectors.SelectSelector; | ||||
import org.apache.tools.ant.types.selectors.SelectorContainer; | |||||
import org.apache.tools.ant.types.selectors.SizeSelector; | import org.apache.tools.ant.types.selectors.SizeSelector; | ||||
/** | /** | ||||
@@ -55,7 +55,6 @@ | |||||
package org.apache.tools.ant.taskdefs; | package org.apache.tools.ant.taskdefs; | ||||
import org.apache.tools.ant.*; | import org.apache.tools.ant.*; | ||||
import org.apache.tools.ant.helper.ProjectHelper2; | |||||
import java.io.File; | import java.io.File; | ||||
import java.io.IOException; | import java.io.IOException; | ||||
@@ -74,7 +74,6 @@ import org.apache.tools.ant.BuildException; | |||||
import org.apache.tools.ant.Project; | import org.apache.tools.ant.Project; | ||||
import org.apache.tools.ant.types.EnumeratedAttribute; | import org.apache.tools.ant.types.EnumeratedAttribute; | ||||
import org.apache.tools.ant.types.FileSet; | import org.apache.tools.ant.types.FileSet; | ||||
import org.apache.tools.ant.types.Resource; | |||||
import org.apache.tools.ant.types.ZipFileSet; | import org.apache.tools.ant.types.ZipFileSet; | ||||
import org.apache.tools.zip.ZipOutputStream; | import org.apache.tools.zip.ZipOutputStream; | ||||
@@ -61,7 +61,6 @@ import java.io.InputStream; | |||||
import java.util.Enumeration; | import java.util.Enumeration; | ||||
import java.util.Properties; | import java.util.Properties; | ||||
import java.util.Vector; | import java.util.Vector; | ||||
import org.apache.tools.ant.AntClassLoader; | |||||
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.ProjectHelper; | import org.apache.tools.ant.ProjectHelper; | ||||
@@ -58,7 +58,6 @@ import java.io.File; | |||||
import java.io.IOException; | import java.io.IOException; | ||||
import java.rmi.Remote; | import java.rmi.Remote; | ||||
import java.util.Vector; | import java.util.Vector; | ||||
import org.apache.tools.ant.AntClassLoader; | |||||
import org.apache.tools.ant.BuildException; | 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; | ||||
@@ -67,7 +67,6 @@ import org.apache.tools.ant.types.Path; | |||||
import org.apache.tools.ant.types.Reference; | import org.apache.tools.ant.types.Reference; | ||||
import org.apache.tools.ant.types.XMLCatalog; | import org.apache.tools.ant.types.XMLCatalog; | ||||
import org.apache.tools.ant.util.FileUtils; | import org.apache.tools.ant.util.FileUtils; | ||||
import javax.xml.transform.URIResolver; | |||||
/** | /** | ||||
* Processes a set of XML documents via XSLT. This is | * Processes a set of XML documents via XSLT. This is | ||||
@@ -59,14 +59,11 @@ import java.io.File; | |||||
import java.io.FileInputStream; | import java.io.FileInputStream; | ||||
import java.io.IOException; | import java.io.IOException; | ||||
import java.util.Hashtable; | import java.util.Hashtable; | ||||
import java.util.Enumeration; | |||||
import javax.xml.parsers.DocumentBuilder; | |||||
import javax.xml.parsers.DocumentBuilderFactory; | import javax.xml.parsers.DocumentBuilderFactory; | ||||
import javax.xml.parsers.ParserConfigurationException; | import javax.xml.parsers.ParserConfigurationException; | ||||
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.Path; | import org.apache.tools.ant.types.Path; | ||||
import org.apache.tools.ant.types.Reference; | |||||
import org.apache.tools.ant.util.FileUtils; | import org.apache.tools.ant.util.FileUtils; | ||||
import org.w3c.dom.Element; | import org.w3c.dom.Element; | ||||
import org.w3c.dom.NamedNodeMap; | import org.w3c.dom.NamedNodeMap; | ||||
@@ -59,7 +59,6 @@ import java.io.ByteArrayOutputStream; | |||||
import java.io.File; | import java.io.File; | ||||
import java.io.FileReader; | import java.io.FileReader; | ||||
import java.io.IOException; | import java.io.IOException; | ||||
import java.net.URL; | |||||
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; | ||||
@@ -70,7 +70,6 @@ import org.apache.tools.ant.taskdefs.LogOutputStream; | |||||
import org.apache.tools.ant.taskdefs.MatchingTask; | import org.apache.tools.ant.taskdefs.MatchingTask; | ||||
import org.apache.tools.ant.taskdefs.StreamPumper; | import org.apache.tools.ant.taskdefs.StreamPumper; | ||||
import org.apache.tools.ant.taskdefs.condition.Os; | import org.apache.tools.ant.taskdefs.condition.Os; | ||||
import org.apache.tools.ant.types.Commandline; | |||||
import org.apache.tools.ant.types.FileSet; | import org.apache.tools.ant.types.FileSet; | ||||
import org.apache.tools.ant.util.FileUtils; | import org.apache.tools.ant.util.FileUtils; | ||||
@@ -56,7 +56,6 @@ package org.apache.tools.ant.taskdefs.optional.ccm; | |||||
import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
import org.apache.tools.ant.Project; | |||||
import org.apache.tools.ant.types.Commandline; | import org.apache.tools.ant.types.Commandline; | ||||
@@ -53,7 +53,6 @@ | |||||
*/ | */ | ||||
package org.apache.tools.ant.taskdefs.optional.depend; | package org.apache.tools.ant.taskdefs.optional.depend; | ||||
import java.io.ByteArrayOutputStream; | |||||
import java.io.IOException; | import java.io.IOException; | ||||
import java.io.InputStream; | import java.io.InputStream; | ||||
import java.util.zip.ZipEntry; | import java.util.zip.ZipEntry; | ||||
@@ -69,13 +69,6 @@ package org.apache.tools.ant.taskdefs.optional.dotnet; | |||||
// ==================================================================== | // ==================================================================== | ||||
import java.io.File; | import java.io.File; | ||||
import java.util.Vector; | |||||
import java.util.Enumeration; | |||||
import org.apache.tools.ant.BuildException; | |||||
import org.apache.tools.ant.DirectoryScanner; | |||||
import org.apache.tools.ant.Project; | |||||
import org.apache.tools.ant.types.Path; | |||||
// ==================================================================== | // ==================================================================== | ||||
@@ -71,10 +71,7 @@ import java.util.Enumeration; | |||||
import java.util.Hashtable; | import java.util.Hashtable; | ||||
import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
import org.apache.tools.ant.DirectoryScanner; | |||||
import org.apache.tools.ant.Project; | import org.apache.tools.ant.Project; | ||||
import org.apache.tools.ant.Task; | |||||
import org.apache.tools.ant.taskdefs.MatchingTask; | |||||
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.FileSet; | ||||
import org.apache.tools.ant.types.EnumeratedAttribute; | import org.apache.tools.ant.types.EnumeratedAttribute; | ||||
@@ -64,11 +64,9 @@ import java.io.File; | |||||
import java.util.Vector; | import java.util.Vector; | ||||
import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
import org.apache.tools.ant.DirectoryScanner; | |||||
import org.apache.tools.ant.Project; | import org.apache.tools.ant.Project; | ||||
import org.apache.tools.ant.types.EnumeratedAttribute; | import org.apache.tools.ant.types.EnumeratedAttribute; | ||||
import org.apache.tools.ant.types.FileSet; | import org.apache.tools.ant.types.FileSet; | ||||
import org.apache.tools.ant.taskdefs.MatchingTask; | |||||
/** | /** | ||||
* Assembles .NET Intermediate Language files. The task will only work | * Assembles .NET Intermediate Language files. The task will only work | ||||
@@ -67,7 +67,6 @@ import java.util.jar.JarOutputStream; | |||||
import java.util.jar.Manifest; | import java.util.jar.Manifest; | ||||
import java.util.zip.ZipEntry; | import java.util.zip.ZipEntry; | ||||
import javax.xml.parsers.SAXParser; | import javax.xml.parsers.SAXParser; | ||||
import org.apache.tools.ant.AntClassLoader; | |||||
import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
import org.apache.tools.ant.DirectoryScanner; | import org.apache.tools.ant.DirectoryScanner; | ||||
import org.apache.tools.ant.Location; | import org.apache.tools.ant.Location; | ||||
@@ -63,7 +63,6 @@ import java.util.Iterator; | |||||
import java.util.jar.JarEntry; | import java.util.jar.JarEntry; | ||||
import java.util.jar.JarFile; | import java.util.jar.JarFile; | ||||
import java.util.jar.JarOutputStream; | import java.util.jar.JarOutputStream; | ||||
import org.apache.tools.ant.AntClassLoader; | |||||
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.taskdefs.Java; | import org.apache.tools.ant.taskdefs.Java; | ||||
@@ -62,7 +62,6 @@ import java.lang.reflect.Constructor; | |||||
import java.lang.reflect.Method; | import java.lang.reflect.Method; | ||||
import java.util.Vector; | import java.util.Vector; | ||||
import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
import org.apache.tools.ant.PathTokenizer; | |||||
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 org.apache.tools.ant.taskdefs.Execute; | import org.apache.tools.ant.taskdefs.Execute; | ||||
@@ -58,7 +58,6 @@ import java.io.File; | |||||
import java.util.Date; | import java.util.Date; | ||||
import java.util.Enumeration; | import java.util.Enumeration; | ||||
import java.util.Vector; | import java.util.Vector; | ||||
import org.apache.tools.ant.AntClassLoader; | |||||
import org.apache.tools.ant.BuildException; | 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; | ||||
@@ -60,7 +60,6 @@ import org.apache.tools.ant.Project; | |||||
import org.apache.tools.ant.taskdefs.Java; | import org.apache.tools.ant.taskdefs.Java; | ||||
import org.apache.tools.ant.taskdefs.optional.jsp.JspC; | import org.apache.tools.ant.taskdefs.optional.jsp.JspC; | ||||
import org.apache.tools.ant.taskdefs.optional.jsp.JspMangler; | import org.apache.tools.ant.taskdefs.optional.jsp.JspMangler; | ||||
import org.apache.tools.ant.taskdefs.optional.jsp.JspNameMangler; | |||||
import org.apache.tools.ant.types.CommandlineJava; | import org.apache.tools.ant.types.CommandlineJava; | ||||
import org.apache.tools.ant.types.Path; | import org.apache.tools.ant.types.Path; | ||||
@@ -58,7 +58,6 @@ import java.io.File; | |||||
import java.io.FileOutputStream; | import java.io.FileOutputStream; | ||||
import java.io.IOException; | import java.io.IOException; | ||||
import java.io.OutputStream; | import java.io.OutputStream; | ||||
import java.net.URL; | |||||
import java.util.Enumeration; | import java.util.Enumeration; | ||||
import java.util.Hashtable; | import java.util.Hashtable; | ||||
import java.util.Properties; | import java.util.Properties; | ||||
@@ -59,7 +59,6 @@ import java.io.ByteArrayOutputStream; | |||||
import java.io.File; | import java.io.File; | ||||
import java.io.FileInputStream; | import java.io.FileInputStream; | ||||
import java.io.IOException; | import java.io.IOException; | ||||
import java.io.OutputStream; | |||||
import java.io.PrintStream; | import java.io.PrintStream; | ||||
import java.io.PrintWriter; | import java.io.PrintWriter; | ||||
import java.io.StringReader; | import java.io.StringReader; | ||||
@@ -59,7 +59,6 @@ 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.SequenceInputStream; | |||||
import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
public abstract class P4HandlerAdapter implements P4Handler { | public abstract class P4HandlerAdapter implements P4Handler { | ||||
@@ -58,7 +58,6 @@ import java.io.File; | |||||
import java.io.FileWriter; | import java.io.FileWriter; | ||||
import java.io.IOException; | import java.io.IOException; | ||||
import java.io.PrintWriter; | import java.io.PrintWriter; | ||||
import java.util.Random; | |||||
import java.util.Vector; | import java.util.Vector; | ||||
import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
import org.apache.tools.ant.DirectoryScanner; | import org.apache.tools.ant.DirectoryScanner; | ||||
@@ -60,7 +60,6 @@ import java.io.IOException; | |||||
import java.io.OutputStream; | import java.io.OutputStream; | ||||
import java.io.PrintWriter; | import java.io.PrintWriter; | ||||
import java.io.StringWriter; | import java.io.StringWriter; | ||||
import java.util.Random; | |||||
import java.util.Vector; | import java.util.Vector; | ||||
import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
import org.apache.tools.ant.Project; | import org.apache.tools.ant.Project; | ||||
@@ -53,7 +53,6 @@ | |||||
*/ | */ | ||||
package org.apache.tools.ant.taskdefs.optional.sos; | package org.apache.tools.ant.taskdefs.optional.sos; | ||||
import org.apache.tools.ant.BuildException; | |||||
import org.apache.tools.ant.types.Commandline; | import org.apache.tools.ant.types.Commandline; | ||||
/** | /** | ||||
@@ -53,7 +53,6 @@ | |||||
*/ | */ | ||||
package org.apache.tools.ant.taskdefs.optional.sos; | package org.apache.tools.ant.taskdefs.optional.sos; | ||||
import org.apache.tools.ant.BuildException; | |||||
import org.apache.tools.ant.types.Commandline; | import org.apache.tools.ant.types.Commandline; | ||||
/** | /** | ||||
@@ -53,7 +53,6 @@ | |||||
*/ | */ | ||||
package org.apache.tools.ant.taskdefs.optional.sos; | package org.apache.tools.ant.taskdefs.optional.sos; | ||||
import org.apache.tools.ant.BuildException; | |||||
import org.apache.tools.ant.types.Commandline; | import org.apache.tools.ant.types.Commandline; | ||||
/** | /** | ||||
@@ -57,16 +57,10 @@ package org.apache.tools.ant.taskdefs.optional.ssh; | |||||
import com.jcraft.jsch.*; | import com.jcraft.jsch.*; | ||||
import java.io.*; | import java.io.*; | ||||
import java.util.List; | |||||
import java.util.LinkedList; | |||||
import java.util.Iterator; | |||||
import java.util.ArrayList; | |||||
import org.apache.tools.ant.Task; | import org.apache.tools.ant.Task; | ||||
import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
import org.apache.tools.ant.DirectoryScanner; | |||||
import org.apache.tools.ant.Project; | import org.apache.tools.ant.Project; | ||||
import org.apache.tools.ant.types.FileSet; | |||||
/** | /** | ||||
* Base class for Ant tasks using jsch. | * Base class for Ant tasks using jsch. | ||||
@@ -62,10 +62,8 @@ import java.io.ByteArrayOutputStream; | |||||
import java.io.File; | import java.io.File; | ||||
import java.io.FileWriter; | import java.io.FileWriter; | ||||
import java.io.IOException; | import java.io.IOException; | ||||
import java.io.OutputStream; | |||||
import java.io.StringReader; | import java.io.StringReader; | ||||
import com.jcraft.jsch.Channel; | |||||
import com.jcraft.jsch.ChannelExec; | import com.jcraft.jsch.ChannelExec; | ||||
import com.jcraft.jsch.Session; | import com.jcraft.jsch.Session; | ||||
@@ -55,7 +55,6 @@ | |||||
package org.apache.tools.ant.taskdefs.optional.ssh; | package org.apache.tools.ant.taskdefs.optional.ssh; | ||||
import com.jcraft.jsch.UserInfo; | import com.jcraft.jsch.UserInfo; | ||||
import org.apache.tools.ant.Project; | |||||
/** | /** | ||||
* @author rhanderson | * @author rhanderson | ||||
@@ -62,7 +62,6 @@ import java.util.LinkedList; | |||||
import java.util.Iterator; | import java.util.Iterator; | ||||
import java.util.ArrayList; | import java.util.ArrayList; | ||||
import org.apache.tools.ant.Task; | |||||
import org.apache.tools.ant.BuildException; | 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; | ||||
@@ -53,19 +53,14 @@ | |||||
*/ | */ | ||||
package org.apache.tools.ant.taskdefs.optional.starteam; | package org.apache.tools.ant.taskdefs.optional.starteam; | ||||
import com.starbase.starteam.File; | |||||
import com.starbase.starteam.Folder; | import com.starbase.starteam.Folder; | ||||
import com.starbase.starteam.Item; | import com.starbase.starteam.Item; | ||||
import com.starbase.starteam.Status; | import com.starbase.starteam.Status; | ||||
import com.starbase.starteam.TypeNames; | |||||
import com.starbase.starteam.View; | import com.starbase.starteam.View; | ||||
import com.starbase.starteam.ViewConfiguration; | import com.starbase.starteam.ViewConfiguration; | ||||
import java.io.FileInputStream; | |||||
import java.io.IOException; | import java.io.IOException; | ||||
import java.util.Enumeration; | import java.util.Enumeration; | ||||
import java.util.Hashtable; | |||||
import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
import org.apache.tools.ant.Project; | |||||
/** | /** | ||||
* Checks files into a StarTeam project. | * Checks files into a StarTeam project. | ||||
@@ -53,11 +53,9 @@ | |||||
*/ | */ | ||||
package org.apache.tools.ant.taskdefs.optional.starteam; | package org.apache.tools.ant.taskdefs.optional.starteam; | ||||
import com.starbase.starteam.File; | |||||
import com.starbase.starteam.Folder; | import com.starbase.starteam.Folder; | ||||
import com.starbase.starteam.Item; | import com.starbase.starteam.Item; | ||||
import com.starbase.starteam.Status; | import com.starbase.starteam.Status; | ||||
import com.starbase.starteam.TypeNames; | |||||
import com.starbase.starteam.View; | import com.starbase.starteam.View; | ||||
import com.starbase.starteam.ViewConfiguration; | import com.starbase.starteam.ViewConfiguration; | ||||
import java.io.IOException; | import java.io.IOException; | ||||
@@ -55,7 +55,6 @@ package org.apache.tools.ant.taskdefs.optional.starteam; | |||||
import com.starbase.starteam.Label; | import com.starbase.starteam.Label; | ||||
import com.starbase.starteam.View; | import com.starbase.starteam.View; | ||||
import com.starbase.starteam.ViewConfiguration; | |||||
import com.starbase.util.OLEDate; | import com.starbase.util.OLEDate; | ||||
import java.text.ParseException; | import java.text.ParseException; | ||||
import java.text.SimpleDateFormat; | import java.text.SimpleDateFormat; | ||||
@@ -62,7 +62,6 @@ import com.starbase.starteam.ViewConfiguration; | |||||
import java.io.IOException; | import java.io.IOException; | ||||
import java.text.SimpleDateFormat; | import java.text.SimpleDateFormat; | ||||
import java.util.Enumeration; | import java.util.Enumeration; | ||||
import java.util.Hashtable; | |||||
import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
import org.apache.tools.ant.Project; | import org.apache.tools.ant.Project; | ||||
@@ -54,17 +54,14 @@ | |||||
package org.apache.tools.ant.taskdefs.optional.starteam; | package org.apache.tools.ant.taskdefs.optional.starteam; | ||||
import com.starbase.starteam.Folder; | import com.starbase.starteam.Folder; | ||||
import com.starbase.starteam.Item; | |||||
import com.starbase.starteam.Label; | import com.starbase.starteam.Label; | ||||
import com.starbase.starteam.StarTeamFinder; | import com.starbase.starteam.StarTeamFinder; | ||||
import com.starbase.starteam.View; | import com.starbase.starteam.View; | ||||
import java.util.Enumeration; | |||||
import java.util.Hashtable; | import java.util.Hashtable; | ||||
import java.util.StringTokenizer; | import java.util.StringTokenizer; | ||||
import org.apache.tools.ant.BuildException; | 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.ProjectComponent; | |||||
/** | /** | ||||
* FileBasedTask.java | * FileBasedTask.java | ||||
@@ -68,8 +68,6 @@ package org.apache.tools.ant.taskdefs.optional.unix; | |||||
import java.io.File; | import java.io.File; | ||||
import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
import org.apache.tools.ant.taskdefs.Execute; | |||||
import org.apache.tools.ant.taskdefs.ExecuteOn; | |||||
import org.apache.tools.ant.taskdefs.condition.Os; | import org.apache.tools.ant.taskdefs.condition.Os; | ||||
import org.apache.tools.ant.types.Commandline; | import org.apache.tools.ant.types.Commandline; | ||||
import org.apache.tools.ant.types.FileSet; | import org.apache.tools.ant.types.FileSet; | ||||
@@ -66,9 +66,7 @@ | |||||
package org.apache.tools.ant.taskdefs.optional.unix; | package org.apache.tools.ant.taskdefs.optional.unix; | ||||
import java.io.File; | import java.io.File; | ||||
import java.io.FileWriter; | |||||
import java.io.IOException; | import java.io.IOException; | ||||
import java.io.StringWriter; | |||||
import java.io.OutputStream; | import java.io.OutputStream; | ||||
import java.io.FileInputStream; | import java.io.FileInputStream; | ||||
import java.io.FileOutputStream; | import java.io.FileOutputStream; | ||||
@@ -91,7 +89,6 @@ import org.apache.tools.ant.util.FileUtils; | |||||
import org.apache.tools.ant.types.FileSet; | import org.apache.tools.ant.types.FileSet; | ||||
import org.apache.tools.ant.taskdefs.Delete; | |||||
import org.apache.tools.ant.taskdefs.Execute; | import org.apache.tools.ant.taskdefs.Execute; | ||||
/** | /** | ||||
@@ -57,8 +57,6 @@ package org.apache.tools.ant.types; | |||||
import org.apache.tools.ant.*; | import org.apache.tools.ant.*; | ||||
import org.apache.tools.ant.helper.ProjectHelperImpl; | import org.apache.tools.ant.helper.ProjectHelperImpl; | ||||
import java.util.Hashtable; | |||||
import java.util.Enumeration; | |||||
import java.util.Vector; | import java.util.Vector; | ||||
@@ -74,7 +74,6 @@ import javax.xml.transform.URIResolver; | |||||
import javax.xml.transform.sax.SAXSource; | import javax.xml.transform.sax.SAXSource; | ||||
import org.apache.tools.ant.AntClassLoader; | import org.apache.tools.ant.AntClassLoader; | ||||
import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
import org.apache.tools.ant.DirectoryScanner; | |||||
import org.apache.tools.ant.Project; | import org.apache.tools.ant.Project; | ||||
import org.apache.tools.ant.util.FileUtils; | import org.apache.tools.ant.util.FileUtils; | ||||
import org.apache.tools.ant.util.JAXPUtils; | import org.apache.tools.ant.util.JAXPUtils; | ||||
@@ -66,7 +66,6 @@ import java.util.zip.ZipException; | |||||
import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
import org.apache.tools.ant.DirectoryScanner; | import org.apache.tools.ant.DirectoryScanner; | ||||
import org.apache.tools.ant.Project; | |||||
/** | /** | ||||
* ZipScanner accesses the pattern matching algorithm in DirectoryScanner, | * ZipScanner accesses the pattern matching algorithm in DirectoryScanner, | ||||
@@ -53,9 +53,7 @@ | |||||
*/ | */ | ||||
package org.apache.tools.ant.types.optional.image; | package org.apache.tools.ant.types.optional.image; | ||||
import javax.media.jai.RenderedOp; | |||||
import javax.media.jai.PlanarImage; | import javax.media.jai.PlanarImage; | ||||
import javax.media.jai.JAI; | |||||
import java.awt.*; | import java.awt.*; | ||||
import java.awt.image.BufferedImage; | import java.awt.image.BufferedImage; | ||||
@@ -54,8 +54,6 @@ | |||||
package org.apache.tools.ant.types.optional.image; | package org.apache.tools.ant.types.optional.image; | ||||
import org.apache.tools.ant.types.DataType; | import org.apache.tools.ant.types.DataType; | ||||
import javax.media.jai.RenderedOp; | |||||
import javax.media.jai.PlanarImage; | |||||
import java.util.Vector; | import java.util.Vector; | ||||
/** | /** | ||||
@@ -53,8 +53,6 @@ | |||||
*/ | */ | ||||
package org.apache.tools.ant.types.optional.image; | package org.apache.tools.ant.types.optional.image; | ||||
import org.apache.tools.ant.types.DataType; | |||||
import javax.media.jai.PlanarImage; | import javax.media.jai.PlanarImage; | ||||
import javax.media.jai.InterpolationNearest; | import javax.media.jai.InterpolationNearest; | ||||
import javax.media.jai.JAI; | import javax.media.jai.JAI; | ||||
@@ -55,7 +55,6 @@ package org.apache.tools.ant.types.optional.image; | |||||
import javax.media.jai.JAI; | import javax.media.jai.JAI; | ||||
import javax.media.jai.PlanarImage; | import javax.media.jai.PlanarImage; | ||||
import java.awt.Graphics2D; | |||||
import java.awt.image.BufferedImage; | import java.awt.image.BufferedImage; | ||||
import java.awt.image.renderable.ParameterBlock; | import java.awt.image.renderable.ParameterBlock; | ||||
@@ -52,7 +52,6 @@ | |||||
* <http://www.apache.org/>. | * <http://www.apache.org/>. | ||||
*/ | */ | ||||
package org.apache.tools.ant.types.optional.image; | package org.apache.tools.ant.types.optional.image; | ||||
import javax.media.jai.RenderedOp; | |||||
import javax.media.jai.PlanarImage; | import javax.media.jai.PlanarImage; | ||||
/** | /** | ||||
@@ -57,7 +57,6 @@ package org.apache.tools.ant.types.resolver; | |||||
import org.apache.xml.resolver.Catalog; | import org.apache.xml.resolver.Catalog; | ||||
import org.apache.xml.resolver.CatalogEntry; | import org.apache.xml.resolver.CatalogEntry; | ||||
import org.apache.xml.resolver.helpers.Debug; | |||||
import org.apache.xml.resolver.helpers.PublicId; | import org.apache.xml.resolver.helpers.PublicId; | ||||
/** | /** | ||||
@@ -64,7 +64,6 @@ import org.apache.tools.ant.BuildException; | |||||
import org.apache.tools.ant.types.XMLCatalog; | import org.apache.tools.ant.types.XMLCatalog; | ||||
import org.apache.tools.ant.types.ResourceLocation; | import org.apache.tools.ant.types.ResourceLocation; | ||||
import org.apache.xml.resolver.Catalog; | |||||
import org.apache.xml.resolver.CatalogManager; | import org.apache.xml.resolver.CatalogManager; | ||||
import org.apache.xml.resolver.tools.CatalogResolver; | import org.apache.xml.resolver.tools.CatalogResolver; | ||||
@@ -61,7 +61,6 @@ import java.io.IOException; | |||||
import java.io.InputStreamReader; | import java.io.InputStreamReader; | ||||
import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
import org.apache.tools.ant.Project; | |||||
import org.apache.tools.ant.types.Parameter; | import org.apache.tools.ant.types.Parameter; | ||||
import org.apache.tools.ant.types.RegularExpression; | import org.apache.tools.ant.types.RegularExpression; | ||||
import org.apache.tools.ant.util.regexp.Regexp; | import org.apache.tools.ant.util.regexp.Regexp; | ||||
@@ -55,11 +55,6 @@ | |||||
package org.apache.tools.ant.types.selectors; | package org.apache.tools.ant.types.selectors; | ||||
import java.io.File; | import java.io.File; | ||||
import org.apache.tools.ant.BuildException; | |||||
import org.apache.tools.ant.taskdefs.condition.Os; | |||||
import org.apache.tools.ant.types.Mapper; | |||||
import org.apache.tools.ant.util.FileNameMapper; | |||||
import org.apache.tools.ant.util.IdentityMapper; | |||||
/** | /** | ||||
* Selector that filters files based on whether they are newer than | * Selector that filters files based on whether they are newer than | ||||
@@ -56,11 +56,9 @@ package org.apache.tools.ant.util; | |||||
import java.io.File; | import java.io.File; | ||||
import java.util.Vector; | import java.util.Vector; | ||||
import org.apache.tools.ant.Project; | |||||
import org.apache.tools.ant.Task; | import org.apache.tools.ant.Task; | ||||
import org.apache.tools.ant.types.ResourceFactory; | import org.apache.tools.ant.types.ResourceFactory; | ||||
import org.apache.tools.ant.types.Resource; | import org.apache.tools.ant.types.Resource; | ||||
import org.apache.tools.ant.taskdefs.condition.Os; | |||||
/** | /** | ||||
* Utility class that collects the functionality of the various | * Utility class that collects the functionality of the various | ||||
@@ -57,7 +57,6 @@ package org.apache.tools.ant.util; | |||||
import org.apache.tools.ant.BuildException; | import org.apache.tools.ant.BuildException; | ||||
import java.lang.reflect.Constructor; | import java.lang.reflect.Constructor; | ||||
import java.lang.reflect.InvocationTargetException; | |||||
/** | /** | ||||