You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by bw...@apache.org on 2003/04/27 01:33:31 UTC
cvs commit: maven-new/core/src/java/org/apache/maven/util I18NUtils.java
bwalding 2003/04/26 16:33:31
Modified: core maven.xml project.xml
core/src/java/org/apache/maven/plugin
DefaultPluginManager.java
DefaultPluginCacheManager.java
PluginCacheManager.java
core/src/java/org/apache/maven/repository
AbstractArtifact.java Artifact.java
core/src/java/org/apache/maven DefaultMaven.java Maven.java
core/src/java/org/apache/maven/verifier
DefaultLocalSettingsVerifier.java
DefaultDependencyVerifier.java
core/src/java/org/apache/maven/project/builder
ArtifactListBuilder.java
DependencyClasspathBuilder.java ProjectBuilder.java
DefaultProjectUnmarshaller.java
DefaultProjectBuilder.java ProjectUnmarshaller.java
core/src/java/org/apache/maven/plugins/example
ExampleComponent.java
core/src/java/org/apache/maven/util I18NUtils.java
Added: core .cvsignore
Log:
Continue cleanup after reorg
Revision Changes Path
1.2 +2 -0 maven-new/core/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven-new/core/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 26 Apr 2003 16:52:47 -0000 1.1
+++ maven.xml 26 Apr 2003 23:33:30 -0000 1.2
@@ -375,5 +375,7 @@
<goal name="build-micro-ant-jar">
</goal>
+
+
</project>
1.2 +1 -58 maven-new/core/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-new/core/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 26 Apr 2003 16:52:47 -0000 1.1
+++ project.xml 26 Apr 2003 23:33:30 -0000 1.2
@@ -3,7 +3,7 @@
<project>
<pomVersion>3</pomVersion>
<name>Maven</name>
- <groupId>maven</groupId>
+ <groupId>maven-new</groupId>
<artifactId>maven</artifactId>
<currentVersion>1.0-beta-9</currentVersion>
@@ -405,63 +405,6 @@
<artifactId>junit</artifactId>
<version>3.8.1</version>
</dependency>
-
- <dependency>
- <id>commons-jelly</id>
- <version>20030310.073407</version>
- <url>http://jakarta.apache.org/commons/jelly/</url>
- </dependency>
-
- <!--dependency>
- <groupId>commons-jelly</groupId>
- <artifactId>commons-jelly-tags-ant</artifactId>
- <version>20030211.142045</version>
- <url>http://jakarta.apache.org/commons/jelly/tags/ant/</url>
- </dependency-->
-
- <dependency>
- <groupId>commons-jelly</groupId>
- <artifactId>commons-jelly-tags-define</artifactId>
- <version>20030211.142932</version>
- <url>http://jakarta.apache.org/commons/jelly/tags/define/</url>
- </dependency>
-
- <dependency>
- <groupId>commons-jelly</groupId>
- <artifactId>commons-jelly-tags-util</artifactId>
- <version>20030211.141939</version>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>2.1</version>
- </dependency>
-
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>2.1</version>
- </dependency>
-
- <dependency>
- <groupId>commons-grant</groupId>
- <artifactId>commons-grant</artifactId>
- <version>1.0-beta-4</version>
- </dependency>
-
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.4-dev-8</version>
- </dependency>
-
- <dependency>
- <groupId>jexl</groupId>
- <artifactId>jexl</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
-
</dependencies>
1.1 maven-new/core/.cvsignore
Index: .cvsignore
===================================================================
*.log
1.2 +2 -4 maven-new/core/src/java/org/apache/maven/plugin/DefaultPluginManager.java
Index: DefaultPluginManager.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/plugin/DefaultPluginManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultPluginManager.java 26 Apr 2003 16:52:16 -0000 1.1
+++ DefaultPluginManager.java 26 Apr 2003 23:33:30 -0000 1.2
@@ -1,6 +1,5 @@
package org.apache.maven.plugin;
-import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
@@ -9,9 +8,6 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.maven.Maven;
-import org.apache.maven.MavenConstants;
-import org.apache.maven.plugins.jelly.DefaultJellyPlugin;
-import org.apache.maven.plugins.jelly.JellyPlugin;
import org.apache.maven.plugins.suiterunner.DefaultSuiteRunnerPlugin;
import org.apache.maven.project.Project;
import org.apache.plexus.context.DefaultPlexusContext;
@@ -58,11 +54,13 @@
l.add(new DefaultSuiteRunnerPlugin());
//XXX plexusify
+ /*
JellyPlugin jp = new DefaultJellyPlugin();
File pluginPath = new File(System.getProperty(MavenConstants.MAVEN_HOME) + "/plugins/maven-eclipse-plugin-1.3");
System.out.println("Loading jelly plugin:" + pluginPath);
jp.load(pluginPath);
l.add(jp);
+ */
plugins = Collections.unmodifiableList(l);
}
1.2 +14 -12 maven-new/core/src/java/org/apache/maven/plugin/DefaultPluginCacheManager.java
Index: DefaultPluginCacheManager.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/plugin/DefaultPluginCacheManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultPluginCacheManager.java 26 Apr 2003 16:52:16 -0000 1.1
+++ DefaultPluginCacheManager.java 26 Apr 2003 23:33:30 -0000 1.2
@@ -54,18 +54,6 @@
* <http://www.apache.org/>.
*/
-import com.werken.werkz.CyclicGoalChainException;
-import com.werken.werkz.Goal;
-import com.werken.werkz.NoSuchGoalException;
-import com.werken.werkz.WerkzProject;
-import org.apache.commons.lang.StringUtils;
-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.HashMap;
@@ -73,6 +61,20 @@
import java.util.Iterator;
import java.util.LinkedList;
import java.util.Set;
+
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.apache.commons.lang.StringUtils;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.helpers.DefaultHandler;
+
+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.2 +2 -4 maven-new/core/src/java/org/apache/maven/plugin/PluginCacheManager.java
Index: PluginCacheManager.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/plugin/PluginCacheManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PluginCacheManager.java 26 Apr 2003 16:52:16 -0000 1.1
+++ PluginCacheManager.java 26 Apr 2003 23:33:30 -0000 1.2
@@ -56,18 +56,16 @@
import java.io.File;
import java.io.FileInputStream;
-import java.io.IOException;
import java.io.FileOutputStream;
-
-import java.util.Set;
+import java.io.IOException;
import java.util.HashSet;
import java.util.Properties;
+import java.util.Set;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import org.apache.commons.lang.StringUtils;
-
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXParseException;
1.2 +5 -5 maven-new/core/src/java/org/apache/maven/repository/AbstractArtifact.java
Index: AbstractArtifact.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/repository/AbstractArtifact.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractArtifact.java 26 Apr 2003 16:52:17 -0000 1.1
+++ AbstractArtifact.java 26 Apr 2003 23:33:30 -0000 1.2
@@ -56,15 +56,15 @@
* ====================================================================
*/
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+
import org.apache.maven.MavenConstants;
import org.apache.maven.project.Dependency;
import org.apache.maven.util.I18NUtils;
import org.apache.maven.util.MD5Sum;
import org.apache.maven.verifier.ChecksumVerificationException;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
/**
* Base class from which all artifact subclasses are derived.
1.2 +3 -3 maven-new/core/src/java/org/apache/maven/repository/Artifact.java
Index: Artifact.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/repository/Artifact.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Artifact.java 26 Apr 2003 16:52:17 -0000 1.1
+++ Artifact.java 26 Apr 2003 23:33:30 -0000 1.2
@@ -56,10 +56,10 @@
* ====================================================================
*/
+import java.io.File;
+
import org.apache.maven.project.Dependency;
import org.apache.maven.verifier.ChecksumVerificationException;
-
-import java.io.File;
/**
* The interface defining an artifact (which probably lives in the
1.2 +1 -2 maven-new/core/src/java/org/apache/maven/DefaultMaven.java
Index: DefaultMaven.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/DefaultMaven.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultMaven.java 26 Apr 2003 16:52:15 -0000 1.1
+++ DefaultMaven.java 26 Apr 2003 23:33:30 -0000 1.2
@@ -57,7 +57,6 @@
*/
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.FileReader;
import java.util.ArrayList;
import java.util.Date;
1.2 +2 -2 maven-new/core/src/java/org/apache/maven/Maven.java
Index: Maven.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/Maven.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Maven.java 26 Apr 2003 16:52:15 -0000 1.1
+++ Maven.java 26 Apr 2003 23:33:30 -0000 1.2
@@ -1,10 +1,10 @@
package org.apache.maven;
-import org.apache.maven.project.Project;
-
import java.io.File;
import java.util.List;
import java.util.Map;
+
+import org.apache.maven.project.Project;
/* ====================================================================
* The Apache Software License, Version 1.1
1.2 +3 -3 maven-new/core/src/java/org/apache/maven/verifier/DefaultLocalSettingsVerifier.java
Index: DefaultLocalSettingsVerifier.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/verifier/DefaultLocalSettingsVerifier.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultLocalSettingsVerifier.java 26 Apr 2003 16:52:16 -0000 1.1
+++ DefaultLocalSettingsVerifier.java 26 Apr 2003 23:33:30 -0000 1.2
@@ -56,14 +56,14 @@
* ====================================================================
*/
+import java.io.File;
+
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.maven.Maven;
import org.apache.maven.util.I18NUtils;
import org.apache.plexus.logging.AbstractLogEnabled;
-
-import java.io.File;
/**
* Verify the integrity of the local repository.
1.2 +7 -8 maven-new/core/src/java/org/apache/maven/verifier/DefaultDependencyVerifier.java
Index: DefaultDependencyVerifier.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/verifier/DefaultDependencyVerifier.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultDependencyVerifier.java 26 Apr 2003 16:52:15 -0000 1.1
+++ DefaultDependencyVerifier.java 26 Apr 2003 23:33:30 -0000 1.2
@@ -56,13 +56,6 @@
* ====================================================================
*/
-import org.apache.maven.project.Project;
-import org.apache.maven.repository.Artifact;
-import org.apache.maven.util.HttpUtils;
-import org.apache.maven.util.I18NUtils;
-import org.apache.plexus.logging.AbstractLogEnabled;
-import org.apache.plexus.util.StringUtils;
-
import java.io.File;
import java.io.FileNotFoundException;
import java.util.ArrayList;
@@ -72,6 +65,12 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.maven.project.Project;
+import org.apache.maven.repository.Artifact;
+import org.apache.maven.util.HttpUtils;
+import org.apache.maven.util.I18NUtils;
+import org.apache.plexus.logging.AbstractLogEnabled;
+import org.apache.plexus.util.StringUtils;
/**
* Make sure that everything that is required for the project to build
1.2 +6 -6 maven-new/core/src/java/org/apache/maven/project/builder/ArtifactListBuilder.java
Index: ArtifactListBuilder.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/project/builder/ArtifactListBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ArtifactListBuilder.java 26 Apr 2003 16:52:16 -0000 1.1
+++ ArtifactListBuilder.java 26 Apr 2003 23:33:31 -0000 1.2
@@ -56,15 +56,15 @@
* ====================================================================
*/
-import org.apache.maven.project.Dependency;
-import org.apache.maven.project.Project;
-import org.apache.maven.repository.Artifact;
-import org.apache.maven.repository.DefaultArtifactFactory;
-
import java.io.File;
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 org.apache.maven.repository.Artifact;
+import org.apache.maven.repository.DefaultArtifactFactory;
/**
*
1.2 +3 -3 maven-new/core/src/java/org/apache/maven/project/builder/DependencyClasspathBuilder.java
Index: DependencyClasspathBuilder.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/project/builder/DependencyClasspathBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DependencyClasspathBuilder.java 26 Apr 2003 16:52:16 -0000 1.1
+++ DependencyClasspathBuilder.java 26 Apr 2003 23:33:31 -0000 1.2
@@ -56,11 +56,11 @@
* ====================================================================
*/
+import java.util.Iterator;
+
import org.apache.maven.project.Dependency;
import org.apache.maven.project.Project;
import org.apache.maven.repository.Artifact;
-
-import java.util.Iterator;
/**
* Take a valid MavenJellyContext which contains references to the POM, ant
1.2 +2 -2 maven-new/core/src/java/org/apache/maven/project/builder/ProjectBuilder.java
Index: ProjectBuilder.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/project/builder/ProjectBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProjectBuilder.java 26 Apr 2003 16:52:16 -0000 1.1
+++ ProjectBuilder.java 26 Apr 2003 23:33:31 -0000 1.2
@@ -1,9 +1,9 @@
package org.apache.maven.project.builder;
-import org.apache.maven.project.Project;
-
import java.io.File;
import java.util.List;
+
+import org.apache.maven.project.Project;
public interface ProjectBuilder
{
1.2 +5 -15 maven-new/core/src/java/org/apache/maven/project/builder/DefaultProjectUnmarshaller.java
Index: DefaultProjectUnmarshaller.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/project/builder/DefaultProjectUnmarshaller.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultProjectUnmarshaller.java 26 Apr 2003 16:52:16 -0000 1.1
+++ DefaultProjectUnmarshaller.java 26 Apr 2003 23:33:31 -0000 1.2
@@ -1,23 +1,13 @@
package org.apache.maven.project.builder;
+import java.io.IOException;
+import java.io.Reader;
+
import org.apache.maven.DeprecationWarning;
-import org.apache.maven.project.Build;
-import org.apache.maven.project.Contributor;
-import org.apache.maven.project.Dependency;
-import org.apache.maven.project.Developer;
-import org.apache.maven.project.MailingList;
-import org.apache.maven.project.Organization;
-import org.apache.maven.project.Project;
-import org.apache.maven.project.Repository;
-import org.apache.maven.project.Resource;
-import org.apache.maven.project.UnitTest;
-import org.apache.maven.project.Version;
+import org.apache.maven.project.*;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlPullParserFactory;
-
-import java.io.IOException;
-import java.io.Reader;
/**
* @author Jason van Zyl
1.2 +8 -8 maven-new/core/src/java/org/apache/maven/project/builder/DefaultProjectBuilder.java
Index: DefaultProjectBuilder.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/project/builder/DefaultProjectBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultProjectBuilder.java 26 Apr 2003 16:52:16 -0000 1.1
+++ DefaultProjectBuilder.java 26 Apr 2003 23:33:31 -0000 1.2
@@ -1,13 +1,5 @@
package org.apache.maven.project.builder;
-import org.apache.maven.MavenConstants;
-import org.apache.maven.project.Project;
-import org.apache.maven.util.CollectionUtils;
-import org.apache.plexus.util.DirectoryScanner;
-import org.apache.plexus.util.StringUtils;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.ServiceException;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.FileReader;
@@ -21,6 +13,14 @@
import java.util.Map;
import java.util.Properties;
import java.util.Set;
+
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.maven.MavenConstants;
+import org.apache.maven.project.Project;
+import org.apache.maven.util.CollectionUtils;
+import org.apache.plexus.util.DirectoryScanner;
+import org.apache.plexus.util.StringUtils;
public class DefaultProjectBuilder
implements ProjectBuilder
1.2 +2 -2 maven-new/core/src/java/org/apache/maven/project/builder/ProjectUnmarshaller.java
Index: ProjectUnmarshaller.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/project/builder/ProjectUnmarshaller.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProjectUnmarshaller.java 26 Apr 2003 16:52:16 -0000 1.1
+++ ProjectUnmarshaller.java 26 Apr 2003 23:33:31 -0000 1.2
@@ -1,8 +1,8 @@
package org.apache.maven.project.builder;
-import org.apache.maven.project.Project;
-
import java.io.Reader;
+
+import org.apache.maven.project.Project;
public interface ProjectUnmarshaller
{
1.2 +9 -9 maven-new/core/src/java/org/apache/maven/plugins/example/ExampleComponent.java
Index: ExampleComponent.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/plugins/example/ExampleComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExampleComponent.java 26 Apr 2003 16:52:14 -0000 1.1
+++ ExampleComponent.java 26 Apr 2003 23:33:31 -0000 1.2
@@ -56,18 +56,18 @@
* ====================================================================
*/
-import org.apache.plexus.context.DefaultPlexusContext;
-import org.apache.plexus.logging.AbstractLogEnabled;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.activity.Startable;
import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.activity.Startable;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.plexus.context.DefaultPlexusContext;
+import org.apache.plexus.logging.AbstractLogEnabled;
/** This service implements all the start phases:
*
1.2 +3 -3 maven-new/core/src/java/org/apache/maven/util/I18NUtils.java
Index: I18NUtils.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/util/I18NUtils.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- I18NUtils.java 26 Apr 2003 16:52:17 -0000 1.1
+++ I18NUtils.java 26 Apr 2003 23:33:31 -0000 1.2
@@ -1,10 +1,10 @@
package org.apache.maven.util;
-import org.apache.plexus.util.StringUtils;
-
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+
+import org.apache.plexus.util.StringUtils;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org