ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [03/17] organize imports
Date Fri, 04 Jul 2014 07:17:45 GMT
http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java b/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java
index 9b979e9..c701fb8 100644
--- a/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java
@@ -18,12 +18,12 @@
 
 package org.apache.tools.ant.types.selectors;
 
-import org.apache.tools.ant.util.FileUtils;
-import org.apache.tools.ant.BuildException;
-
 import java.io.File;
 import java.io.IOException;
 
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.util.FileUtils;
+
 /**
  * This selector selects files against a mapped set of target files, selecting
  * all those files which are different.

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java b/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java
index d557684..af8c920 100644
--- a/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java
@@ -21,9 +21,9 @@ package org.apache.tools.ant.types.selectors;
 import java.io.File;
 import java.util.Vector;
 
-import org.apache.tools.ant.Project;
 import org.apache.tools.ant.AntClassLoader;
 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.Path;
 import org.apache.tools.ant.types.Reference;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java b/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java
index 3b96f1b..63e7a44 100644
--- a/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java
@@ -18,13 +18,13 @@
 
 package org.apache.tools.ant.types.selectors;
 
-import org.apache.tools.ant.types.Mapper;
+import java.io.File;
+
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.util.IdentityMapper;
+import org.apache.tools.ant.types.Mapper;
 import org.apache.tools.ant.util.FileNameMapper;
 import org.apache.tools.ant.util.FileUtils;
-
-import java.io.File;
+import org.apache.tools.ant.util.IdentityMapper;
 
 /**
  * A mapping selector is an abstract class adding mapping support to the base

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/types/selectors/ReadableSelector.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/ReadableSelector.java b/src/main/org/apache/tools/ant/types/selectors/ReadableSelector.java
index f4ee5ba..b0c527c 100644
--- a/src/main/org/apache/tools/ant/types/selectors/ReadableSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/ReadableSelector.java
@@ -19,6 +19,7 @@
 package org.apache.tools.ant.types.selectors;
 
 import java.io.File;
+
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.resources.FileProvider;
 import org.apache.tools.ant.types.resources.selectors.ResourceSelector;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java b/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java
index d0bf593..2089012 100644
--- a/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java
@@ -18,8 +18,8 @@
 
 package org.apache.tools.ant.types.selectors;
 
-import java.util.Enumeration;
 import java.io.File;
+import java.util.Enumeration;
 
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.PropertyHelper;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java b/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java
index 089e132..47e4e4f 100644
--- a/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java
+++ b/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java
@@ -19,6 +19,7 @@
 package org.apache.tools.ant.types.selectors;
 
 import java.util.Enumeration;
+
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/types/selectors/SignedSelector.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/SignedSelector.java b/src/main/org/apache/tools/ant/types/selectors/SignedSelector.java
index 74f8bd5..cd51502 100644
--- a/src/main/org/apache/tools/ant/types/selectors/SignedSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/SignedSelector.java
@@ -18,8 +18,9 @@
 
 package org.apache.tools.ant.types.selectors;
 import java.io.File;
-import org.apache.tools.ant.types.DataType;
+
 import org.apache.tools.ant.taskdefs.condition.IsSigned;
+import org.apache.tools.ant.types.DataType;
 
 /**
  * Selector that chooses files based on whether they are signed or not.

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/types/selectors/WritableSelector.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/WritableSelector.java b/src/main/org/apache/tools/ant/types/selectors/WritableSelector.java
index 219b9d3..6ffd571 100644
--- a/src/main/org/apache/tools/ant/types/selectors/WritableSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/WritableSelector.java
@@ -19,6 +19,7 @@
 package org.apache.tools.ant.types.selectors;
 
 import java.io.File;
+
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.resources.FileProvider;
 import org.apache.tools.ant.types.resources.selectors.ResourceSelector;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ChecksumAlgorithm.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ChecksumAlgorithm.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ChecksumAlgorithm.java
index d05803a..210d5dc 100644
--- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ChecksumAlgorithm.java
+++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ChecksumAlgorithm.java
@@ -18,15 +18,16 @@
 
 package org.apache.tools.ant.types.selectors.modifiedselector;
 
-import java.util.Locale;
-import java.util.zip.Checksum;
-import java.util.zip.CRC32;
-import java.util.zip.Adler32;
-import java.util.zip.CheckedInputStream;
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.BufferedInputStream;
 import java.security.NoSuchAlgorithmException;
+import java.util.Locale;
+import java.util.zip.Adler32;
+import java.util.zip.CRC32;
+import java.util.zip.CheckedInputStream;
+import java.util.zip.Checksum;
+
 import org.apache.tools.ant.BuildException;
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java
index a421b6f..085b4fe 100644
--- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java
+++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java
@@ -21,11 +21,12 @@ package org.apache.tools.ant.types.selectors.modifiedselector;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.util.Locale;
 import java.security.DigestInputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
+import java.util.Locale;
+
 import org.apache.tools.ant.BuildException;
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java
index 8ecd0e0..8af9d12 100644
--- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java
+++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java
@@ -18,11 +18,12 @@
 
 package org.apache.tools.ant.types.selectors.modifiedselector;
 
-import org.apache.tools.ant.util.FileUtils;
 import java.io.File;
 import java.io.FileReader;
 import java.io.Reader;
 
+import org.apache.tools.ant.util.FileUtils;
+
 /**
  * Computes a 'hashvalue' for the content of file using String.hashValue().
  * Use of this algorithm doesn't require any additional nested <param>s and

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
index a934b69..f93e406 100644
--- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
@@ -25,12 +25,12 @@ import java.util.Comparator;
 import java.util.Iterator;
 import java.util.Vector;
 
-// Ant
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.IntrospectionHelper;
+import org.apache.tools.ant.BuildEvent;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.BuildListener;
-import org.apache.tools.ant.BuildEvent;
+import org.apache.tools.ant.IntrospectionHelper;
+// Ant
+import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.apache.tools.ant.types.Parameter;
 import org.apache.tools.ant.types.Path;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java
index 4a8caa2..1446e89 100644
--- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java
+++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java
@@ -19,15 +19,15 @@
 package org.apache.tools.ant.types.selectors.modifiedselector;
 
 
-import java.util.Iterator;
-import java.util.Vector;
-import java.util.Enumeration;
-import java.util.Properties;
-import java.io.File;
 import java.io.BufferedInputStream;
-import java.io.FileInputStream;
 import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.Vector;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/types/spi/Provider.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/spi/Provider.java b/src/main/org/apache/tools/ant/types/spi/Provider.java
index 2edfe78..f73b019 100644
--- a/src/main/org/apache/tools/ant/types/spi/Provider.java
+++ b/src/main/org/apache/tools/ant/types/spi/Provider.java
@@ -17,8 +17,8 @@
  */
 package org.apache.tools.ant.types.spi;
 
