Author: hboutemy
Date: Sun Jul 7 14:39:42 2013
New Revision: 1500442
URL: http://svn.apache.org/r1500442
Log:
changed maven DB format to avoid redundant information
Added:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.txt
- copied, changed from r1500397,
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.csv
Removed:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.csv
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/ConfigurationLineInfo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.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=1500442&r1=1500441&r2=1500442&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:39:42 2013
@@ -53,7 +53,7 @@ import org.codehaus.plexus.util.xml.pull
public abstract class AbstractDistCheckMojo
extends AbstractMavenReport
{
- private static final String MAVEN_DB = "db/mavendb.csv";
+ private static final String MAVEN_DB = "db/mavendb.txt";
/**
* URL of repository where artifacts are stored.
@@ -132,7 +132,7 @@ public abstract class AbstractDistCheckM
private void loadMavenDb()
throws MojoExecutionException
{
- URL mavenDb = this.getClass().getResource( MAVEN_DB );
+ URL mavenDb =
Thread.currentThread().getContextClassLoader().getResource( MAVEN_DB );
try ( BufferedReader in = new BufferedReader( new InputStreamReader(
mavenDb.openStream() ) ) )
{
String text;
@@ -166,16 +166,21 @@ public abstract class AbstractDistCheckM
loadMavenDb();
}
+ ConfigurationLineInfo currentGroup = null;
for ( String line : configurationLines )
{
if ( line.startsWith( "##" ) )
{
getLog().info( line );
}
+ else if ( !line.startsWith( " " ) )
+ {
+ currentGroup = new ConfigurationLineInfo( line.split( " " ) );
+ }
else
{
- ConfigurationLineInfo aLine = new ConfigurationLineInfo(
line.split( ";" ) );
- //
+ ConfigurationLineInfo aLine = new ConfigurationLineInfo(
currentGroup, line.trim().split( " " ) );
+
try ( BufferedReader input = new BufferedReader(
new InputStreamReader( new URL(
aLine.getMetadataFileURL( repoBaseUrl ) ).openStream() ) ) )
{
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=1500442&r1=1500441&r2=1500442&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
Sun Jul 7 14:39:42 2013
@@ -31,27 +31,32 @@ import org.apache.maven.artifact.reposit
*/
class ConfigurationLineInfo
{
+ private static final String URLSEP = "/";
private final String groupId;
+ private final String directory;
+
private final String artifactId;
- private final String dist;
- private static final String URLSEP = "/";
private final String forceVersion;
+
private Metadata metadata;
public ConfigurationLineInfo( String[] infos )
{
+ this.directory = infos[0];
this.groupId = infos[1];
- this.artifactId = infos[2];
- this.dist = infos[3];
- if ( infos.length == 5 )
- {
- this.forceVersion = infos[4];
- }
- else
- {
- this.forceVersion = null;
- }
+
+ this.artifactId = null;
+ this.forceVersion = null;
+ }
+
+ public ConfigurationLineInfo( ConfigurationLineInfo group, String[] infos )
+ {
+ this.directory = group.getDirectory();
+ this.groupId = group.getGroupId();
+
+ this.artifactId = infos[0];
+ this.forceVersion = ( infos.length > 1 ) ? infos[1] : null;
}
public String getForcedVersion()
@@ -76,11 +81,11 @@ class ConfigurationLineInfo
}
/**
- * @return the dist
+ * @return the directory
*/
- public String getDist()
+ public String getDirectory()
{
- return dist;
+ return directory;
}
String getBaseURL( String repoBaseUrl, String folder )
Modified:
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/DistCheckSourceReleaseMojo.java?rev=1500442&r1=1500441&r2=1500442&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/DistCheckSourceReleaseMojo.java
Sun Jul 7 14:39:42 2013
@@ -47,8 +47,8 @@ public class DistCheckSourceReleaseMojo
{
//Artifact metadata retrieval done y hands.
- private static final String DIST_AREA = "http://www.apache.org/dist/maven";;
- private static final String DIST_SVNPUBSUB =
"https://dist.apache.org/repos/dist/release/maven";;
+ private static final String DIST_AREA =
"http://www.apache.org/dist/maven/";;
+ private static final String DIST_SVNPUBSUB =
"https://dist.apache.org/repos/dist/release/maven/";;
@Override
public String getOutputName()
@@ -151,8 +151,8 @@ public class DistCheckSourceReleaseMojo
// dist column
sink.tableCell();
- sink.link( cli.getDist() );
- sink.text( cli.getDist().substring( DIST_AREA.length() ) );
+ sink.link( DIST_AREA + cli.getDirectory() );
+ sink.text( cli.getDirectory() );
sink.link_();
sink.text( "source-release" );
if ( csr.dist.isEmpty() && csr.older.isEmpty() )
@@ -407,9 +407,9 @@ public class DistCheckSourceReleaseMojo
configLine, latestVersion ) );
//dist
result.setMissingDistSourceRelease(
- checkRepos( configLine.getDist(), configLine,
latestVersion ) );
+ checkRepos( DIST_AREA + configLine.getDirectory(),
configLine, latestVersion ) );
result.setOlderSourceRelease(
- checkOldinRepos( configLine.getDist(), configLine,
latestVersion ) );
+ checkOldinRepos( DIST_AREA + configLine.getDirectory(),
configLine, latestVersion ) );
}
catch ( IOException ex )
{
Copied:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.txt
(from r1500397,
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.csv)
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.txt?p2=maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.txt&p1=maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.csv&r1=1500397&r2=1500442&rev=1500442&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.csv
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.txt
Sun Jul 7 14:39:42 2013
@@ -1,99 +1,101 @@
-## line format: type;groupId;artifactId;dist directory
-## KEYS nothing
-## ant-tasks nothing
-## binaries nothing
-## doxia
-MVA;org.apache.maven.doxia;doxia;http://www.apache.org/dist/maven/doxia/
-MVA;org.apache.maven.doxia;doxia-sitetools;http://www.apache.org/dist/maven/doxia/
-## enforcer
-MVA;org.apache.maven.enforcer;enforcer;http://www.apache.org/dist/maven/enforcer/
-## indexer
-MVA;org.apache.maven.indexer;maven-indexer;http://www.apache.org/dist/maven/indexer/
-## maven-1 nothing
-## maven-2 nothing
-## maven-3 nothing
-## plugin-testing
-MVA;org.apache.maven.plugin-testing;maven-plugin-testing;http://www.apache.org/dist/maven/plugin-testing/
-## plugin-tools
-MVA;org.apache.maven.plugin-tools;maven-plugin-tools;http://www.apache.org/dist/maven/plugin-tools/
-## plugins
-MVA;org.apache.maven.plugins;maven-acr-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-ant-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-antrun-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-assembly-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-changelog-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-changes-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-checkstyle-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-clean-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-compiler-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-dependency-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-deploy-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-doap-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-docck-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-ear-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-eclipse-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-ejb-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-gpg-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-help-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-idea-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-install-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-invoker-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-jar-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-jarsigner-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-javadoc-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-linkcheck-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-one-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-patch-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-pdf-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-plugins;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-pmd-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-project-info-reports-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-rar-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-reactor-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-remote-resources-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-repository-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-resources-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-scm-publish-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-shade-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-site-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-source-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-stage-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-toolchains-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-verifier-plugin;http://www.apache.org/dist/maven/plugins/
-MVA;org.apache.maven.plugins;maven-war-plugin;http://www.apache.org/dist/maven/plugins/
-## release
-MVA;org.apache.maven.release;maven-release;http://www.apache.org/dist/maven/release/;2.4.1
-## reporting
-MVA;org.apache.maven.reporting;maven-reporting-api;http://www.apache.org/dist/maven/reporting/
-MVA;org.apache.maven.reporting;maven-reporting-exec;http://www.apache.org/dist/maven/reporting/
-MVA;org.apache.maven.reporting;maven-reporting-impl;http://www.apache.org/dist/maven/reporting/
-## scm
-MVA;org.apache.maven.scm;maven-scm;http://www.apache.org/dist/maven/scm/
-## shared
-MVA;org.apache.maven.shared;maven-artifact-resolver;http://www.apache.org/dist/maven/shared/
-MVA;org.apache.maven.shared;maven-common-artifact-filters;http://www.apache.org/dist/maven/shared/
-MVA;org.apache.maven.shared;maven-dependency-analyzer;http://www.apache.org/dist/maven/shared/
-MVA;org.apache.maven.shared;maven-dependency-tree;http://www.apache.org/dist/maven/shared/
-MVA;org.apache.maven.shared;maven-doxia-tools;http://www.apache.org/dist/maven/shared/
-MVA;org.apache.maven.shared;maven-filtering;http://www.apache.org/dist/maven/shared/
-MVA;org.apache.maven.shared;maven-invoker;http://www.apache.org/dist/maven/shared/
-MVA;org.apache.maven.shared;maven-jarsigner;http://www.apache.org/dist/maven/shared/
-MVA;org.apache.maven.shared;maven-runtime;http://www.apache.org/dist/maven/shared/
-MVA;org.apache.maven.shared;maven-script-interpreter;http://www.apache.org/dist/maven/shared/
-MVA;org.apache.maven.shared;maven-shared-components;http://www.apache.org/dist/maven/shared/
-MVA;org.apache.maven.shared;maven-shared-incremental;http://www.apache.org/dist/maven/shared/
-MVA;org.apache.maven.shared;maven-shared-jar;http://www.apache.org/dist/maven/shared/
-MVA;org.apache.maven.shared;maven-shared-resources;http://www.apache.org/dist/maven/shared/
-MVA;org.apache.maven.shared;maven-shared-utils;http://www.apache.org/dist/maven/shared/
-MVA;org.apache.maven.shared;maven-verifier;http://www.apache.org/dist/maven/shared/
-## skins
-MVA;org.apache.maven.skins;maven-application-skin;http://www.apache.org/dist/maven/skins/
-MVA;org.apache.maven.skins;maven-classic-skin;http://www.apache.org/dist/maven/skins/
-MVA;org.apache.maven.skins;maven-default-skin;http://www.apache.org/dist/maven/skins/
-MVA;org.apache.maven.skins;maven-fluido-skin;http://www.apache.org/dist/maven/skins/
-MVA;org.apache.maven.skins;maven-skins;http://www.apache.org/dist/maven/skins/
-MVA;org.apache.maven.skins;maven-stylus-skin;http://www.apache.org/dist/maven/skins/
-## surefire
-MVA;org.apache.maven.surefire;surefire;http://www.apache.org/dist/maven/surefire/
-## wagon
-MVA;org.apache.maven.wagon;wagon;http://www.apache.org/dist/maven/wagon/
+## line format:
+## directory groupId
+## artifactId [forced version]
+ant-tasks org.apache.maven
+ maven-ant-tasks
+## binaries
+doxia org.apache.maven.doxia
+ doxia
+ doxia-sitetools
+enforcer org.apache.maven.enforcer
+ enforcer
+indexer org.apache.maven.indexer
+ maven-indexer
+## maven-1
+## maven-2
+## maven-3
+plugin-testing org.apache.maven.plugin-testing
+ maven-plugin-testing
+plugin-tools org.apache.maven.plugin-tools
+ maven-plugin-tools
+plugins org.apache.maven.plugins
+ maven-acr-plugin
+ maven-ant-plugin
+ maven-antrun-plugin
+ maven-assembly-plugin
+ maven-changelog-plugin
+ maven-changes-plugin
+ maven-checkstyle-plugin
+ maven-clean-plugin
+ maven-compiler-plugin
+ maven-dependency-plugin
+ maven-deploy-plugin
+ maven-doap-plugin
+ maven-docck-plugin
+ maven-ear-plugin
+ maven-eclipse-plugin
+ maven-ejb-plugin
+ maven-gpg-plugin
+ maven-help-plugin
+ maven-idea-plugin
+ maven-install-plugin
+ maven-invoker-plugin
+ maven-jar-plugin
+ maven-jarsigner-plugin
+ maven-javadoc-plugin
+ maven-linkcheck-plugin
+ maven-one-plugin
+ maven-patch-plugin
+ maven-pdf-plugin
+ maven-plugins
+ maven-pmd-plugin
+ maven-project-info-reports-plugin
+ maven-rar-plugin
+ maven-reactor-plugin
+ maven-remote-resources-plugin
+ maven-repository-plugin
+ maven-resources-plugin
+ maven-scm-publish-plugin
+ maven-shade-plugin
+ maven-site-plugin
+ maven-source-plugin
+ maven-stage-plugin
+ maven-toolchains-plugin
+ maven-verifier-plugin
+ maven-war-plugin
+release org.apache.maven.release
+ maven-release 2.4.1
+reporting org.apache.maven.reporting
+ maven-reporting-api
+ maven-reporting-exec
+ maven-reporting-impl
+scm org.apache.maven.scm
+ maven-scm
+shared org.apache.maven.shared
+ maven-artifact-resolver
+ maven-common-artifact-filters
+ maven-dependency-analyzer
+ maven-dependency-tree
+ maven-doxia-tools
+ maven-filtering
+ maven-invoker
+ maven-jarsigner
+ maven-runtime
+ maven-script-interpreter
+ maven-shared-components
+ maven-shared-incremental
+ maven-shared-jar
+ maven-shared-resources
+ maven-shared-utils
+ maven-verifier
+skins org.apache.maven.skins
+ maven-application-skin
+ maven-classic-skin
+ maven-default-skin
+ maven-fluido-skin
+ maven-skins
+ maven-stylus-skin
+surefire org.apache.maven.surefire
+ surefire
+wagon org.apache.maven.wagon
+ wagon
