brett 2004/01/26 15:36:10
Modified: src/java/org/apache/maven Tag: MAVEN-1_0-BRANCH
MavenUtils.java
src/java/org/apache/maven/cli Tag: MAVEN-1_0-BRANCH App.java
CLIManager.java
src/java/org/apache/maven/jelly Tag: MAVEN-1_0-BRANCH
JellyBuildListener.java JellyUtils.java
src/java/org/apache/maven/jelly/tags/jeez Tag:
MAVEN-1_0-BRANCH JeezTagLibrary.java
src/java/org/apache/maven/jelly/tags/maven Tag:
MAVEN-1_0-BRANCH CopyResources.java
DependencyResolver.java
DependencyResolverInterface.java InputTag.java
MakeAbsolutePathTag.java MakeRelativePathTag.java
PluginVarTag.java PomTag.java ReactorTag.java
RootRelativePathTag.java
WerkzDependencyResolver.java
src/java/org/apache/maven/plugin Tag: MAVEN-1_0-BRANCH
PluginCacheManager.java PluginScriptParser.java
src/java/org/apache/maven/project Tag: MAVEN-1_0-BRANCH
BaseObject.java Build.java Repository.java
Resource.java UnitTest.java
src/java/org/apache/maven/repository Tag: MAVEN-1_0-BRANCH
AbstractArtifact.java
src/java/org/apache/maven/util Tag: MAVEN-1_0-BRANCH
DVSLFormatter.java Expand.java StringTool.java
src/java/org/apache/maven/verifier Tag: MAVEN-1_0-BRANCH
DependencyVerifier.java
src/test/java/org/apache/maven Tag: MAVEN-1_0-BRANCH
JAXPTest.java MavenUtilsTest.java
src/test/java/org/apache/maven/jelly/tags/maven Tag:
MAVEN-1_0-BRANCH DependencyResolverTest.java
DependencyResolverTestData.java
RootRelativePathTagTest.java
src/test/java/org/apache/maven/plugin Tag: MAVEN-1_0-BRANCH
PluginManagerTest.java
src/test/java/org/apache/maven/project Tag: MAVEN-1_0-BRANCH
BasedirTest.java ProjectInheritanceTest.java
src/test/java/org/apache/maven/util Tag: MAVEN-1_0-BRANCH
StringToolTest.java
Added: src/java/org/apache/maven/jelly/tags/werkz Tag:
MAVEN-1_0-BRANCH MavenAttainGoalTag.java
Log:
Optimize imports, reformatting by IDEA.
Revision Changes Path
No revision
No revision
1.107.4.7 +21 -22 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.6
retrieving revision 1.107.4.7
diff -u -r1.107.4.6 -r1.107.4.7
--- MavenUtils.java 7 Jan 2004 16:28:03 -0000 1.107.4.6
+++ MavenUtils.java 26 Jan 2004 23:36:08 -0000 1.107.4.7
@@ -56,27 +56,6 @@
* ====================================================================
*/
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.Properties;
-import java.util.ResourceBundle;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import javax.xml.parsers.SAXParserFactory;
-
import org.apache.commons.betwixt.XMLIntrospector;
import org.apache.commons.betwixt.io.BeanReader;
import org.apache.commons.betwixt.io.BeanWriter;
@@ -100,6 +79,26 @@
import org.apache.tools.ant.DirectoryScanner;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
+
+import javax.xml.parsers.SAXParserFactory;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.Properties;
+import java.util.ResourceBundle;
+import java.util.Set;
+import java.util.StringTokenizer;
/**
* Utilities for reading maven project descriptors, profile descriptors and
No revision
No revision
1.37.4.8 +5 -5 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.7
retrieving revision 1.37.4.8
diff -u -r1.37.4.7 -r1.37.4.8
--- App.java 8 Jan 2004 06:45:22 -0000 1.37.4.7
+++ App.java 26 Jan 2004 23:36:08 -0000 1.37.4.8
@@ -64,14 +64,14 @@
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.MavenSession;
+import org.apache.maven.MavenUtils;
import org.apache.maven.NoGoalException;
-import org.apache.maven.verifier.RepoConfigException;
-import org.apache.maven.verifier.UnsatisfiedDependencyException;
-import org.apache.maven.verifier.ChecksumVerificationException;
import org.apache.maven.UnknownGoalException;
import org.apache.maven.jelly.MavenJellyContext;
+import org.apache.maven.verifier.ChecksumVerificationException;
+import org.apache.maven.verifier.RepoConfigException;
+import org.apache.maven.verifier.UnsatisfiedDependencyException;
import java.io.File;
import java.io.IOException;
1.12.4.2 +1 -1 maven/src/java/org/apache/maven/cli/CLIManager.java
Index: CLIManager.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/cli/CLIManager.java,v
retrieving revision 1.12.4.1
retrieving revision 1.12.4.2
diff -u -r1.12.4.1 -r1.12.4.2
--- CLIManager.java 7 Jan 2004 16:44:52 -0000 1.12.4.1
+++ CLIManager.java 26 Jan 2004 23:36:08 -0000 1.12.4.2
@@ -58,11 +58,11 @@
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.PosixParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.PosixParser;
import org.apache.env.Which;
/** Utility for managing and parsing MavenSession's command-line.
No revision
No revision
1.4.4.2 +4 -4 maven/src/java/org/apache/maven/jelly/JellyBuildListener.java
Index: JellyBuildListener.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/jelly/JellyBuildListener.java,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -u -r1.4.4.1 -r1.4.4.2
--- JellyBuildListener.java 12 Jan 2004 11:50:49 -0000 1.4.4.1
+++ JellyBuildListener.java 26 Jan 2004 23:36:08 -0000 1.4.4.2
@@ -46,14 +46,14 @@
*/
-import java.io.IOException;
-import java.util.Stack;
-
import org.apache.commons.jelly.XMLOutput;
import org.apache.tools.ant.BuildEvent;
import org.apache.tools.ant.BuildListener;
import org.apache.tools.ant.Project;
import org.xml.sax.SAXException;
+
+import java.io.IOException;
+import java.util.Stack;
public class JellyBuildListener implements BuildListener
{
1.16.4.3 +8 -9 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.2
retrieving revision 1.16.4.3
diff -u -r1.16.4.2 -r1.16.4.3
--- JellyUtils.java 12 Jan 2004 11:50:49 -0000 1.16.4.2
+++ JellyUtils.java 26 Jan 2004 23:36:08 -0000 1.16.4.3
@@ -56,14 +56,6 @@
* ====================================================================
*/
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-
-import javax.xml.parsers.SAXParserFactory;
-
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
@@ -72,6 +64,13 @@
import org.apache.commons.jelly.expression.ExpressionFactory;
import org.apache.commons.jelly.parser.XMLParser;
import org.xml.sax.XMLReader;
+
+import javax.xml.parsers.SAXParserFactory;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
/**
* Utilities for Jelly.
No revision
No revision
1.5.4.4 +2 -3
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.3
retrieving revision 1.5.4.4
diff -u -r1.5.4.3 -r1.5.4.4
--- JeezTagLibrary.java 12 Jan 2004 11:50:49 -0000 1.5.4.3
+++ JeezTagLibrary.java 26 Jan 2004 23:36:09 -0000 1.5.4.4
@@ -56,6 +56,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;
@@ -64,8 +65,6 @@
import org.apache.commons.jelly.impl.TagScript;
import org.apache.commons.jelly.tags.ant.AntTagLibrary;
import org.xml.sax.Attributes;
-
-import com.werken.werkz.jelly.WerkzTagLibrary;
/** Convenience taglib that puts jelly:core, jelly:werkz and jelly:ant
* into a single namespace.
No revision
No revision
1.2.4.3 +5 -5
maven/src/java/org/apache/maven/jelly/tags/maven/CopyResources.java
Index: CopyResources.java
===================================================================
RCS file:
/home/cvs/maven/src/java/org/apache/maven/jelly/tags/maven/CopyResources.java,v
retrieving revision 1.2.4.2
retrieving revision 1.2.4.3
diff -u -r1.2.4.2 -r1.2.4.3
--- CopyResources.java 7 Jan 2004 23:14:09 -0000 1.2.4.2
+++ CopyResources.java 26 Jan 2004 23:36:09 -0000 1.2.4.3
@@ -56,10 +56,6 @@
* ====================================================================
*/
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.XMLOutput;
@@ -69,6 +65,10 @@
import org.apache.maven.project.Resource;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.PatternSet;
+
+import java.io.File;
+import java.util.Iterator;
+import java.util.List;
/**
* A tag to copy resources to a given directory
1.5.10.1 +3 -3
maven/src/java/org/apache/maven/jelly/tags/maven/DependencyResolver.java
Index: DependencyResolver.java
===================================================================
RCS file:
/home/cvs/maven/src/java/org/apache/maven/jelly/tags/maven/DependencyResolver.java,v
retrieving revision 1.5
retrieving revision 1.5.10.1
diff -u -r1.5 -r1.5.10.1
--- DependencyResolver.java 23 Feb 2003 20:59:07 -0000 1.5
+++ DependencyResolver.java 26 Jan 2004 23:36:09 -0000 1.5.10.1
@@ -56,10 +56,10 @@
* ====================================================================
*/
+import org.apache.maven.project.Project;
+
import java.util.Iterator;
import java.util.List;
-
-import org.apache.maven.project.Project;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Ben Walding</a>
1.3.10.2 +2 -1
maven/src/java/org/apache/maven/jelly/tags/maven/DependencyResolverInterface.java
Index: DependencyResolverInterface.java
===================================================================
RCS file:
/home/cvs/maven/src/java/org/apache/maven/jelly/tags/maven/DependencyResolverInterface.java,v
retrieving revision 1.3.10.1
retrieving revision 1.3.10.2
diff -u -r1.3.10.1 -r1.3.10.2
--- DependencyResolverInterface.java 2 Jan 2004 23:30:24 -0000 1.3.10.1
+++ DependencyResolverInterface.java 26 Jan 2004 23:36:09 -0000 1.3.10.2
@@ -57,6 +57,7 @@
*/
import org.apache.maven.project.Project;
+
import java.util.List;
/**
1.4.10.2 +3 -3 maven/src/java/org/apache/maven/jelly/tags/maven/InputTag.java
Index: InputTag.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/jelly/tags/maven/InputTag.java,v
retrieving revision 1.4.10.1
retrieving revision 1.4.10.2
diff -u -r1.4.10.1 -r1.4.10.2
--- InputTag.java 7 Jan 2004 23:14:09 -0000 1.4.10.1
+++ InputTag.java 26 Jan 2004 23:36:09 -0000 1.4.10.2
@@ -56,10 +56,10 @@
* ====================================================================
*/
-import java.io.File;
-
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.XMLOutput;
+
+import java.io.File;
/**
* Concat a set of files together into a single file.
1.2.4.1 +1 -1
maven/src/java/org/apache/maven/jelly/tags/maven/MakeAbsolutePathTag.java
Index: MakeAbsolutePathTag.java
===================================================================
RCS file:
/home/cvs/maven/src/java/org/apache/maven/jelly/tags/maven/MakeAbsolutePathTag.java,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- MakeAbsolutePathTag.java 19 Aug 2003 04:25:39 -0000 1.2
+++ MakeAbsolutePathTag.java 26 Jan 2004 23:36:09 -0000 1.2.4.1
@@ -59,8 +59,8 @@
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.maven.jelly.tags.BaseTagSupport;
import org.apache.maven.MavenUtils;
+import org.apache.maven.jelly.tags.BaseTagSupport;
import java.io.File;
import java.io.IOException;
1.4.4.2 +1 -1
maven/src/java/org/apache/maven/jelly/tags/maven/MakeRelativePathTag.java
Index: MakeRelativePathTag.java
===================================================================
RCS file:
/home/cvs/maven/src/java/org/apache/maven/jelly/tags/maven/MakeRelativePathTag.java,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -u -r1.4.4.1 -r1.4.4.2
--- MakeRelativePathTag.java 7 Jan 2004 23:14:09 -0000 1.4.4.1
+++ MakeRelativePathTag.java 26 Jan 2004 23:36:09 -0000 1.4.4.2
@@ -59,8 +59,8 @@
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.maven.jelly.tags.BaseTagSupport;
import org.apache.maven.MavenUtils;
+import org.apache.maven.jelly.tags.BaseTagSupport;
import java.io.File;
import java.io.IOException;
1.1.4.4 +1 -3
maven/src/java/org/apache/maven/jelly/tags/maven/PluginVarTag.java
Index: PluginVarTag.java
===================================================================
RCS file:
/home/cvs/maven/src/java/org/apache/maven/jelly/tags/maven/PluginVarTag.java,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -r1.1.4.3 -r1.1.4.4
--- PluginVarTag.java 7 Jan 2004 23:14:09 -0000 1.1.4.3
+++ PluginVarTag.java 26 Jan 2004 23:36:09 -0000 1.1.4.4
@@ -107,9 +107,7 @@
}
catch ( UnknownPluginException e )
{
-// TODO [RC2] - restore
- // throw new JellyTagException( "Couldn't find the given plugin", e );
-log.error("error", e );
+ throw new JellyTagException( "Couldn't find the given plugin", e );
}
}
1.14.4.1 +3 -3 maven/src/java/org/apache/maven/jelly/tags/maven/PomTag.java
Index: PomTag.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/jelly/tags/maven/PomTag.java,v
retrieving revision 1.14
retrieving revision 1.14.4.1
diff -u -r1.14 -r1.14.4.1
--- PomTag.java 19 Aug 2003 04:25:39 -0000 1.14
+++ PomTag.java 26 Jan 2004 23:36:09 -0000 1.14.4.1
@@ -56,13 +56,13 @@
* ====================================================================
*/
-import java.io.File;
-
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.XMLOutput;
import org.apache.maven.MavenUtils;
import org.apache.maven.jelly.tags.BaseTagSupport;
+
+import java.io.File;
/**
* MavenSession Jelly tag that creates a POM instance.
1.36.4.5 +7 -7 maven/src/java/org/apache/maven/jelly/tags/maven/ReactorTag.java
Index: ReactorTag.java
===================================================================
RCS file:
/home/cvs/maven/src/java/org/apache/maven/jelly/tags/maven/ReactorTag.java,v
retrieving revision 1.36.4.4
retrieving revision 1.36.4.5
diff -u -r1.36.4.4 -r1.36.4.5
--- ReactorTag.java 7 Jan 2004 23:14:09 -0000 1.36.4.4
+++ ReactorTag.java 26 Jan 2004 23:36:09 -0000 1.36.4.5
@@ -56,18 +56,18 @@
* ====================================================================
*/
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.XMLOutput;
import org.apache.maven.MavenConstants;
import org.apache.maven.MavenUtils;
import org.apache.maven.project.Project;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
/**
* Reactor tag that processes a set of project descriptors taking into
1.1.4.2 +5 -5
maven/src/java/org/apache/maven/jelly/tags/maven/RootRelativePathTag.java
Index: RootRelativePathTag.java
===================================================================
RCS file:
/home/cvs/maven/src/java/org/apache/maven/jelly/tags/maven/RootRelativePathTag.java,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- RootRelativePathTag.java 7 Jan 2004 23:14:09 -0000 1.1.4.1
+++ RootRelativePathTag.java 26 Jan 2004 23:36:09 -0000 1.1.4.2
@@ -56,14 +56,14 @@
* ====================================================================
*/
-import java.io.File;
-import java.io.IOException;
-import java.util.StringTokenizer;
-
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.XMLOutput;
import org.apache.maven.jelly.tags.BaseTagSupport;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.StringTokenizer;
/**
* Converts an absolute path into a path relative to a root dir. For
1.7.4.3 +7 -8
maven/src/java/org/apache/maven/jelly/tags/maven/WerkzDependencyResolver.java
Index: WerkzDependencyResolver.java
===================================================================
RCS file:
/home/cvs/maven/src/java/org/apache/maven/jelly/tags/maven/WerkzDependencyResolver.java,v
retrieving revision 1.7.4.2
retrieving revision 1.7.4.3
diff -u -r1.7.4.2 -r1.7.4.3
--- WerkzDependencyResolver.java 7 Jan 2004 23:14:09 -0000 1.7.4.2
+++ WerkzDependencyResolver.java 26 Jan 2004 23:36:09 -0000 1.7.4.3
@@ -56,17 +56,16 @@
* ====================================================================
*/
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.maven.project.Dependency;
-import org.apache.maven.project.Project;
-
import com.werken.werkz.Action;
import com.werken.werkz.Goal;
import com.werken.werkz.Session;
import com.werken.werkz.WerkzProject;
+import org.apache.maven.project.Dependency;
+import org.apache.maven.project.Project;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
/**
* THIS CLASS IS NOT THREADSAFE.
No revision
No revision
1.2.2.1 +174 -61
maven/src/java/org/apache/maven/jelly/tags/werkz/Attic/MavenAttainGoalTag.java
No revision
No revision
1.16.4.2 +1 -1 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.1
retrieving revision 1.16.4.2
diff -u -r1.16.4.1 -r1.16.4.2
--- PluginCacheManager.java 26 Nov 2003 11:45:17 -0000 1.16.4.1
+++ PluginCacheManager.java 26 Jan 2004 23:36:09 -0000 1.16.4.2
@@ -71,11 +71,11 @@
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.util.Collections;
import java.util.Iterator;
import java.util.Properties;
import java.util.Set;
import java.util.StringTokenizer;
-import java.util.Collections;
/**
* Plugin cache management.
1.1.4.2 +4 -4
maven/src/java/org/apache/maven/plugin/Attic/PluginScriptParser.java
Index: PluginScriptParser.java
===================================================================
RCS file:
/home/cvs/maven/src/java/org/apache/maven/plugin/Attic/PluginScriptParser.java,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- PluginScriptParser.java 26 Nov 2003 11:45:17 -0000 1.1.4.1
+++ PluginScriptParser.java 26 Jan 2004 23:36:09 -0000 1.1.4.2
@@ -56,15 +56,15 @@
* ====================================================================
*/
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.helpers.DefaultHandler;
-import java.util.Set;
import java.util.HashSet;
+import java.util.Set;
/**
* Class to parse plugin XML scripts to find goals and tag libraries.
No revision
No revision
1.28.4.2 +1 -2 maven/src/java/org/apache/maven/project/BaseObject.java
Index: BaseObject.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/project/BaseObject.java,v
retrieving revision 1.28.4.1
retrieving revision 1.28.4.2
diff -u -r1.28.4.1 -r1.28.4.2
--- BaseObject.java 8 Jan 2004 00:26:10 -0000 1.28.4.1
+++ BaseObject.java 26 Jan 2004 23:36:09 -0000 1.28.4.2
@@ -57,7 +57,6 @@
*/
import org.apache.commons.lang.StringUtils;
-
import org.apache.maven.util.StringTool;
import java.util.ArrayList;
1.24.4.4 +4 -4 maven/src/java/org/apache/maven/project/Build.java
Index: Build.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/project/Build.java,v
retrieving revision 1.24.4.3
retrieving revision 1.24.4.4
diff -u -r1.24.4.3 -r1.24.4.4
--- Build.java 8 Jan 2004 00:26:10 -0000 1.24.4.3
+++ Build.java 26 Jan 2004 23:36:09 -0000 1.24.4.4
@@ -59,11 +59,11 @@
import org.apache.maven.MavenUtils;
import org.apache.maven.util.StringTool;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Iterator;
import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
1.18.4.1 +4 -4 maven/src/java/org/apache/maven/project/Repository.java
Index: Repository.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/project/Repository.java,v
retrieving revision 1.18
retrieving revision 1.18.4.1
diff -u -r1.18 -r1.18.4.1
--- Repository.java 12 Sep 2003 04:41:21 -0000 1.18
+++ Repository.java 26 Jan 2004 23:36:09 -0000 1.18.4.1
@@ -56,11 +56,11 @@
* ====================================================================
*/
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.maven.util.EnhancedStringTokenizer;
import org.apache.maven.util.StringTool;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* NOTE: This is very CVS specific, but I would like to try additional SCM
1.13.4.2 +2 -2 maven/src/java/org/apache/maven/project/Resource.java
Index: Resource.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/project/Resource.java,v
retrieving revision 1.13.4.1
retrieving revision 1.13.4.2
diff -u -r1.13.4.1 -r1.13.4.2
--- Resource.java 26 Nov 2003 11:45:17 -0000 1.13.4.1
+++ Resource.java 26 Jan 2004 23:36:09 -0000 1.13.4.2
@@ -59,10 +59,10 @@
import org.apache.maven.MavenUtils;
import org.apache.maven.util.StringTool;
-import java.util.ArrayList;
-import java.util.List;
import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
/**
* Represents a set of files in a single directory.
1.11.10.3 +2 -2 maven/src/java/org/apache/maven/project/UnitTest.java
Index: UnitTest.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/project/UnitTest.java,v
retrieving revision 1.11.10.2
retrieving revision 1.11.10.3
diff -u -r1.11.10.2 -r1.11.10.3
--- UnitTest.java 11 Jan 2004 12:43:16 -0000 1.11.10.2
+++ UnitTest.java 26 Jan 2004 23:36:09 -0000 1.11.10.3
@@ -56,10 +56,10 @@
* ====================================================================
*/
+import org.apache.maven.util.StringTool;
+
import java.util.ArrayList;
import java.util.List;
-
-import org.apache.maven.util.StringTool;
/**
* Collects unit-test include and exclude patterns and resources.
No revision
No revision
1.22.4.3 +3 -3 maven/src/java/org/apache/maven/repository/AbstractArtifact.java
Index: AbstractArtifact.java
===================================================================
RCS file:
/home/cvs/maven/src/java/org/apache/maven/repository/AbstractArtifact.java,v
retrieving revision 1.22.4.2
retrieving revision 1.22.4.3
diff -u -r1.22.4.2 -r1.22.4.3
--- AbstractArtifact.java 8 Jan 2004 07:03:49 -0000 1.22.4.2
+++ AbstractArtifact.java 26 Jan 2004 23:36:09 -0000 1.22.4.3
@@ -56,8 +56,6 @@
* ====================================================================
*/
-import java.io.File;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.maven.MavenConstants;
@@ -66,6 +64,8 @@
import org.apache.maven.util.MD5Sum;
import org.apache.maven.verifier.ChecksumVerificationException;
import org.apache.plexus.util.FileUtils;
+
+import java.io.File;
/**
* Base class from which all artifact subclasses are derived.
No revision
No revision
1.2.4.2 +3 -3 maven/src/java/org/apache/maven/util/DVSLFormatter.java
Index: DVSLFormatter.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/util/DVSLFormatter.java,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -u -r1.2.4.1 -r1.2.4.2
--- DVSLFormatter.java 3 Jan 2004 06:45:39 -0000 1.2.4.1
+++ DVSLFormatter.java 26 Jan 2004 23:36:09 -0000 1.2.4.2
@@ -56,10 +56,10 @@
* ====================================================================
*/
-import java.text.DecimalFormat;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
+import java.text.DecimalFormat;
/**
* Formatting tool for use with the DVSL toolbox. This class contains
1.13.4.1 +4 -4 maven/src/java/org/apache/maven/util/Expand.java
Index: Expand.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/util/Expand.java,v
retrieving revision 1.13
retrieving revision 1.13.4.1
diff -u -r1.13 -r1.13.4.1
--- Expand.java 19 Aug 2003 04:31:38 -0000 1.13
+++ Expand.java 26 Jan 2004 23:36:09 -0000 1.13.4.1
@@ -56,6 +56,10 @@
* ====================================================================
*/
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.tools.ant.util.FileUtils;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -64,10 +68,6 @@
import java.util.Date;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.tools.ant.util.FileUtils;
/**
* Unzip a file.
1.3.4.1 +3 -3 maven/src/java/org/apache/maven/util/StringTool.java
Index: StringTool.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/util/StringTool.java,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- StringTool.java 5 Sep 2003 15:28:42 -0000 1.3
+++ StringTool.java 26 Jan 2004 23:36:09 -0000 1.3.4.1
@@ -56,10 +56,10 @@
* ====================================================================
*/
+import org.apache.commons.lang.StringUtils;
+
import java.util.Arrays;
import java.util.List;
-
-import org.apache.commons.lang.StringUtils;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Ben Walding</a>
No revision
No revision
1.34.4.2 +2 -2 maven/src/java/org/apache/maven/verifier/DependencyVerifier.java
Index: DependencyVerifier.java
===================================================================
RCS file:
/home/cvs/maven/src/java/org/apache/maven/verifier/DependencyVerifier.java,v
retrieving revision 1.34.4.1
retrieving revision 1.34.4.2
diff -u -r1.34.4.1 -r1.34.4.2
--- DependencyVerifier.java 3 Jan 2004 06:11:07 -0000 1.34.4.1
+++ DependencyVerifier.java 26 Jan 2004 23:36:10 -0000 1.34.4.2
@@ -56,9 +56,9 @@
* ====================================================================
*/
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.lang.StringUtils;
import org.apache.maven.AbstractMavenComponent;
import org.apache.maven.project.Project;
import org.apache.maven.repository.Artifact;
No revision
No revision
1.4.10.2 +4 -4 maven/src/test/java/org/apache/maven/JAXPTest.java
Index: JAXPTest.java
===================================================================
RCS file: /home/cvs/maven/src/test/java/org/apache/maven/JAXPTest.java,v
retrieving revision 1.4.10.1
retrieving revision 1.4.10.2
diff -u -r1.4.10.1 -r1.4.10.2
--- JAXPTest.java 3 Jan 2004 06:45:39 -0000 1.4.10.1
+++ JAXPTest.java 26 Jan 2004 23:36:10 -0000 1.4.10.2
@@ -54,14 +54,14 @@
* <http://www.apache.org/>.
*/
+import junit.framework.TestCase;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import junit.framework.TestCase;
-
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
/**
* Tests to check JAXP is correctly configured and classes are being loaded
1.14.4.2 +6 -7 maven/src/test/java/org/apache/maven/MavenUtilsTest.java
Index: MavenUtilsTest.java
===================================================================
RCS file: /home/cvs/maven/src/test/java/org/apache/maven/MavenUtilsTest.java,v
retrieving revision 1.14.4.1
retrieving revision 1.14.4.2
diff -u -r1.14.4.1 -r1.14.4.2
--- MavenUtilsTest.java 26 Nov 2003 11:45:17 -0000 1.14.4.1
+++ MavenUtilsTest.java 26 Jan 2004 23:36:10 -0000 1.14.4.2
@@ -54,16 +54,15 @@
* <http://www.apache.org/>.
*/
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
import org.apache.maven.jelly.MavenJellyContext;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
/**
* Test cases for various MavenUtils methods.
No revision
No revision
1.7.4.1 +4 -5
maven/src/test/java/org/apache/maven/jelly/tags/maven/DependencyResolverTest.java
Index: DependencyResolverTest.java
===================================================================
RCS file:
/home/cvs/maven/src/test/java/org/apache/maven/jelly/tags/maven/DependencyResolverTest.java,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -u -r1.7 -r1.7.4.1
--- DependencyResolverTest.java 19 Aug 2003 04:45:37 -0000 1.7
+++ DependencyResolverTest.java 26 Jan 2004 23:36:10 -0000 1.7.4.1
@@ -56,12 +56,11 @@
* ====================================================================
*/
-import java.util.Iterator;
-import java.util.List;
-
import junit.framework.TestCase;
-
import org.apache.maven.project.Project;
+
+import java.util.Iterator;
+import java.util.List;
/**
* @author <a href="[EMAIL PROTECTED]">Ben Walding</a>
1.1.10.1 +4 -4
maven/src/test/java/org/apache/maven/jelly/tags/maven/DependencyResolverTestData.java
Index: DependencyResolverTestData.java
===================================================================
RCS file:
/home/cvs/maven/src/test/java/org/apache/maven/jelly/tags/maven/DependencyResolverTestData.java,v
retrieving revision 1.1
retrieving revision 1.1.10.1
diff -u -r1.1 -r1.1.10.1
--- DependencyResolverTestData.java 18 Jun 2003 00:01:11 -0000 1.1
+++ DependencyResolverTestData.java 26 Jan 2004 23:36:10 -0000 1.1.10.1
@@ -1,11 +1,11 @@
package org.apache.maven.jelly.tags.maven;
+import org.apache.maven.project.Dependency;
+import org.apache.maven.project.Project;
+
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
-
-import org.apache.maven.project.Dependency;
-import org.apache.maven.project.Project;
/**
* @author Ben Walding
1.1.4.1 +3 -3
maven/src/test/java/org/apache/maven/jelly/tags/maven/RootRelativePathTagTest.java
Index: RootRelativePathTagTest.java
===================================================================
RCS file:
/home/cvs/maven/src/test/java/org/apache/maven/jelly/tags/maven/RootRelativePathTagTest.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- RootRelativePathTagTest.java 8 Oct 2003 23:44:04 -0000 1.1
+++ RootRelativePathTagTest.java 26 Jan 2004 23:36:10 -0000 1.1.4.1
@@ -56,10 +56,10 @@
* ====================================================================
*/
+import junit.framework.TestCase;
+
import java.io.File;
import java.io.IOException;
-
-import junit.framework.TestCase;
/**
* Tests for [EMAIL PROTECTED] RootRelativePathTag}.
No revision
No revision
1.11.4.4 +4 -5
maven/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
Index: PluginManagerTest.java
===================================================================
RCS file:
/home/cvs/maven/src/test/java/org/apache/maven/plugin/PluginManagerTest.java,v
retrieving revision 1.11.4.3
retrieving revision 1.11.4.4
diff -u -r1.11.4.3 -r1.11.4.4
--- PluginManagerTest.java 3 Jan 2004 06:45:39 -0000 1.11.4.3
+++ PluginManagerTest.java 26 Jan 2004 23:36:10 -0000 1.11.4.4
@@ -55,18 +55,16 @@
*
* ====================================================================
*/
-import java.io.File;
-import java.io.FileInputStream;
-
+import com.werken.forehead.Forehead;
import junit.framework.TestCase;
-
import org.apache.maven.MavenConstants;
import org.apache.maven.MavenSession;
import org.apache.maven.MavenUtils;
import org.apache.maven.jelly.MavenJellyContext;
import org.apache.maven.project.Project;
-import com.werken.forehead.Forehead;
+import java.io.File;
+import java.io.FileInputStream;
/**
* @author Brett Porter <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a>
@@ -281,3 +279,4 @@
pluginManager.getGoalNames().contains( "jar:jar" ) );
}
}
+
No revision
No revision
1.2.4.3 +3 -4 maven/src/test/java/org/apache/maven/project/BasedirTest.java
Index: BasedirTest.java
===================================================================
RCS file: /home/cvs/maven/src/test/java/org/apache/maven/project/BasedirTest.java,v
retrieving revision 1.2.4.2
retrieving revision 1.2.4.3
diff -u -r1.2.4.2 -r1.2.4.3
--- BasedirTest.java 2 Jan 2004 23:32:10 -0000 1.2.4.2
+++ BasedirTest.java 26 Jan 2004 23:36:10 -0000 1.2.4.3
@@ -1,12 +1,11 @@
package org.apache.maven.project;
-import java.io.File;
-
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
import org.apache.maven.MavenUtils;
+
+import java.io.File;
/* ====================================================================
* The Apache Software License, Version 1.1
1.40.4.4 +7 -8
maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java
Index: ProjectInheritanceTest.java
===================================================================
RCS file:
/home/cvs/maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java,v
retrieving revision 1.40.4.3
retrieving revision 1.40.4.4
diff -u -r1.40.4.3 -r1.40.4.4
--- ProjectInheritanceTest.java 31 Dec 2003 01:38:09 -0000 1.40.4.3
+++ ProjectInheritanceTest.java 26 Jan 2004 23:36:10 -0000 1.40.4.4
@@ -54,19 +54,18 @@
* <http://www.apache.org/>.
*/
-import java.io.File;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
import org.apache.commons.lang.StringUtils;
import org.apache.maven.MavenUtils;
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
public class ProjectInheritanceTest
extends TestCase
{
@@ -173,7 +172,7 @@
assertEquals( "Child Project", p.getName() );
assertEquals( "maven:child", p.getId() );
- // Test organization inheritance. These should pass, but don't
+ // Test organization inheritance.
assertNotNull( p.getOrganization() );
assertEquals( "Apache Software Foundation", p.getOrganization().getName() );
assertEquals( "http://www.apache.org/";, p.getOrganization().getUrl() );
No revision
No revision
1.1.10.1 +2 -2 maven/src/test/java/org/apache/maven/util/StringToolTest.java
Index: StringToolTest.java
===================================================================
RCS file: /home/cvs/maven/src/test/java/org/apache/maven/util/StringToolTest.java,v
retrieving revision 1.1
retrieving revision 1.1.10.1
diff -u -r1.1 -r1.1.10.1
--- StringToolTest.java 30 Jul 2003 00:50:37 -0000 1.1
+++ StringToolTest.java 26 Jan 2004 23:36:10 -0000 1.1.10.1
@@ -56,9 +56,9 @@
* ====================================================================
*/
-import java.util.List;
-
import junit.framework.TestCase;
+
+import java.util.List;
/**
* @author Ben Walding
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
