Author: hboutemy
Date: Sun Jul 7 14:53:33 2013
New Revision: 1500446
URL: http://svn.apache.org/r1500446
Log:
moved attributes used only by check-site to DistCheckSiteMojo
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java?rev=1500446&r1=1500445&r2=1500446&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
Sun Jul 7 14:53:33 2013
@@ -30,7 +30,6 @@ import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
-import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.MavenArtifactRepository;
@@ -43,7 +42,6 @@ import org.apache.maven.plugin.MojoExecu
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.reporting.AbstractMavenReport;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -87,24 +85,6 @@ public abstract class AbstractDistCheckM
protected MavenProject project;
/**
- * Local repository.
- */
- @Parameter( defaultValue = "${localRepository}", required = true, readonly
= true )
- protected ArtifactRepository localRepository;
-
- /**
- * Artifact factory.
- */
- @Component
- protected ArtifactFactory artifactFactory;
-
- /**
- * Maven project builder.
- */
- @Component
- protected MavenProjectBuilder mavenProjectBuilder;
-
- /**
* list of artifacts repositories.
*/
protected List<ArtifactRepository> artifactRepositories = new
LinkedList<>();
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java?rev=1500446&r1=1500445&r2=1500446&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java
Sun Jul 7 14:53:33 2013
@@ -28,14 +28,18 @@ import java.util.Map;
import org.apache.commons.io.FileUtils;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.dist.tools.checkers.HTMLChecker;
import org.apache.maven.dist.tools.checkers.HTMLCheckerFactory;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkEventAttributeSet;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.reporting.MavenReportException;
import org.jsoup.HttpStatusException;
import org.jsoup.Jsoup;
@@ -56,6 +60,23 @@ import org.openqa.selenium.firefox.Firef
@Mojo( name = "check-site", requiresProject = false )
public class DistCheckSiteMojo extends AbstractDistCheckMojo
{
+ /**
+ * Artifact factory.
+ */
+ @Component
+ protected ArtifactFactory artifactFactory;
+
+ /**
+ * Local repository.
+ */
+ @Parameter( defaultValue = "${localRepository}", required = true, readonly
= true )
+ protected ArtifactRepository localRepository;
+
+ /**
+ * Maven project builder.
+ */
+ @Component
+ protected MavenProjectBuilder mavenProjectBuilder;
/**
* Take screenshot with web browser
@@ -391,12 +412,10 @@ public class DistCheckSiteMojo extends A
results.add( result );
try
{
- Artifact pluginArtifact = artifactFactory.createProjectArtifact(
- configLine.getGroupId(),
- configLine.getArtifactId(), version );
- MavenProject pluginProject =
mavenProjectBuilder.buildFromRepository(
- pluginArtifact,
- artifactRepositories, localRepository, false );
+ Artifact pluginArtifact =
+ artifactFactory.createProjectArtifact(
configLine.getGroupId(), configLine.getArtifactId(), version );
+ MavenProject pluginProject =
+ mavenProjectBuilder.buildFromRepository( pluginArtifact,
artifactRepositories, localRepository, false );
result.setUrl( pluginProject.getUrl() );
Document doc = Jsoup.connect( pluginProject.getUrl() ).get();
@@ -436,7 +455,8 @@ public class DistCheckSiteMojo extends A
}
@Override
- public void execute() throws MojoExecutionException
+ public void execute()
+ throws MojoExecutionException
{
try
{
