This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jelly.git
commit 4cb157b2829b2a795f8b70901911fe40dee1c18d
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Jul 8 11:26:37 2023 -0400
Remove unused imports
Sort imports
---
.../src/main/java/org/apache/commons/jelly/Jelly.java | 3 +--
.../java/org/apache/commons/jelly/JellyContext.java | 1 -
.../java/org/apache/commons/jelly/MapTagSupport.java | 1 -
.../java/org/apache/commons/jelly/TagLibrary.java | 2 --
.../commons/jelly/expression/CompositeExpression.java | 2 --
.../commons/jelly/expression/ExpressionSupport.java | 4 +---
.../commons/jelly/expression/jexl/JexlExpression.java | 5 +----
.../jelly/expression/jexl/JexlExpressionFactory.java | 3 +--
.../jelly/expression/xpath/XPathExpression.java | 3 +--
.../apache/commons/jelly/impl/DefaultTagFactory.java | 1 -
.../org/apache/commons/jelly/impl/DynamicTag.java | 2 +-
.../java/org/apache/commons/jelly/impl/Embedded.java | 1 -
.../apache/commons/jelly/impl/ExpressionScript.java | 1 -
.../java/org/apache/commons/jelly/impl/StaticTag.java | 1 -
.../apache/commons/jelly/impl/StaticTagScript.java | 8 ++++----
.../org/apache/commons/jelly/impl/TagFactory.java | 1 -
.../java/org/apache/commons/jelly/impl/TagScript.java | 7 ++-----
.../org/apache/commons/jelly/impl/TextScript.java | 1 -
.../org/apache/commons/jelly/parser/XMLParser.java | 19 ++++++++-----------
.../commons/jelly/servlet/JellyServletContext.java | 7 ++++---
.../java/org/apache/commons/jelly/tags/Resources.java | 5 +++--
.../org/apache/commons/jelly/tags/core/BreakTag.java | 2 +-
.../commons/jelly/tags/core/SetPropertiesTag.java | 3 +--
.../org/apache/commons/jelly/test/BaseJellyTest.java | 4 ++--
.../apache/commons/jelly/util/CommandLineParser.java | 4 ++--
.../test/java/org/apache/commons/jelly/TJEcho.java | 4 ----
.../java/org/apache/commons/jelly/TJTagLibrary.java | 2 --
.../test/java/org/apache/commons/jelly/TJTest.java | 5 -----
.../java/org/apache/commons/jelly/TestCoreTags.java | 10 +++++-----
.../commons/jelly/TestDoctypeDefinitionXXE.java | 4 ++--
.../test/java/org/apache/commons/jelly/TestJelly.java | 4 ++--
.../test/java/org/apache/commons/jelly/TestTrim.java | 4 ++--
.../java/org/apache/commons/jelly/TestXMLOutput.java | 2 --
.../apache/commons/jelly/core/BaseMemoryLeakTest.java | 4 ++--
.../org/apache/commons/jelly/core/TestArgTag.java | 4 ++--
.../org/apache/commons/jelly/core/TestBreakTag.java | 4 ++--
.../org/apache/commons/jelly/core/TestCatchTag.java | 4 ++--
.../org/apache/commons/jelly/core/TestChooseTag.java | 4 ++--
.../org/apache/commons/jelly/core/TestFileTag.java | 4 ++--
.../org/apache/commons/jelly/core/TestForEachTag.java | 4 ++--
.../apache/commons/jelly/core/TestGetStaticTag.java | 6 +++---
.../org/apache/commons/jelly/core/TestIncludeTag.java | 6 +++---
.../commons/jelly/core/TestInvokeStaticTag.java | 4 ++--
.../org/apache/commons/jelly/core/TestInvokeTag.java | 5 ++---
.../commons/jelly/core/TestNamespacePrefixes.java | 4 ++--
.../commons/jelly/core/TestNestedExceptions.java | 4 ++--
.../org/apache/commons/jelly/core/TestNewTag.java | 5 ++---
.../org/apache/commons/jelly/core/TestSwitchTag.java | 4 ++--
.../commons/jelly/core/TestUnexpectedTagCaching.java | 6 +++---
.../apache/commons/jelly/core/TestUnknownTags.java | 6 +++---
.../org/apache/commons/jelly/core/TestUseBeanTag.java | 4 ++--
.../jelly/expression/TestCustomExpressionFactory.java | 11 ++++-------
.../commons/jelly/expression/TestDynaBeans.java | 11 +++++------
.../commons/jelly/expression/TestExpressions.java | 8 ++------
.../apache/commons/jelly/tags/junit/AssertTag.java | 3 +--
.../org/apache/commons/jelly/tags/junit/CaseTag.java | 6 +++---
.../commons/jelly/tags/junit/JUnitTagLibrary.java | 6 ++----
.../jelly/tags/junit/JellyAssertionFailedError.java | 4 ++--
.../commons/jelly/tags/junit/JellyTestSuite.java | 4 ++--
.../org/apache/commons/jelly/tags/junit/RunTag.java | 10 +++++-----
.../org/apache/commons/jelly/tags/junit/SuiteTag.java | 6 +++---
.../apache/commons/jelly/test/impl/TestEmbedded.java | 10 +++++-----
.../org/apache/commons/jelly/test/xml/TestCData.java | 4 ++--
.../jelly/test/xml/TestDefaultNamespaceFilter.java | 6 +++---
.../commons/jelly/test/xml/TestDummyXMLOutput.java | 6 +++---
.../commons/jelly/test/xml/TestNonexistentTags.java | 6 +++---
.../commons/jelly/test/xml/TestXMLParserCache.java | 6 +++---
.../commons/jelly/test/xml/TestXMLValidation.java | 6 +++---
68 files changed, 135 insertions(+), 186 deletions(-)
diff --git a/core/src/main/java/org/apache/commons/jelly/Jelly.java
b/core/src/main/java/org/apache/commons/jelly/Jelly.java
index 980e7df9..d1ebf0a3 100644
--- a/core/src/main/java/org/apache/commons/jelly/Jelly.java
+++ b/core/src/main/java/org/apache/commons/jelly/Jelly.java
@@ -18,9 +18,9 @@
package org.apache.commons.jelly;
import java.io.File;
-import java.io.InputStream;
import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Enumeration;
@@ -31,7 +31,6 @@ import org.apache.commons.jelly.util.ClassLoaderUtils;
import org.apache.commons.jelly.util.CommandLineParser;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.xml.sax.SAXException;
/**
diff --git a/core/src/main/java/org/apache/commons/jelly/JellyContext.java
b/core/src/main/java/org/apache/commons/jelly/JellyContext.java
index cebde072..7acfb72c 100644
--- a/core/src/main/java/org/apache/commons/jelly/JellyContext.java
+++ b/core/src/main/java/org/apache/commons/jelly/JellyContext.java
@@ -29,7 +29,6 @@ import org.apache.commons.jelly.parser.XMLParser;
import org.apache.commons.jelly.util.ClassLoaderUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
diff --git a/core/src/main/java/org/apache/commons/jelly/MapTagSupport.java
b/core/src/main/java/org/apache/commons/jelly/MapTagSupport.java
index 6d279f7c..82de6713 100644
--- a/core/src/main/java/org/apache/commons/jelly/MapTagSupport.java
+++ b/core/src/main/java/org/apache/commons/jelly/MapTagSupport.java
@@ -18,7 +18,6 @@
package org.apache.commons.jelly;
import java.util.HashMap;
-
import java.util.Map;
/**
diff --git a/core/src/main/java/org/apache/commons/jelly/TagLibrary.java
b/core/src/main/java/org/apache/commons/jelly/TagLibrary.java
index 8d76a4e1..567a0f01 100644
--- a/core/src/main/java/org/apache/commons/jelly/TagLibrary.java
+++ b/core/src/main/java/org/apache/commons/jelly/TagLibrary.java
@@ -23,14 +23,12 @@ import java.util.Map;
import org.apache.commons.beanutils.ConvertUtils;
import org.apache.commons.beanutils.Converter;
-
import org.apache.commons.jelly.expression.CompositeExpression;
import org.apache.commons.jelly.expression.ConstantExpression;
import org.apache.commons.jelly.expression.Expression;
import org.apache.commons.jelly.expression.ExpressionFactory;
import org.apache.commons.jelly.impl.TagFactory;
import org.apache.commons.jelly.impl.TagScript;
-
import org.xml.sax.Attributes;
/** <p><code>Taglib</code> represents the metadata for a Jelly custom tag
library.</p>
diff --git
a/core/src/main/java/org/apache/commons/jelly/expression/CompositeExpression.java
b/core/src/main/java/org/apache/commons/jelly/expression/CompositeExpression.java
index d59313ac..2a6ea826 100644
---
a/core/src/main/java/org/apache/commons/jelly/expression/CompositeExpression.java
+++
b/core/src/main/java/org/apache/commons/jelly/expression/CompositeExpression.java
@@ -22,10 +22,8 @@ import java.util.Iterator;
import java.util.List;
import org.apache.commons.collections.iterators.SingletonIterator;
-
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.JellyTagException;
/**
* <p><code>CompositeExpression</code> is a Composite expression made up of
several
diff --git
a/core/src/main/java/org/apache/commons/jelly/expression/ExpressionSupport.java
b/core/src/main/java/org/apache/commons/jelly/expression/ExpressionSupport.java
index bfcd2876..6f98727e 100644
---
a/core/src/main/java/org/apache/commons/jelly/expression/ExpressionSupport.java
+++
b/core/src/main/java/org/apache/commons/jelly/expression/ExpressionSupport.java
@@ -16,8 +16,8 @@
*/
package org.apache.commons.jelly.expression;
-import java.util.Collections;
import java.util.Collection;
+import java.util.Collections;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
@@ -26,9 +26,7 @@ import java.util.Map;
import org.apache.commons.collections.iterators.ArrayIterator;
import org.apache.commons.collections.iterators.EnumerationIterator;
import org.apache.commons.collections.iterators.SingletonIterator;
-
import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.lang.StringUtils;
/** <p><code>ExpressionSupport</code>
diff --git
a/core/src/main/java/org/apache/commons/jelly/expression/jexl/JexlExpression.java
b/core/src/main/java/org/apache/commons/jelly/expression/jexl/JexlExpression.java
index 5d55ad0e..cfc9a32d 100644
---
a/core/src/main/java/org/apache/commons/jelly/expression/jexl/JexlExpression.java
+++
b/core/src/main/java/org/apache/commons/jelly/expression/jexl/JexlExpression.java
@@ -17,17 +17,14 @@
package org.apache.commons.jelly.expression.jexl;
+import java.util.Collection;
import java.util.Map;
import java.util.Set;
-import java.util.Collection;
import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.expression.ExpressionSupport;
-
import org.apache.commons.jexl.Expression;
import org.apache.commons.jexl.JexlContext;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git
a/core/src/main/java/org/apache/commons/jelly/expression/jexl/JexlExpressionFactory.java
b/core/src/main/java/org/apache/commons/jelly/expression/jexl/JexlExpressionFactory.java
index d2d21b85..cf205186 100644
---
a/core/src/main/java/org/apache/commons/jelly/expression/jexl/JexlExpressionFactory.java
+++
b/core/src/main/java/org/apache/commons/jelly/expression/jexl/JexlExpressionFactory.java
@@ -19,10 +19,9 @@ package org.apache.commons.jelly.expression.jexl;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.expression.Expression;
-import org.apache.commons.jelly.expression.ExpressionSupport;
import org.apache.commons.jelly.expression.ExpressionFactory;
+import org.apache.commons.jelly.expression.ExpressionSupport;
//import org.apache.commons.jexl.resolver.FlatResolver;
diff --git
a/core/src/main/java/org/apache/commons/jelly/expression/xpath/XPathExpression.java
b/core/src/main/java/org/apache/commons/jelly/expression/xpath/XPathExpression.java
index 297a74c2..0393a4a6 100644
---
a/core/src/main/java/org/apache/commons/jelly/expression/xpath/XPathExpression.java
+++
b/core/src/main/java/org/apache/commons/jelly/expression/xpath/XPathExpression.java
@@ -21,16 +21,15 @@ import java.util.Iterator;
import java.util.Map;
import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.expression.Expression;
import org.apache.commons.jelly.expression.ExpressionSupport;
import org.apache.commons.jelly.impl.TagScript;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jaxen.JaxenException;
import org.jaxen.SimpleNamespaceContext;
import org.jaxen.VariableContext;
import org.jaxen.XPath;
-import org.jaxen.JaxenException;
import org.jaxen.dom4j.Dom4jXPath;
/** An expression which returns an XPath object.
diff --git
a/core/src/main/java/org/apache/commons/jelly/impl/DefaultTagFactory.java
b/core/src/main/java/org/apache/commons/jelly/impl/DefaultTagFactory.java
index 23f63cfb..a6da6ffd 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/DefaultTagFactory.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/DefaultTagFactory.java
@@ -18,7 +18,6 @@ package org.apache.commons.jelly.impl;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Tag;
-
import org.xml.sax.Attributes;
/**
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/DynamicTag.java
b/core/src/main/java/org/apache/commons/jelly/impl/DynamicTag.java
index e1cf7252..29fe3801 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/DynamicTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/DynamicTag.java
@@ -17,8 +17,8 @@
package org.apache.commons.jelly.impl;
import java.util.HashMap;
-import java.util.Map;
import java.util.Iterator;
+import java.util.Map;
import org.apache.commons.jelly.DynaTagSupport;
import org.apache.commons.jelly.JellyContext;
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/Embedded.java
b/core/src/main/java/org/apache/commons/jelly/impl/Embedded.java
index 0287ee10..5521b6e0 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/Embedded.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/Embedded.java
@@ -27,7 +27,6 @@ import java.net.URL;
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagLibrary;
import org.apache.commons.jelly.XMLOutput;
diff --git
a/core/src/main/java/org/apache/commons/jelly/impl/ExpressionScript.java
b/core/src/main/java/org/apache/commons/jelly/impl/ExpressionScript.java
index ddbfe878..483cbe07 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/ExpressionScript.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/ExpressionScript.java
@@ -21,7 +21,6 @@ import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.expression.Expression;
-
import org.xml.sax.SAXException;
/**
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/StaticTag.java
b/core/src/main/java/org/apache/commons/jelly/impl/StaticTag.java
index 70028988..bc77de71 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/StaticTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/StaticTag.java
@@ -19,7 +19,6 @@ package org.apache.commons.jelly.impl;
import org.apache.commons.jelly.DynaTagSupport;
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.XMLOutput;
-
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
diff --git
a/core/src/main/java/org/apache/commons/jelly/impl/StaticTagScript.java
b/core/src/main/java/org/apache/commons/jelly/impl/StaticTagScript.java
index 3b2eaa9e..56ac708d 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/StaticTagScript.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/StaticTagScript.java
@@ -16,6 +16,10 @@
*/
package org.apache.commons.jelly.impl;
+import java.net.URL;
+import java.util.Iterator;
+import java.util.Map;
+
import org.apache.commons.jelly.DynaTag;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
@@ -26,10 +30,6 @@ import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.expression.Expression;
import org.xml.sax.SAXException;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-
/**
* <p><code>StaticTagScript</code> is a script that evaluates a StaticTag, a
piece of static XML
* though its attributes or element content may contain dynamic expressions.
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/TagFactory.java
b/core/src/main/java/org/apache/commons/jelly/impl/TagFactory.java
index 74e632aa..d3de8b92 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/TagFactory.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/TagFactory.java
@@ -18,7 +18,6 @@ package org.apache.commons.jelly.impl;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Tag;
-
import org.xml.sax.Attributes;
/**
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/TagScript.java
b/core/src/main/java/org/apache/commons/jelly/impl/TagScript.java
index 16879e9c..48132194 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/TagScript.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/TagScript.java
@@ -26,16 +26,15 @@ import java.util.Iterator;
import java.util.Map;
import java.util.WeakHashMap;
-import org.apache.commons.beanutils.ConvertingWrapDynaBean;
import org.apache.commons.beanutils.ConvertUtils;
+import org.apache.commons.beanutils.ConvertingWrapDynaBean;
import org.apache.commons.beanutils.DynaBean;
import org.apache.commons.beanutils.DynaProperty;
-
import org.apache.commons.jelly.CompilableTag;
+import org.apache.commons.jelly.DynaTag;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.JellyTagException;
-import org.apache.commons.jelly.DynaTag;
import org.apache.commons.jelly.LocationAware;
import org.apache.commons.jelly.NamespaceAwareTag;
import org.apache.commons.jelly.Script;
@@ -43,10 +42,8 @@ import org.apache.commons.jelly.Tag;
import org.apache.commons.jelly.TagLibrary;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.expression.Expression;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/TextScript.java
b/core/src/main/java/org/apache/commons/jelly/impl/TextScript.java
index 2b9b67a4..389fdb9e 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/TextScript.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/TextScript.java
@@ -20,7 +20,6 @@ import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
-
import org.xml.sax.SAXException;
/** <p><code>TextScript</code> outputs some static text.</p>
diff --git a/core/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
b/core/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
index 02e2f746..8bf3a24b 100644
--- a/core/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
+++ b/core/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
@@ -17,8 +17,8 @@
package org.apache.commons.jelly.parser;
import java.io.File;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.Reader;
import java.net.URL;
import java.util.ArrayList;
@@ -32,39 +32,36 @@ import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import org.apache.commons.collections.ArrayStack;
-
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.Tag;
import org.apache.commons.jelly.TagLibrary;
+import org.apache.commons.jelly.expression.CompositeExpression;
+import org.apache.commons.jelly.expression.ConstantExpression;
+import org.apache.commons.jelly.expression.Expression;
+import org.apache.commons.jelly.expression.ExpressionFactory;
+import org.apache.commons.jelly.expression.jexl.JexlExpressionFactory;
import org.apache.commons.jelly.impl.CompositeTextScriptBlock;
import org.apache.commons.jelly.impl.ExpressionScript;
-import org.apache.commons.jelly.impl.StaticTag;
import org.apache.commons.jelly.impl.ScriptBlock;
+import org.apache.commons.jelly.impl.StaticTag;
import org.apache.commons.jelly.impl.StaticTagScript;
import org.apache.commons.jelly.impl.TagFactory;
import org.apache.commons.jelly.impl.TagScript;
import org.apache.commons.jelly.impl.TextScript;
import org.apache.commons.jelly.util.ClassLoaderUtils;
-import org.apache.commons.jelly.expression.CompositeExpression;
-import org.apache.commons.jelly.expression.ConstantExpression;
-import org.apache.commons.jelly.expression.Expression;
-import org.apache.commons.jelly.expression.ExpressionFactory;
-import org.apache.commons.jelly.expression.jexl.JexlExpressionFactory;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.xml.sax.Attributes;
import org.xml.sax.ErrorHandler;
-import org.xml.sax.helpers.DefaultHandler;
import org.xml.sax.InputSource;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.AttributesImpl;
+import org.xml.sax.helpers.DefaultHandler;
/** <p><code>XMLParser</code> parses the XML Jelly format.
* The SAXParser and XMLReader portions of this code come from Digester.</p>
diff --git
a/core/src/main/java/org/apache/commons/jelly/servlet/JellyServletContext.java
b/core/src/main/java/org/apache/commons/jelly/servlet/JellyServletContext.java
index ca625e08..dfc17960 100644
---
a/core/src/main/java/org/apache/commons/jelly/servlet/JellyServletContext.java
+++
b/core/src/main/java/org/apache/commons/jelly/servlet/JellyServletContext.java
@@ -17,13 +17,14 @@
package org.apache.commons.jelly.servlet;
-import org.apache.commons.jelly.JellyContext;
-
-import javax.servlet.ServletContext;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
+import javax.servlet.ServletContext;
+
+import org.apache.commons.jelly.JellyContext;
+
/**
*
* @author <a href="mailto:kelv...@apache.org";>Kelvin Tan</a>
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/Resources.java
b/core/src/main/java/org/apache/commons/jelly/tags/Resources.java
index 3d468456..fbd51b60 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/Resources.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/Resources.java
@@ -17,8 +17,9 @@
package org.apache.commons.jelly.tags;
-import java.util.*;
-import java.text.*;
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
/**
* <p>Provides locale-neutral access to string resources. Only the
diff --git
a/core/src/main/java/org/apache/commons/jelly/tags/core/BreakTag.java
b/core/src/main/java/org/apache/commons/jelly/tags/core/BreakTag.java
index 5d4877ba..5b0d3323 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/BreakTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/BreakTag.java
@@ -19,8 +19,8 @@ package org.apache.commons.jelly.tags.core;
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.jelly.impl.BreakException;
import org.apache.commons.jelly.expression.Expression;
+import org.apache.commons.jelly.impl.BreakException;
/**
* A tag which terminates the execution of the current <forEach> or
<while>
diff --git
a/core/src/main/java/org/apache/commons/jelly/tags/core/SetPropertiesTag.java
b/core/src/main/java/org/apache/commons/jelly/tags/core/SetPropertiesTag.java
index 64488398..2af470d3 100644
---
a/core/src/main/java/org/apache/commons/jelly/tags/core/SetPropertiesTag.java
+++
b/core/src/main/java/org/apache/commons/jelly/tags/core/SetPropertiesTag.java
@@ -20,11 +20,10 @@ import java.lang.reflect.InvocationTargetException;
import java.util.Map;
import org.apache.commons.beanutils.BeanUtils;
-
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.JellyTagException;
-import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.MapTagSupport;
+import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.impl.BeanSource;
diff --git
a/core/src/main/java/org/apache/commons/jelly/test/BaseJellyTest.java
b/core/src/main/java/org/apache/commons/jelly/test/BaseJellyTest.java
index 4c4d2ca0..0c22586d 100644
--- a/core/src/main/java/org/apache/commons/jelly/test/BaseJellyTest.java
+++ b/core/src/main/java/org/apache/commons/jelly/test/BaseJellyTest.java
@@ -19,12 +19,12 @@ package org.apache.commons.jelly.test;
import java.io.StringWriter;
import java.net.URL;
-import junit.framework.TestCase;
-
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.XMLOutput;
+import junit.framework.TestCase;
+
/**
* @author Rodney Waldhoff
*/
diff --git
a/core/src/main/java/org/apache/commons/jelly/util/CommandLineParser.java
b/core/src/main/java/org/apache/commons/jelly/util/CommandLineParser.java
index cd08e998..6e485686 100644
--- a/core/src/main/java/org/apache/commons/jelly/util/CommandLineParser.java
+++ b/core/src/main/java/org/apache/commons/jelly/util/CommandLineParser.java
@@ -20,16 +20,16 @@ package org.apache.commons.jelly.util;
import java.io.File;
import java.io.FileWriter;
import java.net.URL;
-import java.util.Arrays;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Properties;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.Parser;
-import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
diff --git a/core/src/test/java/org/apache/commons/jelly/TJEcho.java
b/core/src/test/java/org/apache/commons/jelly/TJEcho.java
index 85122e0d..a22c316b 100644
--- a/core/src/test/java/org/apache/commons/jelly/TJEcho.java
+++ b/core/src/test/java/org/apache/commons/jelly/TJEcho.java
@@ -17,10 +17,6 @@
package org.apache.commons.jelly;
-import org.apache.commons.jelly.MissingAttributeException;
-import org.apache.commons.jelly.JellyTagException;
-import org.apache.commons.jelly.TagSupport;
-import org.apache.commons.jelly.XMLOutput;
import org.xml.sax.SAXException;
public class TJEcho extends TagSupport {
diff --git a/core/src/test/java/org/apache/commons/jelly/TJTagLibrary.java
b/core/src/test/java/org/apache/commons/jelly/TJTagLibrary.java
index 1a98fedf..9a872f71 100644
--- a/core/src/test/java/org/apache/commons/jelly/TJTagLibrary.java
+++ b/core/src/test/java/org/apache/commons/jelly/TJTagLibrary.java
@@ -17,8 +17,6 @@
package org.apache.commons.jelly;
-import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.TagLibrary;
import org.apache.commons.jelly.expression.ConstantExpression;
import org.apache.commons.jelly.expression.Expression;
import org.apache.commons.jelly.expression.ExpressionFactory;
diff --git a/core/src/test/java/org/apache/commons/jelly/TJTest.java
b/core/src/test/java/org/apache/commons/jelly/TJTest.java
index 6e767d71..a709046d 100644
--- a/core/src/test/java/org/apache/commons/jelly/TJTest.java
+++ b/core/src/test/java/org/apache/commons/jelly/TJTest.java
@@ -17,11 +17,6 @@
package org.apache.commons.jelly;
-import org.apache.commons.jelly.MissingAttributeException;
-import org.apache.commons.jelly.JellyTagException;
-import org.apache.commons.jelly.TagSupport;
-import org.apache.commons.jelly.XMLOutput;
-
public class TJTest extends TagSupport {
public static final String TAG_NAME = "test";
diff --git a/core/src/test/java/org/apache/commons/jelly/TestCoreTags.java
b/core/src/test/java/org/apache/commons/jelly/TestCoreTags.java
index dcc83d0f..2906e951 100644
--- a/core/src/test/java/org/apache/commons/jelly/TestCoreTags.java
+++ b/core/src/test/java/org/apache/commons/jelly/TestCoreTags.java
@@ -20,16 +20,16 @@ import java.io.FileInputStream;
import java.io.InputStream;
import java.io.StringWriter;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
import org.apache.commons.jelly.impl.TextScript;
import org.apache.commons.jelly.parser.XMLParser;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
/** Tests the core tags
*
* @author <a href="mailto:jstrac...@apache.org";>James Strachan</a>
diff --git
a/core/src/test/java/org/apache/commons/jelly/TestDoctypeDefinitionXXE.java
b/core/src/test/java/org/apache/commons/jelly/TestDoctypeDefinitionXXE.java
index 4a5eb052..7f8639da 100644
--- a/core/src/test/java/org/apache/commons/jelly/TestDoctypeDefinitionXXE.java
+++ b/core/src/test/java/org/apache/commons/jelly/TestDoctypeDefinitionXXE.java
@@ -16,10 +16,10 @@
*/
package org.apache.commons.jelly;
-import junit.framework.TestCase;
-
import java.net.URL;
+import junit.framework.TestCase;
+
/**
* A test class to validate doctype definitions' declaration of external
* calls using custom xml tags. Specifically we test some changes in {@link
JellyContext}
diff --git a/core/src/test/java/org/apache/commons/jelly/TestJelly.java
b/core/src/test/java/org/apache/commons/jelly/TestJelly.java
index 54f0832d..f879ce47 100644
--- a/core/src/test/java/org/apache/commons/jelly/TestJelly.java
+++ b/core/src/test/java/org/apache/commons/jelly/TestJelly.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.jelly;
+import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
-
/**
* A helper class to run jelly test cases as part of Ant's JUnit tests
*
diff --git a/core/src/test/java/org/apache/commons/jelly/TestTrim.java
b/core/src/test/java/org/apache/commons/jelly/TestTrim.java
index b8a01de6..87986cfb 100644
--- a/core/src/test/java/org/apache/commons/jelly/TestTrim.java
+++ b/core/src/test/java/org/apache/commons/jelly/TestTrim.java
@@ -17,13 +17,13 @@
package org.apache.commons.jelly;
+import org.apache.commons.jelly.impl.TextScript;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.impl.TextScript;
-
/**
* Tests the whitespace triming of scripts.
*
diff --git a/core/src/test/java/org/apache/commons/jelly/TestXMLOutput.java
b/core/src/test/java/org/apache/commons/jelly/TestXMLOutput.java
index 13ff55e1..8c87aec9 100644
--- a/core/src/test/java/org/apache/commons/jelly/TestXMLOutput.java
+++ b/core/src/test/java/org/apache/commons/jelly/TestXMLOutput.java
@@ -18,8 +18,6 @@ package org.apache.commons.jelly;
import java.io.ByteArrayOutputStream;
-import org.apache.commons.jelly.Script;
-import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.test.BaseJellyTest;
/**
diff --git
a/core/src/test/java/org/apache/commons/jelly/core/BaseMemoryLeakTest.java
b/core/src/test/java/org/apache/commons/jelly/core/BaseMemoryLeakTest.java
index 9f628585..d38e2295 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/BaseMemoryLeakTest.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/BaseMemoryLeakTest.java
@@ -21,8 +21,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import junit.framework.TestCase;
-
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Script;
@@ -33,6 +31,8 @@ import org.apache.commons.logging.LogFactory;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+import junit.framework.TestCase;
+
/**
* Automates the basic process of testing a tag library for a memory leak.
* <p>
diff --git a/core/src/test/java/org/apache/commons/jelly/core/TestArgTag.java
b/core/src/test/java/org/apache/commons/jelly/core/TestArgTag.java
index 92dd4671..abd73c2c 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestArgTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestArgTag.java
@@ -19,8 +19,6 @@ package org.apache.commons.jelly.core;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.JellyTagException;
@@ -31,6 +29,8 @@ import org.apache.commons.jelly.tags.core.ArgTag;
import org.apache.commons.jelly.tags.core.ArgTagParent;
import org.apache.commons.jelly.test.BaseJellyTest;
+import junit.framework.TestSuite;
+
/**
* @author Rodney Waldhoff
*/
diff --git a/core/src/test/java/org/apache/commons/jelly/core/TestBreakTag.java
b/core/src/test/java/org/apache/commons/jelly/core/TestBreakTag.java
index 57a36a0e..c9829382 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestBreakTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestBreakTag.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.jelly.core;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.test.BaseJellyTest;
+import junit.framework.TestSuite;
+
public class TestBreakTag extends BaseJellyTest
{
diff --git a/core/src/test/java/org/apache/commons/jelly/core/TestCatchTag.java
b/core/src/test/java/org/apache/commons/jelly/core/TestCatchTag.java
index 9374ac3d..8bdb484c 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestCatchTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestCatchTag.java
@@ -18,11 +18,11 @@
*/
package org.apache.commons.jelly.core;
+import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
-
/**
* New Catch improvement test suite
* @author mde
diff --git
a/core/src/test/java/org/apache/commons/jelly/core/TestChooseTag.java
b/core/src/test/java/org/apache/commons/jelly/core/TestChooseTag.java
index e9125c8b..6a7d504f 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestChooseTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestChooseTag.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.jelly.core;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.test.BaseJellyTest;
+import junit.framework.TestSuite;
+
/**
* @author <a href="mailto:bwald...@apache.org";>Ben Walding</a>
*/
diff --git a/core/src/test/java/org/apache/commons/jelly/core/TestFileTag.java
b/core/src/test/java/org/apache/commons/jelly/core/TestFileTag.java
index 8457ffcd..7730cc5b 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestFileTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestFileTag.java
@@ -18,8 +18,6 @@ package org.apache.commons.jelly.core;
import java.io.StringWriter;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.test.BaseJellyTest;
@@ -28,6 +26,8 @@ import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
import org.xml.sax.SAXException;
+import junit.framework.TestSuite;
+
/**
* @author <a href="mailto:rob...@bull-enterprises.com";>Robert McIntosh</a>
*/
diff --git
a/core/src/test/java/org/apache/commons/jelly/core/TestForEachTag.java
b/core/src/test/java/org/apache/commons/jelly/core/TestForEachTag.java
index 1cff3dcf..587e1750 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestForEachTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestForEachTag.java
@@ -16,12 +16,12 @@
*/
package org.apache.commons.jelly.core;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.test.BaseJellyTest;
import org.apache.commons.lang.StringUtils;
+import junit.framework.TestSuite;
+
/**
* @author <a href="mailto:benander...@benanderson.us";>Ben Anderson</a>
*/
diff --git
a/core/src/test/java/org/apache/commons/jelly/core/TestGetStaticTag.java
b/core/src/test/java/org/apache/commons/jelly/core/TestGetStaticTag.java
index 641027b6..80212e9b 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestGetStaticTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestGetStaticTag.java
@@ -16,12 +16,12 @@
*/
package org.apache.commons.jelly.core;
-import junit.framework.TestSuite;
-
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.JellyTagException;
+import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.test.BaseJellyTest;
+import junit.framework.TestSuite;
+
/**
*/
diff --git
a/core/src/test/java/org/apache/commons/jelly/core/TestIncludeTag.java
b/core/src/test/java/org/apache/commons/jelly/core/TestIncludeTag.java
index e78d6d57..56380f7c 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestIncludeTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestIncludeTag.java
@@ -18,15 +18,15 @@ package org.apache.commons.jelly.core;
import java.net.URL;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagLibrary;
import org.apache.commons.jelly.XMLOutput;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
/**
* Makes sure that nested includes work correctly
*
diff --git
a/core/src/test/java/org/apache/commons/jelly/core/TestInvokeStaticTag.java
b/core/src/test/java/org/apache/commons/jelly/core/TestInvokeStaticTag.java
index af120331..8acc48d1 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestInvokeStaticTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestInvokeStaticTag.java
@@ -16,12 +16,12 @@
*/
package org.apache.commons.jelly.core;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.test.BaseJellyTest;
+import junit.framework.TestSuite;
+
/**
* @author <a href="mailto:rob...@bull-enterprises.com";>Robert McIntosh</a>
*/
diff --git
a/core/src/test/java/org/apache/commons/jelly/core/TestInvokeTag.java
b/core/src/test/java/org/apache/commons/jelly/core/TestInvokeTag.java
index 6e76695a..39dff2a3 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestInvokeTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestInvokeTag.java
@@ -16,13 +16,12 @@
*/
package org.apache.commons.jelly.core;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Script;
-import org.apache.commons.jelly.core.Customer;
import org.apache.commons.jelly.test.BaseJellyTest;
+import junit.framework.TestSuite;
+
/**
* @author Rodney Waldhoff
*/
diff --git
a/core/src/test/java/org/apache/commons/jelly/core/TestNamespacePrefixes.java
b/core/src/test/java/org/apache/commons/jelly/core/TestNamespacePrefixes.java
index e2eb3bde..e744519d 100644
---
a/core/src/test/java/org/apache/commons/jelly/core/TestNamespacePrefixes.java
+++
b/core/src/test/java/org/apache/commons/jelly/core/TestNamespacePrefixes.java
@@ -23,8 +23,6 @@ import java.net.URL;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TJTagLibrary;
@@ -33,6 +31,8 @@ import org.apache.commons.jelly.test.BaseJellyTest;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
+import junit.framework.TestSuite;
+
/**
* Tests for bug JELLY-184, where enabling feature
* "http://xml.org/sax/features/namespace-prefixes"; breaks Jelly.
diff --git
a/core/src/test/java/org/apache/commons/jelly/core/TestNestedExceptions.java
b/core/src/test/java/org/apache/commons/jelly/core/TestNestedExceptions.java
index 1b3ae2f6..20f31897 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestNestedExceptions.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestNestedExceptions.java
@@ -17,11 +17,11 @@
package org.apache.commons.jelly.core;
+import org.apache.commons.jelly.tags.junit.JellyTestSuite;
+
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.tags.junit.JellyTestSuite;
-
public class TestNestedExceptions extends JellyTestSuite {
public static void main( String[] args ) throws Exception {
diff --git a/core/src/test/java/org/apache/commons/jelly/core/TestNewTag.java
b/core/src/test/java/org/apache/commons/jelly/core/TestNewTag.java
index 5773a87b..730009a1 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestNewTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestNewTag.java
@@ -18,12 +18,11 @@ package org.apache.commons.jelly.core;
import java.util.Date;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.Script;
-import org.apache.commons.jelly.core.Customer;
import org.apache.commons.jelly.test.BaseJellyTest;
+import junit.framework.TestSuite;
+
/**
* @author Rodney Waldhoff
*/
diff --git
a/core/src/test/java/org/apache/commons/jelly/core/TestSwitchTag.java
b/core/src/test/java/org/apache/commons/jelly/core/TestSwitchTag.java
index 9c42d7dc..4b660209 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestSwitchTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestSwitchTag.java
@@ -16,13 +16,13 @@
*/
package org.apache.commons.jelly.core;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.test.BaseJellyTest;
+import junit.framework.TestSuite;
+
/**
* @author Rodney Waldhoff
*/
diff --git
a/core/src/test/java/org/apache/commons/jelly/core/TestUnexpectedTagCaching.java
b/core/src/test/java/org/apache/commons/jelly/core/TestUnexpectedTagCaching.java
index 532fc38a..a6d2f639 100644
---
a/core/src/test/java/org/apache/commons/jelly/core/TestUnexpectedTagCaching.java
+++
b/core/src/test/java/org/apache/commons/jelly/core/TestUnexpectedTagCaching.java
@@ -18,8 +18,8 @@ package org.apache.commons.jelly.core;
import java.io.StringReader;
import java.io.StringWriter;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyTagException;
@@ -28,11 +28,11 @@ import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagLibrary;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-
-import junit.framework.TestCase;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+import junit.framework.TestCase;
+
/**
* This test illustrates pre-1.0 Jelly behavior that did not cache tags by
default. Many user tag implementations
* will assume that they are at an initialized state when doTag() is called,
rather than still being "dirty" from a
diff --git
a/core/src/test/java/org/apache/commons/jelly/core/TestUnknownTags.java
b/core/src/test/java/org/apache/commons/jelly/core/TestUnknownTags.java
index 299f8d53..1134d020 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestUnknownTags.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestUnknownTags.java
@@ -16,15 +16,15 @@
*/
package org.apache.commons.jelly.core;
-import junit.framework.TestSuite;
-
+import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Script;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.TJTagLibrary;
import org.apache.commons.jelly.test.BaseJellyTest;
import org.xml.sax.SAXParseException;
+import junit.framework.TestSuite;
+
/**
* Tests for exceptions being raised when an unknown tag is encountered - new
* code added in response to JELLY-13
diff --git
a/core/src/test/java/org/apache/commons/jelly/core/TestUseBeanTag.java
b/core/src/test/java/org/apache/commons/jelly/core/TestUseBeanTag.java
index 3a2e62d7..0672902e 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/TestUseBeanTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/TestUseBeanTag.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.jelly.core;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.test.BaseJellyTest;
+import junit.framework.TestSuite;
+
/**
* Tests for UseBean tag
*/
diff --git
a/core/src/test/java/org/apache/commons/jelly/expression/TestCustomExpressionFactory.java
b/core/src/test/java/org/apache/commons/jelly/expression/TestCustomExpressionFactory.java
index 3898d34a..e25534e6 100644
---
a/core/src/test/java/org/apache/commons/jelly/expression/TestCustomExpressionFactory.java
+++
b/core/src/test/java/org/apache/commons/jelly/expression/TestCustomExpressionFactory.java
@@ -17,18 +17,15 @@
package org.apache.commons.jelly.expression;
-import java.io.File;
-import java.io.StringWriter;
-import java.net.URL;
+import org.apache.commons.jelly.JellyContext;
+import org.apache.commons.jelly.Script;
+import org.apache.commons.jelly.TJTagLibrary;
+import org.apache.commons.jelly.test.BaseJellyTest;
import junit.framework.Test;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.jelly.*;
-import org.apache.commons.jelly.test.BaseJellyTest;
-
public class TestCustomExpressionFactory extends BaseJellyTest {
private static final String EXPECTED = "id=1; attr=${TEST FACTORY: 1 +
2 }; text=${TEST FACTORY: 'hello' + \" world\" }\n" +
diff --git
a/core/src/test/java/org/apache/commons/jelly/expression/TestDynaBeans.java
b/core/src/test/java/org/apache/commons/jelly/expression/TestDynaBeans.java
index d4a8a53a..0cf829ab 100644
--- a/core/src/test/java/org/apache/commons/jelly/expression/TestDynaBeans.java
+++ b/core/src/test/java/org/apache/commons/jelly/expression/TestDynaBeans.java
@@ -19,19 +19,18 @@ package org.apache.commons.jelly.expression;
import java.util.List;
import java.util.Map;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
import org.apache.commons.beanutils.BasicDynaClass;
import org.apache.commons.beanutils.DynaBean;
import org.apache.commons.beanutils.DynaClass;
import org.apache.commons.beanutils.DynaProperty;
-
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.expression.jexl.JexlExpressionFactory;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
/**
* Tests the use of Expression parsing
*
diff --git
a/core/src/test/java/org/apache/commons/jelly/expression/TestExpressions.java
b/core/src/test/java/org/apache/commons/jelly/expression/TestExpressions.java
index c97c2dd7..1457fa3f 100644
---
a/core/src/test/java/org/apache/commons/jelly/expression/TestExpressions.java
+++
b/core/src/test/java/org/apache/commons/jelly/expression/TestExpressions.java
@@ -16,16 +16,12 @@
*/
package org.apache.commons.jelly.expression;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.expression.jexl.JexlExpressionFactory;
+import junit.framework.TestCase;
+
/**
* Tests the use of Expression parsing
*
diff --git
a/core/src/test/java/org/apache/commons/jelly/tags/junit/AssertTag.java
b/core/src/test/java/org/apache/commons/jelly/tags/junit/AssertTag.java
index 1cb9ccb7..dc8e3ad4 100644
--- a/core/src/test/java/org/apache/commons/jelly/tags/junit/AssertTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/tags/junit/AssertTag.java
@@ -17,10 +17,9 @@
package org.apache.commons.jelly.tags.junit;
import org.apache.commons.jelly.JellyTagException;
-import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.MissingAttributeException;
+import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.expression.Expression;
-
import org.jaxen.JaxenException;
import org.jaxen.XPath;
diff --git
a/core/src/test/java/org/apache/commons/jelly/tags/junit/CaseTag.java
b/core/src/test/java/org/apache/commons/jelly/tags/junit/CaseTag.java
index 673eeba1..271d50c8 100644
--- a/core/src/test/java/org/apache/commons/jelly/tags/junit/CaseTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/tags/junit/CaseTag.java
@@ -16,14 +16,14 @@
*/
package org.apache.commons.jelly.tags.junit;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
/**
* Represents a single test case in a test suite; this tag is analagous to
* JUnit's TestCase class.
diff --git
a/core/src/test/java/org/apache/commons/jelly/tags/junit/JUnitTagLibrary.java
b/core/src/test/java/org/apache/commons/jelly/tags/junit/JUnitTagLibrary.java
index e93900a6..6796287e 100644
---
a/core/src/test/java/org/apache/commons/jelly/tags/junit/JUnitTagLibrary.java
+++
b/core/src/test/java/org/apache/commons/jelly/tags/junit/JUnitTagLibrary.java
@@ -16,14 +16,12 @@
*/
package org.apache.commons.jelly.tags.junit;
-import org.apache.commons.jelly.TagLibrary;
-
import org.apache.commons.jelly.JellyException;
+import org.apache.commons.jelly.TagLibrary;
import org.apache.commons.jelly.expression.Expression;
import org.apache.commons.jelly.expression.ExpressionFactory;
-import org.apache.commons.jelly.impl.TagScript;
import org.apache.commons.jelly.expression.xpath.XPathExpression;
-
+import org.apache.commons.jelly.impl.TagScript;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git
a/core/src/test/java/org/apache/commons/jelly/tags/junit/JellyAssertionFailedError.java
b/core/src/test/java/org/apache/commons/jelly/tags/junit/JellyAssertionFailedError.java
index 6284ed00..d1593f68 100644
---
a/core/src/test/java/org/apache/commons/jelly/tags/junit/JellyAssertionFailedError.java
+++
b/core/src/test/java/org/apache/commons/jelly/tags/junit/JellyAssertionFailedError.java
@@ -20,10 +20,10 @@ package org.apache.commons.jelly.tags.junit;
import java.io.PrintStream;
import java.io.PrintWriter;
-import junit.framework.AssertionFailedError;
-
import org.apache.commons.jelly.LocationAware;
+import junit.framework.AssertionFailedError;
+
/**
* <p><code>JellyAssertionFailedError</code> is
* a JUnit AssertionFailedError which is LocationAware so that it can include
diff --git
a/core/src/test/java/org/apache/commons/jelly/tags/junit/JellyTestSuite.java
b/core/src/test/java/org/apache/commons/jelly/tags/junit/JellyTestSuite.java
index 94bddd4f..e9eacc76 100644
--- a/core/src/test/java/org/apache/commons/jelly/tags/junit/JellyTestSuite.java
+++ b/core/src/test/java/org/apache/commons/jelly/tags/junit/JellyTestSuite.java
@@ -18,13 +18,13 @@ package org.apache.commons.jelly.tags.junit;
import java.net.URL;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import junit.framework.TestSuite;
+
/**
* An abstract base class for creating a TestSuite via a Jelly script.
*
diff --git a/core/src/test/java/org/apache/commons/jelly/tags/junit/RunTag.java
b/core/src/test/java/org/apache/commons/jelly/tags/junit/RunTag.java
index d48601ae..218c3289 100644
--- a/core/src/test/java/org/apache/commons/jelly/tags/junit/RunTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/tags/junit/RunTag.java
@@ -19,11 +19,6 @@ package org.apache.commons.jelly.tags.junit;
import java.io.PrintWriter;
import java.io.StringWriter;
-import junit.framework.AssertionFailedError;
-import junit.framework.Test;
-import junit.framework.TestListener;
-import junit.framework.TestResult;
-
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.TagSupport;
@@ -33,6 +28,11 @@ import org.apache.commons.logging.LogFactory;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
+import junit.framework.AssertionFailedError;
+import junit.framework.Test;
+import junit.framework.TestListener;
+import junit.framework.TestResult;
+
/**
* This tag will run the given Test which could be an individual TestCase or a
TestSuite.
* The TestResult can be specified to capture the output, otherwise the
results are output
diff --git
a/core/src/test/java/org/apache/commons/jelly/tags/junit/SuiteTag.java
b/core/src/test/java/org/apache/commons/jelly/tags/junit/SuiteTag.java
index 0b107bf4..27c3d8f1 100644
--- a/core/src/test/java/org/apache/commons/jelly/tags/junit/SuiteTag.java
+++ b/core/src/test/java/org/apache/commons/jelly/tags/junit/SuiteTag.java
@@ -16,13 +16,13 @@
*/
package org.apache.commons.jelly.tags.junit;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
/**
* Represents a collection of TestCases.. This tag is analagous to
* JUnit's TestSuite class.
diff --git
a/core/src/test/java/org/apache/commons/jelly/test/impl/TestEmbedded.java
b/core/src/test/java/org/apache/commons/jelly/test/impl/TestEmbedded.java
index f7b11674..5966c58c 100644
--- a/core/src/test/java/org/apache/commons/jelly/test/impl/TestEmbedded.java
+++ b/core/src/test/java/org/apache/commons/jelly/test/impl/TestEmbedded.java
@@ -20,16 +20,16 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.StringReader;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.impl.Embedded;
import org.xml.sax.InputSource;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
/**
* Unit case of Embedded
*
diff --git
a/core/src/test/java/org/apache/commons/jelly/test/xml/TestCData.java
b/core/src/test/java/org/apache/commons/jelly/test/xml/TestCData.java
index ccc8a291..c4a6cc49 100644
--- a/core/src/test/java/org/apache/commons/jelly/test/xml/TestCData.java
+++ b/core/src/test/java/org/apache/commons/jelly/test/xml/TestCData.java
@@ -18,8 +18,6 @@ package org.apache.commons.jelly.test.xml;
import java.io.StringWriter;
-import junit.framework.TestCase;
-
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.Script;
@@ -28,6 +26,8 @@ import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
import org.xml.sax.SAXException;
+import junit.framework.TestCase;
+
/**
* @author mdelagrange
*/
diff --git
a/core/src/test/java/org/apache/commons/jelly/test/xml/TestDefaultNamespaceFilter.java
b/core/src/test/java/org/apache/commons/jelly/test/xml/TestDefaultNamespaceFilter.java
index f8b6b07a..7ea281bf 100644
---
a/core/src/test/java/org/apache/commons/jelly/test/xml/TestDefaultNamespaceFilter.java
+++
b/core/src/test/java/org/apache/commons/jelly/test/xml/TestDefaultNamespaceFilter.java
@@ -19,14 +19,14 @@ package org.apache.commons.jelly.test.xml;
import java.io.StringWriter;
import java.net.URL;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
/**
* A helper class to run jelly test cases as part of Ant's JUnit tests
*
diff --git
a/core/src/test/java/org/apache/commons/jelly/test/xml/TestDummyXMLOutput.java
b/core/src/test/java/org/apache/commons/jelly/test/xml/TestDummyXMLOutput.java
index 1ca82aa5..9b59f09d 100644
---
a/core/src/test/java/org/apache/commons/jelly/test/xml/TestDummyXMLOutput.java
+++
b/core/src/test/java/org/apache/commons/jelly/test/xml/TestDummyXMLOutput.java
@@ -18,14 +18,14 @@ package org.apache.commons.jelly.test.xml;
import java.net.URL;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
/**
* Confirm that <i>XMLOutput.createDummyXMLOutput()</i>
* doesn't do anything funky.
diff --git
a/core/src/test/java/org/apache/commons/jelly/test/xml/TestNonexistentTags.java
b/core/src/test/java/org/apache/commons/jelly/test/xml/TestNonexistentTags.java
index 148fa62d..460542d8 100644
---
a/core/src/test/java/org/apache/commons/jelly/test/xml/TestNonexistentTags.java
+++
b/core/src/test/java/org/apache/commons/jelly/test/xml/TestNonexistentTags.java
@@ -19,14 +19,14 @@ package org.apache.commons.jelly.test.xml;
import java.net.URL;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.XMLOutput;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
/**
* A test to confirm that Jelly scripts fail to parse if they declare tags
* that do not exist
diff --git
a/core/src/test/java/org/apache/commons/jelly/test/xml/TestXMLParserCache.java
b/core/src/test/java/org/apache/commons/jelly/test/xml/TestXMLParserCache.java
index 5ddc08da..36710c69 100644
---
a/core/src/test/java/org/apache/commons/jelly/test/xml/TestXMLParserCache.java
+++
b/core/src/test/java/org/apache/commons/jelly/test/xml/TestXMLParserCache.java
@@ -19,15 +19,15 @@ package org.apache.commons.jelly.test.xml;
import java.io.StringWriter;
import java.net.URL;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
/**
* A test to confirm that invalid documents are
* reject iff jelly.setValidateXML(true)
diff --git
a/core/src/test/java/org/apache/commons/jelly/test/xml/TestXMLValidation.java
b/core/src/test/java/org/apache/commons/jelly/test/xml/TestXMLValidation.java
index 8a8acc3f..2b94c0dc 100644
---
a/core/src/test/java/org/apache/commons/jelly/test/xml/TestXMLValidation.java
+++
b/core/src/test/java/org/apache/commons/jelly/test/xml/TestXMLValidation.java
@@ -19,15 +19,15 @@ package org.apache.commons.jelly.test.xml;
import java.io.StringWriter;
import java.net.URL;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
/**
* A test to confirm that invalid documents are
* reject iff jelly.setValidateXML(true)
