You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2005/10/24 01:50:53 UTC
svn commit: r327885 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/
maven-core/src/main/java/org/apache/maven/usability/plugin/
maven-core/src/test/java/org/apache/maven/plugin/version/
maven-plugin-descriptor/src/main/java/org...
Author: brett
Date: Sun Oct 23 16:50:38 2005
New Revision: 327885
URL: http://svn.apache.org/viewcvs?rev=327885&view=rev
Log:
clean some imports and unused code
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/SettingsConfigurationException.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/version/IntervalUtilsTest.java
maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
maven/components/trunk/maven-plugin-descriptor/src/test/java/org/apache/maven/plugin/lifecycle/LifecycleXpp3ReaderTest.java
maven/components/trunk/maven-plugin-parameter-documenter/src/test/java/org/apache/maven/usability/plugin/Xpp3ParseTest.java
maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java
maven/components/trunk/maven-plugins/maven-verifier-plugin/src/test/java/org/apache/maven/plugin/verifier/VerifierMojoTest.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectSorterTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/injection/DefaultModelDefaultsInjectorTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/injection/DefaultProfileInjectorTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/RuntimeInfo.java
maven/components/trunk/maven-site/ (props changed)
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/SettingsConfigurationException.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/SettingsConfigurationException.java?rev=327885&r1=327884&r2=327885&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/SettingsConfigurationException.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/SettingsConfigurationException.java Sun Oct 23 16:50:38 2005
@@ -46,4 +46,16 @@
this.lineNumber = lineNumber;
this.columnNumber = columnNumber;
}
+
+ public int getColumnNumber()
+ {
+ return columnNumber;
+ }
+
+ public int getLineNumber()
+ {
+ return lineNumber;
+ }
+
+
}
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java?rev=327885&r1=327884&r2=327885&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java Sun Oct 23 16:50:38 2005
@@ -34,8 +34,6 @@
import java.util.List;
import java.util.Map;
-import javax.xml.parsers.ParserConfigurationException;
-
public class ExpressionDocumenter
{
Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/version/IntervalUtilsTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/version/IntervalUtilsTest.java?rev=327885&r1=327884&r2=327885&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/version/IntervalUtilsTest.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/version/IntervalUtilsTest.java Sun Oct 23 16:50:38 2005
@@ -1,9 +1,9 @@
package org.apache.maven.plugin.version;
+import junit.framework.TestCase;
+
import java.util.Calendar;
import java.util.Date;
-
-import junit.framework.TestCase;
/*
* Copyright 2001-2005 The Apache Software Foundation.
Modified: maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java?rev=327885&r1=327884&r2=327885&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java (original)
+++ maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java Sun Oct 23 16:50:38 2005
@@ -49,8 +49,6 @@
private String version;
- private List dependencies;
-
private String goalPrefix;
private String source;
Modified: maven/components/trunk/maven-plugin-descriptor/src/test/java/org/apache/maven/plugin/lifecycle/LifecycleXpp3ReaderTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-descriptor/src/test/java/org/apache/maven/plugin/lifecycle/LifecycleXpp3ReaderTest.java?rev=327885&r1=327884&r2=327885&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-descriptor/src/test/java/org/apache/maven/plugin/lifecycle/LifecycleXpp3ReaderTest.java (original)
+++ maven/components/trunk/maven-plugin-descriptor/src/test/java/org/apache/maven/plugin/lifecycle/LifecycleXpp3ReaderTest.java Sun Oct 23 16:50:38 2005
@@ -16,13 +16,14 @@
* limitations under the License.
*/
-import junit.framework.TestCase;
import org.apache.maven.plugin.lifecycle.io.xpp3.LifecycleMappingsXpp3Reader;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.io.InputStreamReader;
import java.io.IOException;
+import java.io.InputStreamReader;
+
+import junit.framework.TestCase;
/**
* Test the lifecycle reader.
Modified: maven/components/trunk/maven-plugin-parameter-documenter/src/test/java/org/apache/maven/usability/plugin/Xpp3ParseTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-parameter-documenter/src/test/java/org/apache/maven/usability/plugin/Xpp3ParseTest.java?rev=327885&r1=327884&r2=327885&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-parameter-documenter/src/test/java/org/apache/maven/usability/plugin/Xpp3ParseTest.java (original)
+++ maven/components/trunk/maven-plugin-parameter-documenter/src/test/java/org/apache/maven/usability/plugin/Xpp3ParseTest.java Sun Oct 23 16:50:38 2005
@@ -1,5 +1,7 @@
package org.apache.maven.usability.plugin;
+import junit.framework.TestCase;
+
import org.apache.maven.usability.plugin.io.xpp3.ParamdocXpp3Reader;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -8,8 +10,6 @@
import java.io.InputStreamReader;
import java.util.Map;
import java.util.Properties;
-
-import junit.framework.TestCase;
public class Xpp3ParseTest
extends TestCase
Modified: maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java?rev=327885&r1=327884&r2=327885&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java (original)
+++ maven/components/trunk/maven-plugins/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java Sun Oct 23 16:50:38 2005
@@ -180,7 +180,7 @@
// replace some vars in the expected line, to account
// for absolute paths that are different on each installation.
- expected = StringUtils.replace( expected, "${basedir}", basedir.replace( '\\', '/' ) );
+ expected = StringUtils.replace( expected, "${basedir}", getBasedir().replace( '\\', '/' ) );
if ( actualLines.size() <= i )
{
Modified: maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java?rev=327885&r1=327884&r2=327885&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java Sun Oct 23 16:50:38 2005
@@ -16,8 +16,6 @@
* limitations under the License.
*/
-import org.apache.maven.plugin.MojoExecutionException;
-
import java.io.File;
/**
Modified: maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java?rev=327885&r1=327884&r2=327885&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java Sun Oct 23 16:50:38 2005
@@ -16,9 +16,6 @@
* limitations under the License.
*/
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProjectHelper;
-
import java.io.File;
/**
Modified: maven/components/trunk/maven-plugins/maven-verifier-plugin/src/test/java/org/apache/maven/plugin/verifier/VerifierMojoTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-verifier-plugin/src/test/java/org/apache/maven/plugin/verifier/VerifierMojoTest.java?rev=327885&r1=327884&r2=327885&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-verifier-plugin/src/test/java/org/apache/maven/plugin/verifier/VerifierMojoTest.java (original)
+++ maven/components/trunk/maven-plugins/maven-verifier-plugin/src/test/java/org/apache/maven/plugin/verifier/VerifierMojoTest.java Sun Oct 23 16:50:38 2005
@@ -17,6 +17,7 @@
*/
import junit.framework.TestCase;
+
import org.apache.maven.plugin.MojoExecutionException;
import java.io.File;
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java?rev=327885&r1=327884&r2=327885&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java Sun Oct 23 16:50:38 2005
@@ -23,6 +23,7 @@
import org.apache.maven.model.BuildBase;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
+import org.apache.maven.model.DeploymentRepository;
import org.apache.maven.model.DistributionManagement;
import org.apache.maven.model.Exclusion;
import org.apache.maven.model.Extension;
@@ -42,7 +43,6 @@
import org.apache.maven.model.RepositoryPolicy;
import org.apache.maven.model.Resource;
import org.apache.maven.model.Site;
-import org.apache.maven.model.DeploymentRepository;
import org.apache.maven.project.inheritance.DefaultModelInheritanceAssembler;
import org.apache.maven.project.inheritance.ModelInheritanceAssembler;
import org.codehaus.plexus.util.xml.Xpp3Dom;
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java?rev=327885&r1=327884&r2=327885&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java Sun Oct 23 16:50:38 2005
@@ -1,6 +1,7 @@
package org.apache.maven.project;
import junit.framework.TestCase;
+
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectSorterTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectSorterTest.java?rev=327885&r1=327884&r2=327885&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectSorterTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectSorterTest.java Sun Oct 23 16:50:38 2005
@@ -17,6 +17,7 @@
*/
import junit.framework.TestCase;
+
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
import org.codehaus.plexus.util.dag.CycleDetectedException;
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java?rev=327885&r1=327884&r2=327885&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java Sun Oct 23 16:50:38 2005
@@ -17,6 +17,7 @@
*/
import junit.framework.TestCase;
+
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/injection/DefaultModelDefaultsInjectorTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/injection/DefaultModelDefaultsInjectorTest.java?rev=327885&r1=327884&r2=327885&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/injection/DefaultModelDefaultsInjectorTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/injection/DefaultModelDefaultsInjectorTest.java Sun Oct 23 16:50:38 2005
@@ -17,12 +17,12 @@
*/
import junit.framework.TestCase;
+
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Exclusion;
import org.apache.maven.model.Model;
-import java.util.ArrayList;
import java.util.List;
/**
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/injection/DefaultProfileInjectorTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/injection/DefaultProfileInjectorTest.java?rev=327885&r1=327884&r2=327885&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/injection/DefaultProfileInjectorTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/injection/DefaultProfileInjectorTest.java Sun Oct 23 16:50:38 2005
@@ -1,6 +1,7 @@
package org.apache.maven.project.injection;
import junit.framework.TestCase;
+
import org.apache.maven.model.Build;
import org.apache.maven.model.BuildBase;
import org.apache.maven.model.Model;
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java?rev=327885&r1=327884&r2=327885&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java Sun Oct 23 16:50:38 2005
@@ -17,6 +17,7 @@
*/
import junit.framework.TestCase;
+
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
import org.apache.maven.model.Repository;
Modified: maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java?rev=327885&r1=327884&r2=327885&view=diff
==============================================================================
--- maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java (original)
+++ maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java Sun Oct 23 16:50:38 2005
@@ -25,7 +25,6 @@
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringInputStream;
import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.FileUtils;
import java.io.File;
import java.io.IOException;
Modified: maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java?rev=327885&r1=327884&r2=327885&view=diff
==============================================================================
--- maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java (original)
+++ maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java Sun Oct 23 16:50:38 2005
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-import java.io.File;
-import java.io.InputStream;
-
import org.codehaus.doxia.sink.Sink;
import org.codehaus.doxia.site.renderer.SiteRenderer;
import org.codehaus.plexus.util.StringInputStream;
+
+import java.io.File;
+import java.io.InputStream;
/**
* @author <a href="evenisse@apache.org">Emmanuel Venisse</a>
Modified: maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java?rev=327885&r1=327884&r2=327885&view=diff
==============================================================================
--- maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java (original)
+++ maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java Sun Oct 23 16:50:38 2005
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-import org.apache.maven.settings.Settings;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
Modified: maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/RuntimeInfo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/RuntimeInfo.java?rev=327885&r1=327884&r2=327885&view=diff
==============================================================================
--- maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/RuntimeInfo.java (original)
+++ maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/RuntimeInfo.java Sun Oct 23 16:50:38 2005
@@ -31,7 +31,7 @@
// using Boolean for 3VL (null, true-to-all, false-to-all)
private Boolean applyToAllPluginUpdates;
- private boolean pluginRegistryActive = true;
+// private boolean pluginRegistryActive = true;
// using Boolean for 3VL (null for not-set, otherwise override with value)
// private Boolean checkLatest;
Propchange: maven/components/trunk/maven-site/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Oct 23 16:50:38 2005
@@ -1,3 +1,4 @@
+.wtpmodules
target
*~
*.log