-import org.apache.tools.ant.ProjectComponent;
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.ProjectComponent;
 
 /**
  * ANT Jar-Task SPI extension

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/types/spi/Service.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/spi/Service.java b/src/main/org/apache/tools/ant/types/spi/Service.java
index 7656c50..96c8e4e 100644
--- a/src/main/org/apache/tools/ant/types/spi/Service.java
+++ b/src/main/org/apache/tools/ant/types/spi/Service.java
@@ -26,8 +26,8 @@ import java.io.Writer;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.tools.ant.ProjectComponent;
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.ProjectComponent;
 
 /**
  * ANT Jar-Task SPI extension

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/ChainedMapper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/ChainedMapper.java b/src/main/org/apache/tools/ant/util/ChainedMapper.java
index 27927db..635a053 100644
--- a/src/main/org/apache/tools/ant/util/ChainedMapper.java
+++ b/src/main/org/apache/tools/ant/util/ChainedMapper.java
@@ -18,10 +18,10 @@
 
 package org.apache.tools.ant.util;
 
-import java.util.List;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
-import java.util.ArrayList;
+import java.util.List;
 
 /**
  * A <code>ContainerMapper</code> that chains the results of the first

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/ClasspathUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/ClasspathUtils.java b/src/main/org/apache/tools/ant/util/ClasspathUtils.java
index 38db0d5..309860e 100644
--- a/src/main/org/apache/tools/ant/util/ClasspathUtils.java
+++ b/src/main/org/apache/tools/ant/util/ClasspathUtils.java
@@ -19,9 +19,9 @@ package org.apache.tools.ant.util;
 
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.MagicNames;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.ProjectComponent;
-import org.apache.tools.ant.MagicNames;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Reference;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/ConcatFileInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/ConcatFileInputStream.java b/src/main/org/apache/tools/ant/util/ConcatFileInputStream.java
index 7d50984..22dcb7f 100644
--- a/src/main/org/apache/tools/ant/util/ConcatFileInputStream.java
+++ b/src/main/org/apache/tools/ant/util/ConcatFileInputStream.java
@@ -18,11 +18,11 @@
 
 package org.apache.tools.ant.util;
 
-import java.io.File;
-import java.io.InputStream;
 import java.io.BufferedInputStream;
-import java.io.IOException;
+import java.io.File;
 import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.ProjectComponent;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/ConcatResourceInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/ConcatResourceInputStream.java b/src/main/org/apache/tools/ant/util/ConcatResourceInputStream.java
index ae5dd97..7bae58e 100644
--- a/src/main/org/apache/tools/ant/util/ConcatResourceInputStream.java
+++ b/src/main/org/apache/tools/ant/util/ConcatResourceInputStream.java
@@ -18,9 +18,9 @@
 
 package org.apache.tools.ant.util;
 
-import java.io.InputStream;
 import java.io.BufferedInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Iterator;
 
 import org.apache.tools.ant.Project;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/ContainerMapper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/ContainerMapper.java b/src/main/org/apache/tools/ant/util/ContainerMapper.java
index c3bf08c..990ee14 100644
--- a/src/main/org/apache/tools/ant/util/ContainerMapper.java
+++ b/src/main/org/apache/tools/ant/util/ContainerMapper.java
@@ -18,10 +18,11 @@
 
 package org.apache.tools.ant.util;
 
-import java.util.List;
-import java.util.Iterator;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
 import org.apache.tools.ant.types.Mapper;
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/DOMElementWriter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/DOMElementWriter.java b/src/main/org/apache/tools/ant/util/DOMElementWriter.java
index b9b2273..ea1f7f3 100644
--- a/src/main/org/apache/tools/ant/util/DOMElementWriter.java
+++ b/src/main/org/apache/tools/ant/util/DOMElementWriter.java
@@ -26,6 +26,7 @@ import java.io.Writer;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
+
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/FileTokenizer.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/FileTokenizer.java b/src/main/org/apache/tools/ant/util/FileTokenizer.java
index 01ee976..2807aa4 100644
--- a/src/main/org/apache/tools/ant/util/FileTokenizer.java
+++ b/src/main/org/apache/tools/ant/util/FileTokenizer.java
@@ -19,6 +19,7 @@ package org.apache.tools.ant.util;
 
 import java.io.IOException;
 import java.io.Reader;
+
 import org.apache.tools.ant.ProjectComponent;
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/JAXPUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/JAXPUtils.java b/src/main/org/apache/tools/ant/util/JAXPUtils.java
index ca310fb..76460ae 100644
--- a/src/main/org/apache/tools/ant/util/JAXPUtils.java
+++ b/src/main/org/apache/tools/ant/util/JAXPUtils.java
@@ -18,12 +18,14 @@
 package org.apache.tools.ant.util;
 
 import java.io.File;
+
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.FactoryConfigurationError;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
+
 import org.apache.tools.ant.BuildException;
 import org.xml.sax.Parser;
 import org.xml.sax.SAXException;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/LazyHashtable.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/LazyHashtable.java b/src/main/org/apache/tools/ant/util/LazyHashtable.java
index 54fe3d9..1df953c 100644
--- a/src/main/org/apache/tools/ant/util/LazyHashtable.java
+++ b/src/main/org/apache/tools/ant/util/LazyHashtable.java
@@ -17,8 +17,8 @@
  */
 package org.apache.tools.ant.util;
 
