You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2004/06/26 16:52:06 UTC
cvs commit: maven/src/java/org/apache/maven/ant MavenTask.java
dion 2004/06/26 07:52:06
Modified: src/java/org/apache/maven/plugin Tag: MAVEN-1_0-BRANCH
PluginCacheManager.java PluginManager.java
JellyScriptHousing.java
GoalToJellyScriptHousingMapper.java
PluginScriptParser.java
src/java/org/apache/maven/jelly/tags/werkz Tag:
MAVEN-1_0-BRANCH MavenAttainGoalTag.java
MavenGoalTag.java
src/java/org/apache/maven/jelly Tag: MAVEN-1_0-BRANCH
MavenJellyContext.java JellyUtils.java
src/java/org/apache/maven Tag: MAVEN-1_0-BRANCH
MavenUtils.java
src/java/org/apache/maven/repository Tag: MAVEN-1_0-BRANCH
DefaultArtifactTypeHandler.java
src/java/org/apache/maven/project Tag: MAVEN-1_0-BRANCH
Project.java
src/java/org/apache/maven/cli Tag: MAVEN-1_0-BRANCH App.java
src/java/org/apache/maven/jelly/tags/jeez Tag:
MAVEN-1_0-BRANCH JeezTagLibrary.java
src/java/org/apache/maven/ant Tag: MAVEN-1_0-BRANCH
MavenTask.java
Log:
Make imports consistent
Revision Changes Path
No revision
No revision
1.16.4.17 +6 -7 maven/src/java/org/apache/maven/plugin/PluginCacheManager.java
Index: PluginCacheManager.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/plugin/PluginCacheManager.java,v
retrieving revision 1.16.4.16
retrieving revision 1.16.4.17
diff -u -r1.16.4.16 -r1.16.4.17
--- PluginCacheManager.java 19 May 2004 10:22:12 -0000 1.16.4.16
+++ PluginCacheManager.java 26 Jun 2004 14:52:05 -0000 1.16.4.17
@@ -17,6 +17,12 @@
* ====================================================================
*/
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.maven.MavenException;
+import org.apache.maven.MavenSession;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -24,18 +30,11 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.StringTokenizer;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.maven.MavenException;
-import org.apache.maven.MavenSession;
/**
* Plugin cache management.
1.70.4.47 +3 -2 maven/src/java/org/apache/maven/plugin/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/plugin/PluginManager.java,v
retrieving revision 1.70.4.46
retrieving revision 1.70.4.47
diff -u -r1.70.4.46 -r1.70.4.47
--- PluginManager.java 23 Jun 2004 17:11:27 -0000 1.70.4.46
+++ PluginManager.java 26 Jun 2004 14:52:05 -0000 1.70.4.47
@@ -23,9 +23,10 @@
import com.werken.werkz.Session;
import com.werken.werkz.WerkzProject;
import com.werken.werkz.jelly.JellySession;
+
import org.apache.commons.io.FileUtils;
-import org.apache.commons.jelly.expression.Expression;
import org.apache.commons.jelly.Script;
+import org.apache.commons.jelly.expression.Expression;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.maven.AbstractMavenComponent;
1.3.4.15 +13 -13 maven/src/java/org/apache/maven/plugin/JellyScriptHousing.java
Index: JellyScriptHousing.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/plugin/JellyScriptHousing.java,v
retrieving revision 1.3.4.14
retrieving revision 1.3.4.15
diff -u -r1.3.4.14 -r1.3.4.15
--- JellyScriptHousing.java 11 May 2004 09:48:16 -0000 1.3.4.14
+++ JellyScriptHousing.java 26 Jun 2004 14:52:05 -0000 1.3.4.15
@@ -17,6 +17,18 @@
* ====================================================================
*/
+import org.apache.commons.jelly.Script;
+import org.apache.maven.MavenException;
+import org.apache.maven.MavenUtils;
+import org.apache.maven.jelly.MavenJellyContext;
+import org.apache.maven.project.Project;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -25,18 +37,6 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.apache.commons.jelly.Script;
-import org.apache.maven.MavenException;
-import org.apache.maven.MavenUtils;
-import org.apache.maven.jelly.MavenJellyContext;
-import org.apache.maven.project.Project;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
1.3.4.16 +10 -10 maven/src/java/org/apache/maven/plugin/GoalToJellyScriptHousingMapper.java
Index: GoalToJellyScriptHousingMapper.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/plugin/GoalToJellyScriptHousingMapper.java,v
retrieving revision 1.3.4.15
retrieving revision 1.3.4.16
diff -u -r1.3.4.15 -r1.3.4.16
--- GoalToJellyScriptHousingMapper.java 19 May 2004 10:22:12 -0000 1.3.4.15
+++ GoalToJellyScriptHousingMapper.java 26 Jun 2004 14:52:05 -0000 1.3.4.16
@@ -17,6 +17,16 @@
* ====================================================================
*/
+import com.werken.werkz.CyclicGoalChainException;
+import com.werken.werkz.Goal;
+import com.werken.werkz.NoSuchGoalException;
+import com.werken.werkz.WerkzProject;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.maven.util.InsertionOrderedSet;
+import org.apache.plexus.util.StringUtils;
+
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
@@ -26,16 +36,6 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.maven.util.InsertionOrderedSet;
-import org.apache.plexus.util.StringUtils;
-
-import com.werken.werkz.CyclicGoalChainException;
-import com.werken.werkz.Goal;
-import com.werken.werkz.NoSuchGoalException;
-import com.werken.werkz.WerkzProject;
/**
* This is the process that we use:
1.1.4.13 +0 -3 maven/src/java/org/apache/maven/plugin/PluginScriptParser.java
Index: PluginScriptParser.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/plugin/PluginScriptParser.java,v
retrieving revision 1.1.4.12
retrieving revision 1.1.4.13
diff -u -r1.1.4.12 -r1.1.4.13
--- PluginScriptParser.java 11 May 2004 09:48:16 -0000 1.1.4.12
+++ PluginScriptParser.java 26 Jun 2004 14:52:05 -0000 1.1.4.13
@@ -22,7 +22,6 @@
import org.apache.commons.logging.LogFactory;
import org.apache.maven.MavenException;
import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.DefaultHandler;
@@ -31,8 +30,6 @@
import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
-
-import javax.xml.parsers.ParserConfigurationException;
/**
* Class to parse plugin XML scripts to find goals and tag libraries.
No revision
No revision
1.2.2.8 +2 -1 maven/src/java/org/apache/maven/jelly/tags/werkz/MavenAttainGoalTag.java
Index: MavenAttainGoalTag.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/jelly/tags/werkz/MavenAttainGoalTag.java,v
retrieving revision 1.2.2.7
retrieving revision 1.2.2.8
diff -u -r1.2.2.7 -r1.2.2.8
--- MavenAttainGoalTag.java 14 Apr 2004 00:54:46 -0000 1.2.2.7
+++ MavenAttainGoalTag.java 26 Jun 2004 14:52:05 -0000 1.2.2.8
@@ -24,6 +24,7 @@
import com.werken.werkz.WerkzProject;
import com.werken.werkz.jelly.JellySession;
import com.werken.werkz.jelly.WerkzTagSupport;
+
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.XMLOutput;
import org.apache.maven.MavenConstants;
1.2.4.12 +3 -3 maven/src/java/org/apache/maven/jelly/tags/werkz/MavenGoalTag.java
Index: MavenGoalTag.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/jelly/tags/werkz/MavenGoalTag.java,v
retrieving revision 1.2.4.11
retrieving revision 1.2.4.12
diff -u -r1.2.4.11 -r1.2.4.12
--- MavenGoalTag.java 14 Apr 2004 01:03:44 -0000 1.2.4.11
+++ MavenGoalTag.java 26 Jun 2004 14:52:05 -0000 1.2.4.12
@@ -19,14 +19,14 @@
import com.werken.werkz.Action;
import com.werken.werkz.Goal;
-import com.werken.werkz.WerkzProject;
import com.werken.werkz.Session;
+import com.werken.werkz.WerkzProject;
import com.werken.werkz.jelly.GoalTag;
+
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.XMLOutput;
import org.apache.maven.MavenConstants;
import org.apache.maven.jelly.MavenJellyContext;
-import org.apache.maven.plugin.GoalToJellyScriptHousingMapper;
import org.apache.maven.plugin.JellyScriptHousing;
import org.apache.maven.plugin.PluginManager;
No revision
No revision
1.35.4.8 +2 -1 maven/src/java/org/apache/maven/jelly/MavenJellyContext.java
Index: MavenJellyContext.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/jelly/MavenJellyContext.java,v
retrieving revision 1.35.4.7
retrieving revision 1.35.4.8
diff -u -r1.35.4.7 -r1.35.4.8
--- MavenJellyContext.java 23 Apr 2004 03:19:28 -0000 1.35.4.7
+++ MavenJellyContext.java 26 Jun 2004 14:52:05 -0000 1.35.4.8
@@ -18,6 +18,7 @@
*/
import com.werken.werkz.WerkzProject;
+
import org.apache.commons.grant.GrantProject;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.TagLibrary;
1.16.4.12 +3 -3 maven/src/java/org/apache/maven/jelly/JellyUtils.java
Index: JellyUtils.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/jelly/JellyUtils.java,v
retrieving revision 1.16.4.11
retrieving revision 1.16.4.12
diff -u -r1.16.4.11 -r1.16.4.12
--- JellyUtils.java 13 May 2004 10:15:54 -0000 1.16.4.11
+++ JellyUtils.java 26 Jun 2004 14:52:05 -0000 1.16.4.12
@@ -22,12 +22,12 @@
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.expression.CompositeExpression;
import org.apache.commons.jelly.expression.Expression;
-import org.apache.commons.jelly.expression.ExpressionFactory;
import org.apache.commons.jelly.parser.XMLParser;
-import org.xml.sax.XMLReader;
import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
import javax.xml.parsers.SAXParserFactory;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
No revision
No revision
1.107.4.21 +2 -1 maven/src/java/org/apache/maven/MavenUtils.java
Index: MavenUtils.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/MavenUtils.java,v
retrieving revision 1.107.4.20
retrieving revision 1.107.4.21
diff -u -r1.107.4.20 -r1.107.4.21
--- MavenUtils.java 24 Apr 2004 23:11:23 -0000 1.107.4.20
+++ MavenUtils.java 26 Jun 2004 14:52:05 -0000 1.107.4.21
@@ -18,6 +18,7 @@
*/
import com.werken.forehead.ForeheadClassLoader;
+
import org.apache.commons.betwixt.XMLIntrospector;
import org.apache.commons.betwixt.io.BeanReader;
import org.apache.commons.betwixt.io.BeanWriter;
No revision
No revision
1.1.2.2 +1 -2 maven/src/java/org/apache/maven/repository/Attic/DefaultArtifactTypeHandler.java
Index: DefaultArtifactTypeHandler.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/repository/Attic/DefaultArtifactTypeHandler.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- DefaultArtifactTypeHandler.java 23 Jun 2004 13:00:37 -0000 1.1.2.1
+++ DefaultArtifactTypeHandler.java 26 Jun 2004 14:52:05 -0000 1.1.2.2
@@ -17,7 +17,6 @@
* ====================================================================
*/
-import org.apache.maven.MavenException;
import org.apache.maven.project.Project;
/**
No revision
No revision
1.91.4.20 +2 -1 maven/src/java/org/apache/maven/project/Project.java
Index: Project.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/project/Project.java,v
retrieving revision 1.91.4.19
retrieving revision 1.91.4.20
diff -u -r1.91.4.19 -r1.91.4.20
--- Project.java 9 Jun 2004 13:51:16 -0000 1.91.4.19
+++ Project.java 26 Jun 2004 14:52:05 -0000 1.91.4.20
@@ -25,6 +25,7 @@
import org.apache.maven.MavenUtils;
import org.apache.maven.jelly.MavenJellyContext;
import org.apache.maven.plugin.PluginManager;
+import org.apache.maven.plugin.UnknownPluginException;
import org.apache.maven.util.StringTool;
import org.apache.maven.verifier.ChecksumVerificationException;
import org.apache.maven.verifier.DependencyVerifier;
No revision
No revision
1.37.4.25 +2 -1 maven/src/java/org/apache/maven/cli/App.java
Index: App.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/cli/App.java,v
retrieving revision 1.37.4.24
retrieving revision 1.37.4.25
diff -u -r1.37.4.24 -r1.37.4.25
--- App.java 3 May 2004 23:59:02 -0000 1.37.4.24
+++ App.java 26 Jun 2004 14:52:06 -0000 1.37.4.25
@@ -19,6 +19,7 @@
import com.werken.werkz.NoActionDefinitionException;
import com.werken.werkz.UnattainableGoalException;
+
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.ParseException;
import org.apache.commons.jelly.JellyException;
No revision
No revision
1.5.4.6 +2 -1 maven/src/java/org/apache/maven/jelly/tags/jeez/JeezTagLibrary.java
Index: JeezTagLibrary.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/jelly/tags/jeez/JeezTagLibrary.java,v
retrieving revision 1.5.4.5
retrieving revision 1.5.4.6
diff -u -r1.5.4.5 -r1.5.4.6
--- JeezTagLibrary.java 1 Mar 2004 22:36:37 -0000 1.5.4.5
+++ JeezTagLibrary.java 26 Jun 2004 14:52:06 -0000 1.5.4.6
@@ -18,6 +18,7 @@
*/
import com.werken.werkz.jelly.WerkzTagLibrary;
+
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Tag;
import org.apache.commons.jelly.TagLibrary;
No revision
No revision
1.13.10.2 +1 -0 maven/src/java/org/apache/maven/ant/MavenTask.java
Index: MavenTask.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/ant/MavenTask.java,v
retrieving revision 1.13.10.1
retrieving revision 1.13.10.2
diff -u -r1.13.10.1 -r1.13.10.2
--- MavenTask.java 1 Mar 2004 22:36:36 -0000 1.13.10.1
+++ MavenTask.java 26 Jun 2004 14:52:06 -0000 1.13.10.2
@@ -18,6 +18,7 @@
*/
import com.werken.forehead.Forehead;
+
import org.apache.maven.MavenConstants;
import org.apache.maven.cli.App;
import org.apache.tools.ant.BuildException;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org