tcopeland 2002/12/18 09:11:02
Modified: src/bootstrap/org/apache/maven BootstrapPomParser.java
BootstrapTask.java
src/java/org/apache/maven MavenUtils.java
src/java/org/apache/maven/ant MavenTask.java
src/java/org/apache/maven/cli App.java
src/java/org/apache/maven/jelly MavenJellyContext.java
src/java/org/apache/maven/jelly/tags LazyAttainGoalTag.java
src/java/org/apache/maven/jelly/tags/project MavenTag.java
PomTag.java ReactorTag.java
src/java/org/apache/maven/jelly/tags/velocity MergeTag.java
src/java/org/apache/maven/plugin PluginManager.java
Log:
Used IDEAJ's optimize imports thingy to clean up the import statements
Revision Changes Path
1.4 +7 -9
jakarta-turbine-maven/src/bootstrap/org/apache/maven/BootstrapPomParser.java
Index: BootstrapPomParser.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/bootstrap/org/apache/maven/BootstrapPomParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BootstrapPomParser.java 26 Oct 2002 15:16:47 -0000 1.3
+++ BootstrapPomParser.java 18 Dec 2002 17:11:01 -0000 1.4
@@ -53,19 +53,17 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-import java.io.File;
-import java.io.FileInputStream;
-
-import java.util.List;
-import java.util.ArrayList;
-
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.DefaultHandler;
+
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.ArrayList;
+import java.util.List;
/**
*/
1.11 +5 -9
jakarta-turbine-maven/src/bootstrap/org/apache/maven/BootstrapTask.java
Index: BootstrapTask.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/bootstrap/org/apache/maven/BootstrapTask.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BootstrapTask.java 10 Dec 2002 04:33:53 -0000 1.10
+++ BootstrapTask.java 18 Dec 2002 17:11:01 -0000 1.11
@@ -55,21 +55,17 @@
*
* ====================================================================
*/
-import java.io.File;
-
-import java.net.URL;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.ArrayList;
-
import org.apache.maven.util.HttpUtils;
-
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.PatternSet;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
/**
* Get a list of resources from a website.
1.78 +3 -13 jakarta-turbine-maven/src/java/org/apache/maven/MavenUtils.java
Index: MavenUtils.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/MavenUtils.java,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- MavenUtils.java 12 Dec 2002 11:37:11 -0000 1.77
+++ MavenUtils.java 18 Dec 2002 17:11:01 -0000 1.78
@@ -60,8 +60,8 @@
import org.apache.commons.betwixt.io.BeanReader;
import org.apache.commons.betwixt.io.BeanWriter;
import org.apache.commons.betwixt.strategy.DecapitalizeNameMapper;
-import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.BeanMap;
+import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.digester.ExtendedBaseRules;
import org.apache.commons.digester.Rule;
import org.apache.commons.jelly.JellyContext;
@@ -91,17 +91,7 @@
import java.io.OutputStreamWriter;
import java.io.StringReader;
import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.ResourceBundle;
-import java.util.MissingResourceException;
-import java.util.Locale;
+import java.util.*;
/**
* Utilities for reading maven project descriptors, profile descriptors and
1.10 +1 -1
jakarta-turbine-maven/src/java/org/apache/maven/ant/MavenTask.java
Index: MavenTask.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ant/MavenTask.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MavenTask.java 2 Dec 2002 01:17:50 -0000 1.9
+++ MavenTask.java 18 Dec 2002 17:11:01 -0000 1.10
@@ -57,8 +57,8 @@
*/
import com.werken.forehead.Forehead;
-import org.apache.maven.MavenConstants;
import org.apache.maven.Maven;
+import org.apache.maven.MavenConstants;
import org.apache.maven.cli.App;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
1.15 +4 -4 jakarta-turbine-maven/src/java/org/apache/maven/cli/App.java
Index: App.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/cli/App.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- App.java 11 Dec 2002 22:42:28 -0000 1.14
+++ App.java 18 Dec 2002 17:11:01 -0000 1.15
@@ -64,13 +64,13 @@
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.maven.MavenUtils;
import org.apache.maven.Maven;
-import org.apache.maven.verifier.RepoConfigException;
-import org.apache.maven.verifier.UnsatisfiedDependencyException;
+import org.apache.maven.MavenUtils;
import org.apache.maven.UnknownGoalException;
import org.apache.maven.jelly.MavenJellyContext;
import org.apache.maven.project.Project;
+import org.apache.maven.verifier.RepoConfigException;
+import org.apache.maven.verifier.UnsatisfiedDependencyException;
import java.io.File;
import java.io.IOException;
1.23 +6 -6
jakarta-turbine-maven/src/java/org/apache/maven/jelly/MavenJellyContext.java
Index: MavenJellyContext.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jelly/MavenJellyContext.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- MavenJellyContext.java 11 Dec 2002 06:28:06 -0000 1.22
+++ MavenJellyContext.java 18 Dec 2002 17:11:02 -0000 1.23
@@ -56,28 +56,28 @@
* ====================================================================
*/
+import org.apache.commons.grant.GrantProject;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.TagLibrary;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.jelly.tags.jeez.JeezTagLibrary;
import org.apache.commons.jelly.expression.Expression;
-import org.apache.commons.grant.GrantProject;
+import org.apache.commons.jelly.tags.jeez.JeezTagLibrary;
import org.apache.commons.lang.StringUtils;
-import org.apache.maven.MavenConstants;
import org.apache.maven.Maven;
+import org.apache.maven.MavenConstants;
import org.apache.maven.MavenUtils;
import org.apache.maven.jelly.tags.MavenJeezTagLibrary;
import org.apache.maven.jelly.tags.project.MavenTagLibrary;
import org.apache.maven.plugin.PluginManager;
-import org.apache.maven.verifier.DependencyVerifier;
import org.apache.maven.project.Project;
+import org.apache.maven.verifier.DependencyVerifier;
import java.io.File;
import java.net.URL;
+import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import java.util.ArrayList;
/** Specialized version of a <code>JellyContext</code>.
*
1.9 +2 -2
jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/LazyAttainGoalTag.java
Index: LazyAttainGoalTag.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/LazyAttainGoalTag.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LazyAttainGoalTag.java 2 Dec 2002 22:46:33 -0000 1.8
+++ LazyAttainGoalTag.java 18 Dec 2002 17:11:02 -0000 1.9
@@ -58,8 +58,8 @@
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.tags.werkz.AttainGoalTag;
-import org.apache.maven.MavenConstants;
import org.apache.maven.Maven;
+import org.apache.maven.MavenConstants;
import org.apache.maven.plugin.PluginManager;
/** Replacement for werkz's <code>AttainGoalTag</code> which accounts
1.23 +2 -2
jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/project/MavenTag.java
Index: MavenTag.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/project/MavenTag.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- MavenTag.java 8 Dec 2002 20:32:39 -0000 1.22
+++ MavenTag.java 18 Dec 2002 17:11:02 -0000 1.23
@@ -59,9 +59,9 @@
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
+import org.apache.maven.Maven;
import org.apache.maven.MavenConstants;
import org.apache.maven.MavenUtils;
-import org.apache.maven.Maven;
import org.apache.maven.jelly.MavenJellyContext;
import org.apache.maven.project.Project;
1.4 +1 -2
jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/project/PomTag.java
Index: PomTag.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/project/PomTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PomTag.java 12 Dec 2002 09:47:53 -0000 1.3
+++ PomTag.java 18 Dec 2002 17:11:02 -0000 1.4
@@ -59,7 +59,6 @@
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-
import org.apache.maven.MavenUtils;
import java.io.File;
1.12 +4 -4
jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/project/ReactorTag.java
Index: ReactorTag.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/project/ReactorTag.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ReactorTag.java 12 Dec 2002 11:41:10 -0000 1.11
+++ ReactorTag.java 18 Dec 2002 17:11:02 -0000 1.12
@@ -58,10 +58,10 @@
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.maven.MavenUtils;
import org.apache.maven.Maven;
-import org.apache.maven.project.Project;
+import org.apache.maven.MavenUtils;
import org.apache.maven.jelly.MavenJellyContext;
+import org.apache.maven.project.Project;
import java.util.ArrayList;
import java.util.Iterator;
1.2 +5 -11
jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/velocity/MergeTag.java
Index: MergeTag.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/velocity/MergeTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MergeTag.java 16 Dec 2002 01:01:00 -0000 1.1
+++ MergeTag.java 18 Dec 2002 17:11:02 -0000 1.2
@@ -56,20 +56,14 @@
* ====================================================================
*/
+import org.apache.commons.jelly.JellyException;
+import org.apache.commons.jelly.XMLOutput;
+import org.apache.velocity.context.Context;
+
import java.io.FileOutputStream;
-import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.StringWriter;
import java.io.Writer;
-import java.util.Iterator;
-
-import org.apache.velocity.context.Context;
-import org.apache.velocity.app.VelocityEngine;
-
-import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.TagSupport;
-import org.apache.commons.jelly.XMLOutput;
/**
* A tag that uses Velocity to render a specified template with the
1.20 +4 -13
jakarta-turbine-maven/src/java/org/apache/maven/plugin/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/plugin/PluginManager.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- PluginManager.java 12 Dec 2002 11:03:27 -0000 1.19
+++ PluginManager.java 18 Dec 2002 17:11:02 -0000 1.20
@@ -61,31 +61,22 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.maven.AbstractMavenComponent;
+import org.apache.maven.ArtifactListBuilder;
import org.apache.maven.DependencyClasspathBuilder;
import org.apache.maven.MavenUtils;
-import org.apache.maven.ArtifactListBuilder;
-import org.apache.maven.verifier.DependencyVerifier;
import org.apache.maven.jelly.JellyUtils;
import org.apache.maven.jelly.MavenJellyContext;
import org.apache.maven.project.Dependency;
import org.apache.maven.project.Project;
import org.apache.maven.repository.Artifact;
import org.apache.maven.util.Expand;
+import org.apache.maven.verifier.DependencyVerifier;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.StringTokenizer;
+import java.util.*;
/**
* Plugin manager for Maven. <p>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