-import java.util.Hashtable;
 import java.util.Enumeration;
+import java.util.Hashtable;
 
 /** Hashtable implementation that allows delayed construction
  * of expensive objects

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/LeadPipeInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/LeadPipeInputStream.java b/src/main/org/apache/tools/ant/util/LeadPipeInputStream.java
index 9ebc10c..37650cc 100644
--- a/src/main/org/apache/tools/ant/util/LeadPipeInputStream.java
+++ b/src/main/org/apache/tools/ant/util/LeadPipeInputStream.java
@@ -22,9 +22,9 @@ import java.io.IOException;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 
+import org.apache.tools.ant.Project;
 import org.apache.tools.ant.ProjectComponent;
 import org.apache.tools.ant.Task;
-import org.apache.tools.ant.Project;
 
 /**
  * Special <code>PipedInputStream</code> that will not die

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/LineTokenizer.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/LineTokenizer.java b/src/main/org/apache/tools/ant/util/LineTokenizer.java
index 11e7ebc..778606d 100644
--- a/src/main/org/apache/tools/ant/util/LineTokenizer.java
+++ b/src/main/org/apache/tools/ant/util/LineTokenizer.java
@@ -17,8 +17,8 @@
  */
 package org.apache.tools.ant.util;
 
-import java.io.Reader;
 import java.io.IOException;
+import java.io.Reader;
 
 import org.apache.tools.ant.ProjectComponent;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/LoaderUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/LoaderUtils.java b/src/main/org/apache/tools/ant/util/LoaderUtils.java
index 6744cc7..e0514f6 100644
--- a/src/main/org/apache/tools/ant/util/LoaderUtils.java
+++ b/src/main/org/apache/tools/ant/util/LoaderUtils.java
@@ -18,6 +18,7 @@
 package org.apache.tools.ant.util;
 
 import java.io.File;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.launch.Locator;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/ReflectUtil.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/ReflectUtil.java b/src/main/org/apache/tools/ant/util/ReflectUtil.java
index 07baf3e..ed8b47a 100644
--- a/src/main/org/apache/tools/ant/util/ReflectUtil.java
+++ b/src/main/org/apache/tools/ant/util/ReflectUtil.java
@@ -18,10 +18,11 @@
 package org.apache.tools.ant.util;
 
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+
 import org.apache.tools.ant.BuildException;
