Author: hboutemy
Date: Tue Jan 19 01:23:42 2016
New Revision: 1725402
URL: http://svn.apache.org/viewvc?rev=1725402&view=rev
Log:
refactoring to ease maintenance
Added:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/list-plugins-prerequisites/
- copied from r1725398,
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-prerequisites-report/
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/index/
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/index/DistCheckIndexPageMojo.java
- copied, changed from r1725398,
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/index/IndexPage.java
(with props)
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/prerequisites/
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/prerequisites/GetPrerequisites.java
- copied, changed from r1725399,
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/GetPrerequisites.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/prerequisites/ListPluginsPrerequisitesMojo.java
- copied, changed from r1725398,
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ListPluginsPrerequisitesMojo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/prerequisites/PluginPrerequisites.java
- copied, changed from r1725398,
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/PluginPrerequisites.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/CheckSiteResult.java
(with props)
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/DistCheckSiteMojo.java
- copied, changed from r1725398,
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/HTMLChecker.java
- copied, changed from r1725398,
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/HTMLChecker.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/HTMLCheckerFactory.java
- copied, changed from r1725398,
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/HTMLCheckerFactory.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/checkers/
- copied from r1725398,
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/source/
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/source/CheckSourceReleaseResult.java
(with props)
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseMojo.java
- copied, changed from r1725398,
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/test/java/org/apache/maven/dist/tools/source/
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/test/java/org/apache/maven/dist/tools/source/PatternTest.java
- copied, changed from r1725398,
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/test/java/org/apache/maven/dist/tools/PatternTest.java
Removed:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/check-prerequisites-report/
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/GetPrerequisites.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ListPluginsPrerequisitesMojo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/PluginPrerequisites.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/checkers/HTMLChecker.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/checkers/HTMLCheckerFactory.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/test/java/org/apache/maven/dist/tools/PatternTest.java
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/list-plugins-prerequisites/pom.xml
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractCheckResult.java
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/ConfigurationLineInfo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckErrorsMojo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/checkers/FluidoHTMLChecker.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/checkers/StylusLeftHTMLChecker.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/checkers/StylusRightHTMLChecker.java
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/list-plugins-prerequisites/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/list-plugins-prerequisites/pom.xml?rev=1725402&r1=1725398&r2=1725402&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/list-plugins-prerequisites/pom.xml
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/it/list-plugins-prerequisites/pom.xml
Tue Jan 19 01:23:42 2016
@@ -27,7 +27,7 @@
<reportSets>
<reportSet>
<reports>
- <report>check-prerequisites-site</report>
+ <report>list-plugins-prerequisites</report>
</reports>
</reportSet>
</reportSets>
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractCheckResult.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractCheckResult.java?rev=1725402&r1=1725401&r2=1725402&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractCheckResult.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractCheckResult.java
Tue Jan 19 01:23:42 2016
@@ -23,13 +23,13 @@ package org.apache.maven.dist.tools;
*
* @author skygo
*/
-class AbstractCheckResult
+public class AbstractCheckResult
{
private final ConfigurationLineInfo configLine;
private final String version;
- AbstractCheckResult( ConfigurationLineInfo r, String version )
+ public AbstractCheckResult( ConfigurationLineInfo r, String version )
{
this.configLine = r;
this.version = version;
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=1725402&r1=1725401&r2=1725402&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
Tue Jan 19 01:23:42 2016
@@ -103,7 +103,7 @@ public abstract class AbstractDistCheckM
* necessary to only check index page information for plugins marked with
asterisk * in db,
* because they are released as part of a global component (archetype,
scm, release, ...)
*/
- abstract boolean isIndexPageCheck();
+ protected abstract boolean isIndexPageCheck();
protected abstract void checkArtifact( ConfigurationLineInfo request,
String repoBase )
throws MojoExecutionException;
@@ -335,7 +335,7 @@ public abstract class AbstractDistCheckM
*
* @param sink doxiasink
*/
- protected void iconError( Sink sink )
+ public void iconError( Sink sink )
{
icon( sink, "icon_error_sml" );
}
@@ -345,7 +345,7 @@ public abstract class AbstractDistCheckM
*
* @param sink doxiasink
*/
- protected void iconWarning( Sink sink )
+ public void iconWarning( Sink sink )
{
icon( sink, "icon_warning_sml" );
}
@@ -355,7 +355,7 @@ public abstract class AbstractDistCheckM
*
* @param sink doxiasink
*/
- protected void iconSuccess( Sink sink )
+ public void iconSuccess( Sink sink )
{
icon( sink, "icon_success_sml" );
}
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java?rev=1725402&r1=1725401&r2=1725402&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java
Tue Jan 19 01:23:42 2016
@@ -28,12 +28,13 @@ import java.util.List;
import org.apache.maven.artifact.repository.metadata.Metadata;
import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.dist.tools.index.DistCheckIndexPageMojo;
/**
*
* @author skygo
*/
-class ConfigurationLineInfo
+public class ConfigurationLineInfo
{
private static final String URLSEP = "/";
@@ -125,17 +126,17 @@ class ConfigurationLineInfo
return srcBin;
}
- String getBaseURL( String repoBaseUrl, String folder )
+ public String getBaseURL( String repoBaseUrl, String folder )
{
return repoBaseUrl + groupId.replaceAll( "\\.", URLSEP ) + URLSEP +
artifactId + URLSEP + folder;
}
- String getMetadataFileURL( String repoBaseUrl )
+ public String getMetadataFileURL( String repoBaseUrl )
{
return getBaseURL( repoBaseUrl, "maven-metadata.xml" );
}
- String getVersionnedFolderURL( String repoBaseUrl, String version )
+ public String getVersionnedFolderURL( String repoBaseUrl, String version )
{
return getBaseURL( repoBaseUrl, version ) + '/';
}
@@ -150,7 +151,7 @@ class ConfigurationLineInfo
this.metadata = aMetadata;
}
- String getReleaseDateFromMetadata()
+ public String getReleaseDateFromMetadata()
{
try
{
@@ -173,7 +174,7 @@ class ConfigurationLineInfo
+ ( srcBin && ( dist || !"maven-ant-tasks".equals( artifactId ) )
? "-src" : "-source-release" ) + ".zip";
}
- List<String> getExpectedFilenames( String version, boolean dist )
+ public List<String> getExpectedFilenames( String version, boolean dist )
{
String sourceReleaseFilename = getSourceReleaseFilename( version, dist
);
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckErrorsMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckErrorsMojo.java?rev=1725402&r1=1725401&r2=1725402&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckErrorsMojo.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckErrorsMojo.java
Tue Jan 19 01:23:42 2016
@@ -23,6 +23,9 @@ import java.io.File;
import java.io.IOException;
import java.util.Locale;
+import org.apache.maven.dist.tools.index.DistCheckIndexPageMojo;
+import org.apache.maven.dist.tools.site.DistCheckSiteMojo;
+import org.apache.maven.dist.tools.source.DistCheckSourceReleaseMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.reporting.MavenReportException;
@@ -42,7 +45,7 @@ public class DistCheckErrorsMojo
private static final String EOL = System.getProperty( "line.separator" );
@Override
- boolean isIndexPageCheck()
+ protected boolean isIndexPageCheck()
{
return false;
}
Copied:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/index/DistCheckIndexPageMojo.java
(from r1725398,
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java)
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/index/DistCheckIndexPageMojo.java?p2=maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/index/DistCheckIndexPageMojo.java&p1=maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java&r1=1725398&r2=1725402&rev=1725402&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/index/DistCheckIndexPageMojo.java
Tue Jan 19 01:23:42 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.dist.tools;
+package org.apache.maven.dist.tools.index;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -31,6 +31,9 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
+import org.apache.maven.dist.tools.AbstractCheckResult;
+import org.apache.maven.dist.tools.AbstractDistCheckMojo;
+import org.apache.maven.dist.tools.ConfigurationLineInfo;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Mojo;
@@ -50,9 +53,9 @@ import org.jsoup.select.Elements;
public class DistCheckIndexPageMojo
extends AbstractDistCheckMojo
{
- static final String FAILURES_FILENAME = "check-index-page.log";
+ public static final String FAILURES_FILENAME = "check-index-page.log";
- static final String POMS_INDEX_URL = "http://maven.apache.org/pom/";;
+ public static final String POMS_INDEX_URL = "http://maven.apache.org/pom/";;
private static final IndexPage[] INDEX_PAGES = new IndexPage[] {
new IndexPage( "http://maven.apache.org/plugins/";, "Plugins", 3, true
),
@@ -62,23 +65,6 @@ public class DistCheckIndexPageMojo
private static final Map<String, IndexPage> INDEX_PAGES_REF;
- private static class IndexPage
- {
- final String url;
- final String name;
- final int versionColumn;
- final boolean containsDate;
- Document document;
-
- IndexPage( String url, String name, int versionColumn, boolean
containsDate )
- {
- this.url = url;
- this.name = name;
- this.versionColumn = versionColumn;
- this.containsDate = containsDate;
- }
- }
-
static
{
Map<String, IndexPage> aMap = new HashMap<>();
@@ -114,7 +100,7 @@ public class DistCheckIndexPageMojo
}
@Override
- boolean isIndexPageCheck()
+ protected boolean isIndexPageCheck()
{
return true;
}
Added:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/index/IndexPage.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/index/IndexPage.java?rev=1725402&view=auto
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/index/IndexPage.java
(added)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/index/IndexPage.java
Tue Jan 19 01:23:42 2016
@@ -0,0 +1,39 @@
+package org.apache.maven.dist.tools.index;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.jsoup.nodes.Document;
+
+class IndexPage
+{
+ final String url;
+ final String name;
+ final int versionColumn;
+ final boolean containsDate;
+ Document document;
+
+ IndexPage( String url, String name, int versionColumn, boolean
containsDate )
+ {
+ this.url = url;
+ this.name = name;
+ this.versionColumn = versionColumn;
+ this.containsDate = containsDate;
+ }
+}
\ No newline at end of file
Propchange:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/index/IndexPage.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/index/IndexPage.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/index/IndexPage.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/prerequisites/GetPrerequisites.java
(from r1725399,
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/GetPrerequisites.java)
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/prerequisites/GetPrerequisites.java?p2=maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/prerequisites/GetPrerequisites.java&p1=maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/GetPrerequisites.java&r1=1725399&r2=1725402&rev=1725402&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/GetPrerequisites.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/prerequisites/GetPrerequisites.java
Tue Jan 19 01:23:42 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.dist.tools;
+package org.apache.maven.dist.tools.prerequisites;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -38,7 +38,7 @@ import org.jsoup.select.Elements;
public class GetPrerequisites
{
/**
- * Currently hard code should be somehow extracted from the configuration
file....
+ * TODO Currently hard code should be somehow extracted from the
configuration file....
*/
public static final String[] PLUGIN_NAMES = {
"maven-acr-plugin",
Copied:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/prerequisites/ListPluginsPrerequisitesMojo.java
(from r1725398,
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ListPluginsPrerequisitesMojo.java)
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/prerequisites/ListPluginsPrerequisitesMojo.java?p2=maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/prerequisites/ListPluginsPrerequisitesMojo.java&p1=maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ListPluginsPrerequisitesMojo.java&r1=1725398&r2=1725402&rev=1725402&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ListPluginsPrerequisitesMojo.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/prerequisites/ListPluginsPrerequisitesMojo.java
Tue Jan 19 01:23:42 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.dist.tools;
+package org.apache.maven.dist.tools.prerequisites;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/prerequisites/PluginPrerequisites.java
(from r1725398,
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/PluginPrerequisites.java)
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/prerequisites/PluginPrerequisites.java?p2=maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/prerequisites/PluginPrerequisites.java&p1=maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/PluginPrerequisites.java&r1=1725398&r2=1725402&rev=1725402&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/PluginPrerequisites.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/prerequisites/PluginPrerequisites.java
Tue Jan 19 01:23:42 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.dist.tools;
+package org.apache.maven.dist.tools.prerequisites;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Added:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/CheckSiteResult.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/CheckSiteResult.java?rev=1725402&view=auto
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/CheckSiteResult.java
(added)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/CheckSiteResult.java
Tue Jan 19 01:23:42 2016
@@ -0,0 +1,182 @@
+package org.apache.maven.dist.tools.site;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.maven.dist.tools.AbstractCheckResult;
+import org.apache.maven.dist.tools.ConfigurationLineInfo;
+import org.apache.maven.doxia.sink.Sink;
+import org.jsoup.nodes.Comment;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.nodes.Node;
+import org.jsoup.select.Elements;
+
+class CheckSiteResult
+ extends AbstractCheckResult
+{
+
+ /**
+ *
+ */
+ private final DistCheckSiteMojo distCheckSiteMojo;
+ private String url;
+ private Map<HTMLChecker, Boolean> checkMap = new HashMap<>();
+ private int statusCode = DistCheckSiteMojo.HTTP_OK;
+ private Document document;
+ private String screenshotName;
+
+ public CheckSiteResult( DistCheckSiteMojo distCheckSiteMojo,
ConfigurationLineInfo r, String version )
+ {
+ super( r, version );
+ this.distCheckSiteMojo = distCheckSiteMojo;
+ }
+
+ void setUrl( String url )
+ {
+ this.url = url;
+ }
+
+ /**
+ * @return the url
+ */
+ public String getUrl()
+ {
+ return url;
+ }
+
+ /**
+ * @return the checkMap
+ */
+ public Map<HTMLChecker, Boolean> getCheckMap()
+ {
+ return checkMap;
+ }
+
+ void setHTTPErrorUrl( int status )
+ {
+ this.statusCode = status;
+ }
+
+ /**
+ * @return the statusCode
+ */
+ public int getStatusCode()
+ {
+ return statusCode;
+ }
+
+ void getSkins( Sink sink )
+ {
+ if ( statusCode != DistCheckSiteMojo.HTTP_OK )
+ {
+ sink.text( "None" );
+ }
+ else
+ {
+ String text = "";
+ Elements htmlTag = document.select( "html " );
+ for ( Element htmlTa : htmlTag )
+ {
+ Node n = htmlTa.previousSibling();
+ if ( n instanceof Comment )
+ {
+ text += ( ( Comment ) n ).getData();
+ }
+ else
+ {
+ text += " ";
+ }
+ }
+
+ sink.text( "skin: " );
+ if ( isSkin( "Fluido" ) )
+ {
+ sink.text( "Fluido" );
+ }
+ else if ( isSkin( "Stylus" ) )
+ {
+ sink.text( "Stylus" );
+ }
+ else
+ {
+ sink.text( "Not determined" );
+ }
+ sink.verbatim( null );
+ sink.text( text.trim().replace( " |", "|" ).replace( "| ", "" ) );
+ sink.verbatim_();
+ }
+ }
+
+ void getOverall( Sink sink )
+ {
+ if ( statusCode != DistCheckSiteMojo.HTTP_OK )
+ {
+ this.distCheckSiteMojo.iconError( sink );
+ }
+ else
+ {
+ boolean found = false;
+ for ( Map.Entry<HTMLChecker, Boolean> e : checkMap.entrySet() )
+ {
+ if ( e.getValue() )
+ {
+ this.distCheckSiteMojo.iconSuccess( sink );
+ sink.text( ": " + e.getKey().getName() );
+ found = true;
+ }
+ }
+ if ( !found )
+ {
+ this.distCheckSiteMojo.iconWarning( sink );
+ sink.text( ": artifact version not found" );
+ }
+ }
+ }
+
+ private boolean isSkin( String skinName )
+ {
+ boolean tmp = false;
+ for ( Map.Entry<HTMLChecker, Boolean> e : checkMap.entrySet() )
+ {
+ if ( e.getKey().getSkin().equals( skinName ) )
+ {
+ tmp = tmp || e.getValue();
+ }
+ }
+ return tmp;
+ }
+
+ void setDocument( Document doc )
+ {
+ this.document = doc ;
+ }
+
+ void setScreenShot( String fileName )
+ {
+ this.screenshotName = fileName;
+ }
+ String getScreenShot()
+ {
+ return screenshotName;
+ }
+}
\ No newline at end of file
Propchange:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/CheckSiteResult.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/CheckSiteResult.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/CheckSiteResult.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/DistCheckSiteMojo.java
(from r1725398,
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/site/DistCheckSiteMojo.java?p2=maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/DistCheckSiteMojo.java&p1=maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java&r1=1725398&r2=1725402&rev=1725402&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/site/DistCheckSiteMojo.java
Tue Jan 19 01:23:42 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.dist.tools;
+package org.apache.maven.dist.tools.site;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,18 +20,16 @@ package org.apache.maven.dist.tools;
*/
import java.io.File;
-import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
-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.dist.tools.AbstractDistCheckMojo;
+import org.apache.maven.dist.tools.ConfigurationLineInfo;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkEventAttributeSet;
import org.apache.maven.plugin.MojoExecutionException;
@@ -43,11 +41,7 @@ import org.apache.maven.project.MavenPro
import org.apache.maven.reporting.MavenReportException;
import org.jsoup.HttpStatusException;
import org.jsoup.Jsoup;
-import org.jsoup.nodes.Comment;
import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.jsoup.nodes.Node;
-import org.jsoup.select.Elements;
import org.openqa.selenium.OutputType;
import org.openqa.selenium.TakesScreenshot;
import org.openqa.selenium.WebDriver;
@@ -61,7 +55,7 @@ import org.openqa.selenium.firefox.Firef
public class DistCheckSiteMojo
extends AbstractDistCheckMojo
{
- static final String FAILURES_FILENAME = "check-site.log";
+ public static final String FAILURES_FILENAME = "check-site.log";
/**
* Ignore site failure for <code>artifactId</code> or
<code>artifactId:version</code>
@@ -101,7 +95,7 @@ public class DistCheckSiteMojo
protected static final int HTTP_OK = 200;
@Override
- boolean isIndexPageCheck()
+ protected boolean isIndexPageCheck()
{
return false;
}
@@ -123,151 +117,6 @@ public class DistCheckSiteMojo
return "Verification of documentation site corresponding to artifact";
}
- class CheckSiteResult
- extends AbstractCheckResult
- {
-
- private String url;
- private Map<HTMLChecker, Boolean> checkMap = new HashMap<>();
- private int statusCode = HTTP_OK;
- private Document document;
- private String screenshotName;
-
- public CheckSiteResult( ConfigurationLineInfo r, String version )
- {
- super( r, version );
- }
-
- void setUrl( String url )
- {
- this.url = url;
- }
-
- /**
- * @return the url
- */
- public String getUrl()
- {
- return url;
- }
-
- /**
- * @return the checkMap
- */
- public Map<HTMLChecker, Boolean> getCheckMap()
- {
- return checkMap;
- }
-
- private void setHTTPErrorUrl( int status )
- {
- this.statusCode = status;
- }
-
- /**
- * @return the statusCode
- */
- public int getStatusCode()
- {
- return statusCode;
- }
-
- private void getSkins( Sink sink )
- {
- if ( statusCode != HTTP_OK )
- {
- sink.text( "None" );
- }
- else
- {
- String text = "";
- Elements htmlTag = document.select( "html " );
- for ( Element htmlTa : htmlTag )
- {
- Node n = htmlTa.previousSibling();
- if ( n instanceof Comment )
- {
- text += ( ( Comment ) n ).getData();
- }
- else
- {
- text += " ";
- }
- }
-
- sink.text( "skin: " );
- if ( isSkin( "Fluido" ) )
- {
- sink.text( "Fluido" );
- }
- else if ( isSkin( "Stylus" ) )
- {
- sink.text( "Stylus" );
- }
- else
- {
- sink.text( "Not determined" );
- }
- sink.verbatim( null );
- sink.text( text.trim().replace( " |", "|" ).replace( "| ", ""
) );
- sink.verbatim_();
- }
- }
-
- private void getOverall( Sink sink )
- {
- if ( statusCode != HTTP_OK )
- {
- iconError( sink );
- }
- else
- {
- boolean found = false;
- for ( Map.Entry<HTMLChecker, Boolean> e : checkMap.entrySet() )
- {
- if ( e.getValue() )
- {
- iconSuccess( sink );
- sink.text( ": " + e.getKey().getName() );
- found = true;
- }
- }
- if ( !found )
- {
- iconWarning( sink );
- sink.text( ": artifact version not found" );
- }
- }
- }
-
- private boolean isSkin( String skinName )
- {
- boolean tmp = false;
- for ( Map.Entry<HTMLChecker, Boolean> e : checkMap.entrySet() )
- {
- if ( e.getKey().getSkin().equals( skinName ) )
- {
- tmp = tmp || e.getValue();
- }
- }
- return tmp;
- }
-
- private void setDocument( Document doc )
- {
- this.document = doc ;
- }
-
- private void setScreenShot( String fileName )
- {
- this.screenshotName = fileName;
- }
- private String getScreenShot()
- {
- return screenshotName;
- }
- }
-
// keep result
private List<CheckSiteResult> results = new LinkedList<>();
private final List<HTMLChecker> checker = HTMLCheckerFactory.getCheckers();
@@ -412,7 +261,7 @@ public class DistCheckSiteMojo
private void checkSite( ConfigurationLineInfo cli, String version )
{
- CheckSiteResult result = new CheckSiteResult( cli, version );
+ CheckSiteResult result = new CheckSiteResult( this, cli, version );
results.add( result );
try
{
Copied:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/HTMLChecker.java
(from r1725398,
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/HTMLChecker.java)
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/HTMLChecker.java?p2=maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/HTMLChecker.java&p1=maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/HTMLChecker.java&r1=1725398&r2=1725402&rev=1725402&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/HTMLChecker.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/HTMLChecker.java
Tue Jan 19 01:23:42 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.dist.tools.checkers;
+package org.apache.maven.dist.tools.site;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/HTMLCheckerFactory.java
(from r1725398,
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/HTMLCheckerFactory.java)
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/HTMLCheckerFactory.java?p2=maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/HTMLCheckerFactory.java&p1=maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/HTMLCheckerFactory.java&r1=1725398&r2=1725402&rev=1725402&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/HTMLCheckerFactory.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/HTMLCheckerFactory.java
Tue Jan 19 01:23:42 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.dist.tools.checkers;
+package org.apache.maven.dist.tools.site;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,6 +22,10 @@ package org.apache.maven.dist.tools.chec
import java.util.LinkedList;
import java.util.List;
+import org.apache.maven.dist.tools.site.checkers.FluidoHTMLChecker;
+import org.apache.maven.dist.tools.site.checkers.StylusLeftHTMLChecker;
+import org.apache.maven.dist.tools.site.checkers.StylusRightHTMLChecker;
+
/**
*
* @author skygo
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/checkers/FluidoHTMLChecker.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/checkers/FluidoHTMLChecker.java?rev=1725402&r1=1725398&r2=1725402&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/checkers/FluidoHTMLChecker.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/checkers/FluidoHTMLChecker.java
Tue Jan 19 01:23:42 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.dist.tools.checkers;
+package org.apache.maven.dist.tools.site.checkers;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,7 @@ package org.apache.maven.dist.tools.chec
* under the License.
*/
+import org.apache.maven.dist.tools.site.HTMLChecker;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/checkers/StylusLeftHTMLChecker.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/checkers/StylusLeftHTMLChecker.java?rev=1725402&r1=1725398&r2=1725402&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/checkers/StylusLeftHTMLChecker.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/checkers/StylusLeftHTMLChecker.java
Tue Jan 19 01:23:42 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.dist.tools.checkers;
+package org.apache.maven.dist.tools.site.checkers;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,7 @@ package org.apache.maven.dist.tools.chec
* under the License.
*/
+import org.apache.maven.dist.tools.site.HTMLChecker;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/checkers/StylusRightHTMLChecker.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/checkers/StylusRightHTMLChecker.java?rev=1725402&r1=1725398&r2=1725402&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/checkers/StylusRightHTMLChecker.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/site/checkers/StylusRightHTMLChecker.java
Tue Jan 19 01:23:42 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.dist.tools.checkers;
+package org.apache.maven.dist.tools.site.checkers;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,7 @@ package org.apache.maven.dist.tools.chec
* under the License.
*/
+import org.apache.maven.dist.tools.site.HTMLChecker;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
Added:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/source/CheckSourceReleaseResult.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/source/CheckSourceReleaseResult.java?rev=1725402&view=auto
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/source/CheckSourceReleaseResult.java
(added)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/source/CheckSourceReleaseResult.java
Tue Jan 19 01:23:42 2016
@@ -0,0 +1,54 @@
+package org.apache.maven.dist.tools.source;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.List;
+
+import org.apache.maven.dist.tools.AbstractCheckResult;
+import org.apache.maven.dist.tools.ConfigurationLineInfo;
+
+class CheckSourceReleaseResult
+ extends AbstractCheckResult
+{
+
+ List<String> central;
+ List<String> dist;
+ List<String> distOlder;
+
+ public CheckSourceReleaseResult( ConfigurationLineInfo r, String version )
+ {
+ super( r, version );
+ }
+
+ void setMissingDistSourceRelease( List<String> checkRepos )
+ {
+ dist = checkRepos;
+ }
+
+ void setMissingCentralSourceRelease( List<String> checkRepos )
+ {
+ central = checkRepos;
+ }
+
+ void setDistOlderSourceRelease( List<String> checkRepos )
+ {
+ distOlder = checkRepos;
+ }
+}
\ No newline at end of file
Propchange:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/source/CheckSourceReleaseResult.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/source/CheckSourceReleaseResult.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/source/CheckSourceReleaseResult.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseMojo.java
(from r1725398,
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java)
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseMojo.java?p2=maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseMojo.java&p1=maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java&r1=1725398&r2=1725402&rev=1725402&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseMojo.java
Tue Jan 19 01:23:42 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.dist.tools;
+package org.apache.maven.dist.tools.source;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,6 +26,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
+import org.apache.maven.dist.tools.AbstractDistCheckMojo;
+import org.apache.maven.dist.tools.ConfigurationLineInfo;
import org.apache.maven.doxia.markup.HtmlMarkup;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkEventAttributeSet;
@@ -49,10 +51,10 @@ public class DistCheckSourceReleaseMojo
{
private static final String NOT_IN_DISTRIBUTION_AREA =
"_not_in_distribution_area_";
- static final String FAILURES_FILENAME = "check-source-release.log";
+ public static final String FAILURES_FILENAME = "check-source-release.log";
@Override
- boolean isIndexPageCheck()
+ protected boolean isIndexPageCheck()
{
return false;
}
@@ -80,34 +82,6 @@ public class DistCheckSourceReleaseMojo
return "Verification of source release";
}
- private static class CheckSourceReleaseResult
- extends AbstractCheckResult
- {
-
- private List<String> central;
- private List<String> dist;
- private List<String> distOlder;
-
- public CheckSourceReleaseResult( ConfigurationLineInfo r, String
version )
- {
- super( r, version );
- }
-
- private void setMissingDistSourceRelease( List<String> checkRepos )
- {
- dist = checkRepos;
- }
-
- private void setMissingCentralSourceRelease( List<String> checkRepos )
- {
- central = checkRepos;
- }
-
- private void setDistOlderSourceRelease( List<String> checkRepos )
- {
- distOlder = checkRepos;
- }
- }
private final List<CheckSourceReleaseResult> results = new LinkedList<>();
private static class DirectoryStatistics
Copied:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/test/java/org/apache/maven/dist/tools/source/PatternTest.java
(from r1725398,
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/test/java/org/apache/maven/dist/tools/PatternTest.java)
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/test/java/org/apache/maven/dist/tools/source/PatternTest.java?p2=maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/test/java/org/apache/maven/dist/tools/source/PatternTest.java&p1=maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/test/java/org/apache/maven/dist/tools/PatternTest.java&r1=1725398&r2=1725402&rev=1725402&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/test/java/org/apache/maven/dist/tools/PatternTest.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/test/java/org/apache/maven/dist/tools/source/PatternTest.java
Tue Jan 19 01:23:42 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.dist.tools;
+package org.apache.maven.dist.tools.source;
/*
* Copyright 2013 The Apache Software Foundation.
@@ -19,6 +19,7 @@ package org.apache.maven.dist.tools;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import org.apache.maven.dist.tools.source.DistCheckSourceReleaseMojo;
import org.junit.Test;
/**
