Author: skygo
Date: Tue Jul 16 23:33:57 2013
New Revision: 1503945
URL: http://svn.apache.org/r1503945
Log:
add pom items (hardcoded not nice)
add skins
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/DistCheckAggregatorsSiteMojo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.txt
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=1503945&r1=1503944&r2=1503945&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 Jul 16 23:33:57 2013
@@ -185,17 +185,23 @@ public abstract class AbstractDistCheckM
else
{
// 3 space
- if ( line.startsWith( " " ) && useDetailed() )
+ if ( line.startsWith( " " ) )
{
ConfigurationLineInfo aLine = new ConfigurationLineInfo(
currentGroup, line.trim().split( " " ) );
-
- checkArtifact( aLine, getVersion( aLine ) );
+ if ( useDetailed() )
+ {
+ checkArtifact( aLine, getVersion( aLine ) );
+ }
}
- else
+ else if ( line.startsWith( " " ) )
{
ConfigurationLineInfo aLine = new ConfigurationLineInfo(
currentGroup, line.trim().split( " " ) );
checkArtifact( aLine, getVersion( aLine ) );
+ }
+ else
+ {
+ getLog().warn( "No good Condition WIP" );
}
}
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckAggregatorsSiteMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckAggregatorsSiteMojo.java?rev=1503945&r1=1503944&r2=1503945&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckAggregatorsSiteMojo.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckAggregatorsSiteMojo.java
Tue Jul 16 23:33:57 2013
@@ -56,6 +56,7 @@ public class DistCheckAggregatorsSiteMoj
static
{
Map<String, Object[]> aMap = new HashMap<>();
+ // url title version date
aMap.put( "A1", new Object[]
{
"http://maven.apache.org/plugins/";, "Plugins", 2, 3
@@ -64,6 +65,14 @@ public class DistCheckAggregatorsSiteMoj
{
"http://maven.apache.org/shared/";, "Shared", 1, 2
} );
+ aMap.put( "A3", new Object[]
+ {
+ "http://maven.apache.org/skins/";, "Skins", 1, null
+ } );
+ aMap.put( "A4", new Object[]
+ {
+ "http://maven.apache.org/pom/";, "Poms", 1, 2
+ } );
HARDCODEDAGGREGATEREF = Collections.unmodifiableMap( aMap );
}
/**
@@ -127,7 +136,7 @@ public class DistCheckAggregatorsSiteMoj
private final Map<String, List<DistCheckAggregatorSite>> results = new
HashMap<>();
- private void reportLine( Sink sink, DistCheckAggregatorSite csr )
+ private void reportLine( Sink sink, DistCheckAggregatorSite csr , boolean
displayDate )
{
ConfigurationLineInfo cli = csr.getConfigurationLine();
@@ -153,18 +162,21 @@ public class DistCheckAggregatorsSiteMoj
sink.tableCell_();
// DATE column
- sink.tableCell();
- sink.rawText( csr.getConfigurationLine().getReleaseFromMetadata() );
- if ( csr.getConfigurationLine().getReleaseFromMetadata().equals(
csr.dateAggr ) )
+ if ( displayDate )
{
- iconSuccess( sink );
- }
- else
- {
- iconError( sink );
- sink.rawText( csr.dateAggr );
+ sink.tableCell();
+ sink.rawText( csr.getConfigurationLine().getReleaseFromMetadata()
);
+ if ( csr.getConfigurationLine().getReleaseFromMetadata().equals(
csr.dateAggr ) )
+ {
+ iconSuccess( sink );
+ }
+ else
+ {
+ iconError( sink );
+ sink.rawText( csr.dateAggr );
+ }
+ sink.tableCell_();
}
- sink.tableCell_();
// central column
sink.tableRow_();
@@ -227,16 +239,20 @@ public class DistCheckAggregatorsSiteMoj
sink.tableHeaderCell();
sink.rawText( "LATEST" );
sink.tableHeaderCell_();
- sink.tableHeaderCell();
- sink.rawText( "DATE" );
- sink.tableHeaderCell_();
+ boolean displayDate = HARDCODEDAGGREGATEREF.get( key )[3] != null;
+ if ( displayDate )
+ {
+ sink.tableHeaderCell();
+ sink.rawText( "DATE" );
+ sink.tableHeaderCell_();
+ }
sink.tableHeaderCell();
sink.rawText( "VERSION" );
sink.tableHeaderCell_();
sink.tableRow_();
for ( DistCheckAggregatorSite csr : results.get( key ) )
{
- reportLine( sink, csr );
+ reportLine( sink, csr, displayDate );
}
sink.table_();
}
@@ -257,10 +273,27 @@ public class DistCheckAggregatorsSiteMoj
{
// skins do not have release date
String art = e.attr( "href" );
- if ( art.contains( cli.getArtifactId() ) )
+ String id = cli.getArtifactId();
+ // UGLY
+ if ( cli.getArtifactId().equals( "maven-parent" ) )
+ {
+ id = "maven/";
+ }
+ if ( cli.getArtifactId().equals( "maven-skins" ) )
+ {
+ id = "skins/";
+ }
+ if ( cli.getArtifactId().equals( "apache" ) )
+ {
+ id = "asf/";
+ }
+ if ( art.contains( id ) )
{
r.setAggregatedVersion( e.parent().parent().child( (
Integer ) inf[2] ).ownText() );
- r.setAggregatedDate( e.parent().parent().child( ( Integer
) inf[3] ).ownText() );
+ if ( inf[3] != null )
+ {
+ r.setAggregatedDate( e.parent().parent().child( (
Integer ) inf[3] ).ownText() );
+ }
}
}
}
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.txt
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.txt?rev=1503945&r1=1503944&r2=1503945&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.txt
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.txt
Tue Jul 16 23:33:57 2013
@@ -1,7 +1,13 @@
## line format:
## directory groupId [src+bin]
-## artifactId [forced version]
-##
+## artifactId [forced version] An
+## artifactId [forced version] An
+## n : 1 plugins
+## n : 2 shared
+## n : 3 skins
+## n : 4 poms
+#### A1 site2X
+#### A4 ASF (skin and parent find pattern hardcoded)
ant-tasks org.apache.maven src+bin
maven-ant-tasks
archetype org.apache.maven.archetype
@@ -27,6 +33,10 @@ maven-2 org.apache.maven src+bin
maven-3 org.apache.maven src+bin
apache-maven 3.0.5
apache-maven
+notvalid org.apache.maven
+ maven-parent A4
+notvalid org.apache
+ apache A4
jxr org.apache.maven.jxr
jxr
plugin-testing org.apache.maven.plugin-testing
@@ -62,7 +72,7 @@ plugins org.apache.maven.plugins
maven-one-plugin A1
maven-patch-plugin A1
maven-pdf-plugin A1
- maven-plugins
+ maven-plugins A4
maven-pmd-plugin A1
maven-project-info-reports-plugin A1
maven-rar-plugin A1
@@ -87,7 +97,6 @@ plugins org.apache.maven.plugins
maven-surefire-plugin A1
maven-surefire-report-plugin A1
maven-plugin-plugin A1
-#### A1 site2X
release org.apache.maven.release
maven-release 2.4.1
reporting org.apache.maven.reporting
@@ -95,7 +104,7 @@ reporting org.apache.maven.reporting
maven-reporting-exec A2
maven-reporting-impl A2
resources org.apache.apache.resources
- apache-resource-bundles
+ apache-resource-bundles A4
apache-source-release-assembly-descriptor
scm org.apache.maven.scm
maven-scm
@@ -113,7 +122,7 @@ shared org.apache.maven.shared
maven-repository-builder A2
maven-runtime A2
maven-script-interpreter A2
- maven-shared-components
+ maven-shared-components A4
maven-shared-incremental A2
maven-shared-jar A2
maven-shared-resources A2
@@ -122,12 +131,12 @@ shared org.apache.maven.shared
shared org.apache.maven
maven-archiver A2
skins org.apache.maven.skins
- maven-application-skin
- maven-classic-skin
- maven-default-skin
- maven-fluido-skin
- maven-skins
- maven-stylus-skin
+ maven-application-skin A3
+ maven-classic-skin A3
+ maven-default-skin A3
+ maven-fluido-skin A3
+ maven-skins A4
+ maven-stylus-skin A3
surefire org.apache.maven.surefire
surefire
wagon org.apache.maven.wagon