-import java.lang.reflect.Field;
 
 /**
  * Utility class to handle reflection on java objects.

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java b/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
index ff6e667..fa620d9 100644
--- a/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
+++ b/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
@@ -19,6 +19,7 @@
 package org.apache.tools.ant.util;
 
 import java.util.Vector;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.util.regexp.RegexpMatcher;
 import org.apache.tools.ant.util.regexp.RegexpMatcherFactory;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/ResourceUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/ResourceUtils.java b/src/main/org/apache/tools/ant/util/ResourceUtils.java
index 16a139a..50c34c2 100644
--- a/src/main/org/apache/tools/ant/util/ResourceUtils.java
+++ b/src/main/org/apache/tools/ant/util/ResourceUtils.java
@@ -31,25 +31,24 @@ import java.io.OutputStreamWriter;
 import java.io.Reader;
 import java.nio.channels.FileChannel;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.Vector;
 
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.ProjectComponent;
 import org.apache.tools.ant.filters.util.ChainReaderHelper;
+import org.apache.tools.ant.types.FilterSetCollection;
 import org.apache.tools.ant.types.Resource;
-import org.apache.tools.ant.types.TimeComparison;
-import org.apache.tools.ant.types.ResourceFactory;
 import org.apache.tools.ant.types.ResourceCollection;
-import org.apache.tools.ant.types.FilterSetCollection;
+import org.apache.tools.ant.types.ResourceFactory;
+import org.apache.tools.ant.types.TimeComparison;
 import org.apache.tools.ant.types.resources.Appendable;
 import org.apache.tools.ant.types.resources.FileProvider;
 import org.apache.tools.ant.types.resources.FileResource;
-import org.apache.tools.ant.types.resources.Union;
-import org.apache.tools.ant.types.resources.Restrict;
 import org.apache.tools.ant.types.resources.Resources;
+import org.apache.tools.ant.types.resources.Restrict;
 import org.apache.tools.ant.types.resources.StringResource;
 import org.apache.tools.ant.types.resources.Touchable;
+import org.apache.tools.ant.types.resources.Union;
 import org.apache.tools.ant.types.resources.selectors.Date;
 import org.apache.tools.ant.types.resources.selectors.ResourceSelector;
 import org.apache.tools.ant.types.selectors.SelectorUtils;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java b/src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java
index 9bf9a60..0b8bf98 100644
--- a/src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java
+++ b/src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java
@@ -17,11 +17,12 @@
  */
 package org.apache.tools.ant.util;
 
-import org.apache.tools.ant.AntClassLoader;
-import org.apache.tools.ant.BuildException;
 import java.io.File;
-import java.util.Map;
 import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tools.ant.AntClassLoader;
+import org.apache.tools.ant.BuildException;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java b/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java
index 67bb54c..b8aa01a 100644
--- a/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java
+++ b/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java
@@ -19,23 +19,22 @@ package org.apache.tools.ant.util;
 
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.Reader;
-import java.io.FileNotFoundException;
 import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.ProjectComponent;
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.ProjectComponent;
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.ResourceCollection;
 
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Iterator;
-
 /**
  * This is a common abstract base case for script runners.
  * These classes need to implement executeScript, evaluateScript

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/SourceFileScanner.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/SourceFileScanner.java b/src/main/org/apache/tools/ant/util/SourceFileScanner.java
index e986987..c79f034 100644
--- a/src/main/org/apache/tools/ant/util/SourceFileScanner.java
+++ b/src/main/org/apache/tools/ant/util/SourceFileScanner.java
@@ -20,6 +20,7 @@ package org.apache.tools.ant.util;
 
 import java.io.File;
 import java.util.Vector;
+
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.ResourceFactory;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/StringTokenizer.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/StringTokenizer.java b/src/main/org/apache/tools/ant/util/StringTokenizer.java
index ef91ff6..7addf31 100644
--- a/src/main/org/apache/tools/ant/util/StringTokenizer.java
+++ b/src/main/org/apache/tools/ant/util/StringTokenizer.java
@@ -19,6 +19,7 @@ package org.apache.tools.ant.util;
 
 import java.io.IOException;
 import java.io.Reader;
+
 import org.apache.tools.ant.ProjectComponent;
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/StringUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/StringUtils.java b/src/main/org/apache/tools/ant/util/StringUtils.java
index 7491303..b11f92a 100644
--- a/src/main/org/apache/tools/ant/util/StringUtils.java
+++ b/src/main/org/apache/tools/ant/util/StringUtils.java
@@ -17,12 +17,12 @@
  */
 package org.apache.tools.ant.util;
 
-import org.apache.tools.ant.BuildException;
-
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Vector;
 
+import org.apache.tools.ant.BuildException;
+
 /**
  * A set of helper methods related to string manipulation.
  *

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java b/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java
index f52ea0d..d6c7353 100644
--- a/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java
+++ b/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java
@@ -21,6 +21,8 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FilenameFilter;
 import java.io.IOException;
+
+import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.taskdefs.Execute;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/TeeOutputStream.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/TeeOutputStream.java b/src/main/org/apache/tools/ant/util/TeeOutputStream.java
index 7daf11f..eb8da3f 100644
--- a/src/main/org/apache/tools/ant/util/TeeOutputStream.java
+++ b/src/main/org/apache/tools/ant/util/TeeOutputStream.java
@@ -18,8 +18,8 @@
 
 package org.apache.tools.ant.util;
 
-import java.io.OutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 
 /**
  * A simple T-piece to replicate an output stream into two separate streams

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/Tokenizer.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/Tokenizer.java b/src/main/org/apache/tools/ant/util/Tokenizer.java
index dc9407c..25f8965 100644
--- a/src/main/org/apache/tools/ant/util/Tokenizer.java
+++ b/src/main/org/apache/tools/ant/util/Tokenizer.java
@@ -17,8 +17,8 @@
  */
 package org.apache.tools.ant.util;
 
-import java.io.Reader;
 import java.io.IOException;
+import java.io.Reader;
 
 /**
  * input stream tokenizers implement this interface

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/UUEncoder.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/UUEncoder.java b/src/main/org/apache/tools/ant/util/UUEncoder.java
index 1c17c62..77e1bee 100644
--- a/src/main/org/apache/tools/ant/util/UUEncoder.java
+++ b/src/main/org/apache/tools/ant/util/UUEncoder.java
@@ -17,8 +17,8 @@
  */
 package org.apache.tools.ant.util;
 
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintStream;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/WorkerAnt.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/WorkerAnt.java b/src/main/org/apache/tools/ant/util/WorkerAnt.java
index 9a6b4d8..a304278 100644
--- a/src/main/org/apache/tools/ant/util/WorkerAnt.java
+++ b/src/main/org/apache/tools/ant/util/WorkerAnt.java
@@ -18,8 +18,8 @@
 
 package org.apache.tools.ant.util;
 
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
 
 /**
  * A worker ant executes a single task in a background thread.

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/XMLFragment.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/XMLFragment.java b/src/main/org/apache/tools/ant/util/XMLFragment.java
index 1f21a3a..36a6158 100644
--- a/src/main/org/apache/tools/ant/util/XMLFragment.java
+++ b/src/main/org/apache/tools/ant/util/XMLFragment.java
@@ -18,16 +18,15 @@
 
 package org.apache.tools.ant.util;
 
+import org.apache.tools.ant.DynamicConfiguratorNS;
+import org.apache.tools.ant.DynamicElementNS;
+import org.apache.tools.ant.ProjectComponent;
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentFragment;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.Text;
 
-import org.apache.tools.ant.DynamicElementNS;
-import org.apache.tools.ant.ProjectComponent;
-import org.apache.tools.ant.DynamicConfiguratorNS;
-
 /**
  * Use this class as a nested element if you want to get a literal DOM
  * fragment of something nested into your task/type.

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java b/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java
index c198c8d..5c95d75 100644
--- a/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java
+++ b/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java
@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.util.Enumeration;
 import java.util.Vector;
 import java.util.zip.ZipFile;
+
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.util.VectorSet;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/depend/DependencyAnalyzer.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/depend/DependencyAnalyzer.java b/src/main/org/apache/tools/ant/util/depend/DependencyAnalyzer.java
index 997ef90..1415e2e 100644
--- a/src/main/org/apache/tools/ant/util/depend/DependencyAnalyzer.java
+++ b/src/main/org/apache/tools/ant/util/depend/DependencyAnalyzer.java
@@ -19,6 +19,7 @@ package org.apache.tools.ant.util.depend;
 import java.io.File;
 import java.io.IOException;
 import java.util.Enumeration;
+
 import org.apache.tools.ant.types.Path;
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java b/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java
index 2bd2a6c..3a9fb3e 100644
--- a/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java
+++ b/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java
@@ -21,11 +21,13 @@ import java.io.IOException;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Vector;
-import org.apache.bcel.classfile.ClassParser;
-import org.apache.bcel.classfile.JavaClass;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.util.depend.AbstractAnalyzer;
 
+import com.sun.org.apache.bcel.internal.classfile.ClassParser;
+import com.sun.org.apache.bcel.internal.classfile.JavaClass;
+
 /**
  * A dependency analyzer which returns superclass and superinterface
  * dependencies.

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java b/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java
index 61dade9..f086b1f 100644
--- a/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java
+++ b/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java
@@ -20,13 +20,10 @@ package org.apache.tools.ant.util.depend.bcel;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.StringTokenizer;
-import org.apache.bcel.classfile.ConstantClass;
-import org.apache.bcel.classfile.ConstantPool;
-import org.apache.bcel.classfile.EmptyVisitor;
-import org.apache.bcel.classfile.Field;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.classfile.Method;
-import org.apache.bcel.classfile.ConstantNameAndType;
+
+import com.sun.org.apache.bcel.internal.classfile.ConstantClass;
+import com.sun.org.apache.bcel.internal.classfile.ConstantNameAndType;
+import com.sun.org.apache.bcel.internal.classfile.JavaClass;
 
 /**
  * A BCEL visitor implementation to collect class dependency information

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java b/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java
index f270fd4..555e9b3 100644
--- a/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java
+++ b/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java
@@ -21,12 +21,14 @@ import java.io.IOException;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Vector;
-import org.apache.bcel.classfile.ClassParser;
-import org.apache.bcel.classfile.DescendingVisitor;
-import org.apache.bcel.classfile.JavaClass;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.util.depend.AbstractAnalyzer;
 
+import com.sun.org.apache.bcel.internal.classfile.ClassParser;
+import com.sun.org.apache.bcel.internal.classfile.DescendingVisitor;
+import com.sun.org.apache.bcel.internal.classfile.JavaClass;
+
 /**
  * An analyzer capable fo traversing all class - class relationships.
  *

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/java15/ProxyDiagnostics.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/java15/ProxyDiagnostics.java b/src/main/org/apache/tools/ant/util/java15/ProxyDiagnostics.java
index 2de657d..e7412d6 100644
--- a/src/main/org/apache/tools/ant/util/java15/ProxyDiagnostics.java
+++ b/src/main/org/apache/tools/ant/util/java15/ProxyDiagnostics.java
@@ -18,17 +18,17 @@
 
 package org.apache.tools.ant.util.java15;
 
-import org.apache.tools.ant.BuildException;
-
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
 import java.net.ProxySelector;
+import java.net.SocketAddress;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.Proxy;
-import java.net.SocketAddress;
-import java.net.InetSocketAddress;
-import java.net.InetAddress;
-import java.util.List;
 import java.util.Iterator;
+import java.util.List;
+
+import org.apache.tools.ant.BuildException;
 
 /**
  * This class exists to create a string that tells diagnostics about the current

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java b/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java
index e5ba859..a24537a 100644
--- a/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java
+++ b/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java
@@ -18,11 +18,11 @@
 
 package org.apache.tools.ant.util.optional;
 
-import org.apache.tools.ant.BuildException;
-
 import java.util.Iterator;
-import org.apache.tools.ant.util.ScriptRunnerBase;
+
+import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.util.ReflectWrapper;
+import org.apache.tools.ant.util.ScriptRunnerBase;
 
 /**
  * This class is used to run scripts using JSR 223.

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/optional/NoExitSecurityManager.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/optional/NoExitSecurityManager.java b/src/main/org/apache/tools/ant/util/optional/NoExitSecurityManager.java
index eed3ad1..e704ab2 100644
--- a/src/main/org/apache/tools/ant/util/optional/NoExitSecurityManager.java
+++ b/src/main/org/apache/tools/ant/util/optional/NoExitSecurityManager.java
@@ -18,6 +18,7 @@
 package org.apache.tools.ant.util.optional;
 
 import java.security.Permission;
+
 import org.apache.tools.ant.ExitException;
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/optional/ScriptRunner.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/optional/ScriptRunner.java b/src/main/org/apache/tools/ant/util/optional/ScriptRunner.java
index 15f6e6f..0f4cd1f 100644
--- a/src/main/org/apache/tools/ant/util/optional/ScriptRunner.java
+++ b/src/main/org/apache/tools/ant/util/optional/ScriptRunner.java
@@ -17,16 +17,14 @@
  */
 package org.apache.tools.ant.util.optional;
 
-import org.apache.bsf.BSFException;
-import org.apache.bsf.BSFManager;
-import org.apache.bsf.BSFEngine;
-
-import java.util.Iterator;
 import java.util.Hashtable;
+import java.util.Iterator;
 
+import org.apache.bsf.BSFEngine;
+import org.apache.bsf.BSFException;
+import org.apache.bsf.BSFManager;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
-
 import org.apache.tools.ant.util.ReflectUtil;
 import org.apache.tools.ant.util.ScriptRunnerBase;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java b/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java
index 59d9e91..643afaf 100644
--- a/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java
+++ b/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java
@@ -19,8 +19,8 @@
 package org.apache.tools.ant.util.regexp;
 
 import java.util.Vector;
-import org.apache.oro.text.regex.MatchResult;
-import org.apache.oro.text.regex.Pattern;
+import java.util.regex.MatchResult;
+
 import org.apache.oro.text.regex.Perl5Compiler;
 import org.apache.oro.text.regex.Perl5Matcher;
 import org.apache.tools.ant.BuildException;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java b/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java
index 2baf98b..156b452 100644
--- a/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java
+++ b/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java
@@ -18,8 +18,6 @@
 package org.apache.tools.ant.util.regexp;
 
 import org.apache.oro.text.regex.Perl5Substitution;
-import org.apache.oro.text.regex.Substitution;
-import org.apache.oro.text.regex.Util;
 import org.apache.tools.ant.BuildException;
 
 /***

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java b/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java
index 3e14415..ab7674b 100644
--- a/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java
+++ b/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java
@@ -19,10 +19,12 @@
 package org.apache.tools.ant.util.regexp;
 
 import java.util.Vector;
-import org.apache.regexp.RE;
-import org.apache.regexp.RESyntaxException;
+
 import org.apache.tools.ant.BuildException;
 
+import com.sun.org.apache.regexp.internal.RE;
+import com.sun.org.apache.regexp.internal.RESyntaxException;
+
 /**
  * Implementation of RegexpMatcher for Jakarta-Regexp.
  *

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java b/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java
index 865f424..50493a2 100644
--- a/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java
+++ b/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java
@@ -18,9 +18,11 @@
 package org.apache.tools.ant.util.regexp;
 
 import java.util.Vector;
-import org.apache.regexp.RE;
+
 import org.apache.tools.ant.BuildException;
 
+import com.sun.org.apache.regexp.internal.RE;
+
 /***
  * Regular expression implementation using the Jakarta Regexp package
  */

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java b/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java
index 07b2b17..8c241d4 100644
--- a/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java
+++ b/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java
@@ -22,6 +22,7 @@ import java.util.Vector;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
+
 import org.apache.tools.ant.BuildException;
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java b/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java
index 8aa0e43..3ca8070 100644
--- a/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java
+++ b/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java
@@ -19,6 +19,7 @@ package org.apache.tools.ant.util.regexp;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import org.apache.tools.ant.BuildException;
 
 /***

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java b/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java
index edd1cfe..7938d8b 100644
--- a/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java
+++ b/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java
@@ -19,6 +19,7 @@
 package org.apache.tools.ant.util.regexp;
 
 import java.util.Vector;
+
 import org.apache.tools.ant.BuildException;
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java b/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java
index 7fabe09..ff221d1 100644
--- a/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java
+++ b/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java
@@ -17,9 +17,9 @@
  */
 package org.apache.tools.ant.util.regexp;
 
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.MagicNames;
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.MagicNames;
+import org.apache.tools.ant.Project;
 import org.apache.tools.ant.util.ClasspathUtils;
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/mail/MailMessage.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/mail/MailMessage.java b/src/main/org/apache/tools/mail/MailMessage.java
index a4c8bfe..71d0d37 100644
--- a/src/main/org/apache/tools/mail/MailMessage.java
+++ b/src/main/org/apache/tools/mail/MailMessage.java
@@ -26,14 +26,14 @@
 
 package org.apache.tools.mail;
 
-import java.io.IOException;
-import java.io.PrintStream;
 import java.io.BufferedOutputStream;
+import java.io.IOException;
 import java.io.OutputStream;
-import java.net.Socket;
+import java.io.PrintStream;
 import java.net.InetAddress;
-import java.util.Vector;
+import java.net.Socket;
 import java.util.Enumeration;
+import java.util.Vector;
 
 /**
  * A class to help send SMTP email.

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/mail/SmtpResponseReader.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/mail/SmtpResponseReader.java b/src/main/org/apache/tools/mail/SmtpResponseReader.java
index 8d52ec8..c1693f4 100644
--- a/src/main/org/apache/tools/mail/SmtpResponseReader.java
+++ b/src/main/org/apache/tools/mail/SmtpResponseReader.java
@@ -18,9 +18,9 @@
 
 package org.apache.tools.mail;
 
-import java.io.InputStream;
-import java.io.IOException;
 import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/tar/TarBuffer.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/tar/TarBuffer.java b/src/main/org/apache/tools/tar/TarBuffer.java
index de23210..b089d9b 100644
--- a/src/main/org/apache/tools/tar/TarBuffer.java
+++ b/src/main/org/apache/tools/tar/TarBuffer.java
@@ -23,9 +23,9 @@
 
 package org.apache.tools.tar;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.IOException;
 import java.util.Arrays;
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/tar/TarOutputStream.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/tar/TarOutputStream.java b/src/main/org/apache/tools/tar/TarOutputStream.java
index 737ae65..e90576f 100644
--- a/src/main/org/apache/tools/tar/TarOutputStream.java
+++ b/src/main/org/apache/tools/tar/TarOutputStream.java
@@ -23,7 +23,6 @@
 
 package org.apache.tools.tar;
 
-import java.io.File;
 import java.io.FilterOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -31,6 +30,7 @@ import java.io.StringWriter;
 import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.Map;
+
 import org.apache.tools.zip.ZipEncoding;
 import org.apache.tools.zip.ZipEncodingHelper;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/tar/TarUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/tar/TarUtils.java b/src/main/org/apache/tools/tar/TarUtils.java
index 264ff99..c057441 100644
--- a/src/main/org/apache/tools/tar/TarUtils.java
+++ b/src/main/org/apache/tools/tar/TarUtils.java
@@ -26,6 +26,7 @@ package org.apache.tools.tar;
 import java.io.IOException;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
+
 import org.apache.tools.zip.ZipEncoding;
 import org.apache.tools.zip.ZipEncodingHelper;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/zip/Zip64ExtendedInformationExtraField.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/zip/Zip64ExtendedInformationExtraField.java b/src/main/org/apache/tools/zip/Zip64ExtendedInformationExtraField.java
index 96367fb..16502ac 100644
--- a/src/main/org/apache/tools/zip/Zip64ExtendedInformationExtraField.java
+++ b/src/main/org/apache/tools/zip/Zip64ExtendedInformationExtraField.java
@@ -18,11 +18,11 @@
  */
 package org.apache.tools.zip;
 
-import java.util.zip.ZipException;
-
 import static org.apache.tools.zip.ZipConstants.DWORD;
 import static org.apache.tools.zip.ZipConstants.WORD;
 
+import java.util.zip.ZipException;
+
 /**
  * Holds size and other extended information for entries that use Zip64
  * features.

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/zip/ZipEightByteInteger.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/zip/ZipEightByteInteger.java b/src/main/org/apache/tools/zip/ZipEightByteInteger.java
index 55cd3c5..8d582dd 100644
--- a/src/main/org/apache/tools/zip/ZipEightByteInteger.java
+++ b/src/main/org/apache/tools/zip/ZipEightByteInteger.java
@@ -17,10 +17,10 @@
  */
 package org.apache.tools.zip;
 
-import java.math.BigInteger;
-
 import static org.apache.tools.zip.ZipConstants.BYTE_MASK;
 
+import java.math.BigInteger;
+
 /**
  * Utility class that represents an eight byte integer with conversion
  * rules for the big endian byte order of ZIP files.

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/zip/ZipFile.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/zip/ZipFile.java b/src/main/org/apache/tools/zip/ZipFile.java
index c9a74ba..560314d 100644
--- a/src/main/org/apache/tools/zip/ZipFile.java
+++ b/src/main/org/apache/tools/zip/ZipFile.java
@@ -18,6 +18,12 @@
 
 package org.apache.tools.zip;
 
+import static org.apache.tools.zip.ZipConstants.DWORD;
+import static org.apache.tools.zip.ZipConstants.SHORT;
+import static org.apache.tools.zip.ZipConstants.WORD;
+import static org.apache.tools.zip.ZipConstants.ZIP64_MAGIC;
+import static org.apache.tools.zip.ZipConstants.ZIP64_MAGIC_SHORT;
+
 import java.io.EOFException;
 import java.io.File;
 import java.io.IOException;
@@ -36,12 +42,6 @@ import java.util.zip.Inflater;
 import java.util.zip.InflaterInputStream;
 import java.util.zip.ZipException;
 
-import static org.apache.tools.zip.ZipConstants.DWORD;
-import static org.apache.tools.zip.ZipConstants.SHORT;
-import static org.apache.tools.zip.ZipConstants.WORD;
-import static org.apache.tools.zip.ZipConstants.ZIP64_MAGIC;
-import static org.apache.tools.zip.ZipConstants.ZIP64_MAGIC_SHORT;
-
 /**
  * Replacement for <code>java.util.ZipFile</code>.
  *

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/zip/ZipOutputStream.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/zip/ZipOutputStream.java b/src/main/org/apache/tools/zip/ZipOutputStream.java
index 4e1e6c9..a04eae6 100644
--- a/src/main/org/apache/tools/zip/ZipOutputStream.java
+++ b/src/main/org/apache/tools/zip/ZipOutputStream.java
@@ -18,6 +18,15 @@
 
 package org.apache.tools.zip;
 
+import static org.apache.tools.zip.ZipConstants.DATA_DESCRIPTOR_MIN_VERSION;
+import static org.apache.tools.zip.ZipConstants.DWORD;
+import static org.apache.tools.zip.ZipConstants.INITIAL_VERSION;
+import static org.apache.tools.zip.ZipConstants.SHORT;
+import static org.apache.tools.zip.ZipConstants.WORD;
+import static org.apache.tools.zip.ZipConstants.ZIP64_MAGIC;
+import static org.apache.tools.zip.ZipConstants.ZIP64_MAGIC_SHORT;
+import static org.apache.tools.zip.ZipConstants.ZIP64_MIN_VERSION;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FilterOutputStream;
@@ -34,15 +43,6 @@ import java.util.zip.CRC32;
 import java.util.zip.Deflater;
 import java.util.zip.ZipException;
 
-import static org.apache.tools.zip.ZipConstants.DATA_DESCRIPTOR_MIN_VERSION;
-import static org.apache.tools.zip.ZipConstants.DWORD;
-import static org.apache.tools.zip.ZipConstants.INITIAL_VERSION;
-import static org.apache.tools.zip.ZipConstants.SHORT;
-import static org.apache.tools.zip.ZipConstants.WORD;
-import static org.apache.tools.zip.ZipConstants.ZIP64_MAGIC;
-import static org.apache.tools.zip.ZipConstants.ZIP64_MAGIC_SHORT;
-import static org.apache.tools.zip.ZipConstants.ZIP64_MIN_VERSION;
-
 /**
  * Reimplementation of {@link java.util.zip.ZipOutputStream
  * java.util.zip.ZipOutputStream} that does handle the extended


Mime
View raw message