You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/09/21 10:40:52 UTC
svn commit: r290654 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/lifecycle/
maven-core/src/main/java/org/apache/maven/plugin/version/
maven-core/src/main/resources/META-INF/plexus/ maven-model/
Author: brett
Date: Wed Sep 21 01:40:42 2005
New Revision: 290654
URL: http://svn.apache.org/viewcvs?rev=290654&view=rev
Log:
PR: MNG-902
add default reports
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-model/maven.mdo
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=290654&r1=290653&r2=290654&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Wed Sep 21 01:40:42 2005
@@ -91,6 +91,8 @@
private ArtifactHandlerManager artifactHandlerManager;
+ private List defaultReports;
+
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
@@ -515,6 +517,53 @@
{
getLogger().error(
"DEPRECATED: Plugin contains a <reports/> section: this is IGNORED - please use <reporting/> instead." );
+ }
+
+ if ( project.getReporting() == null || !project.getReporting().isExcludeDefaults() )
+ {
+ if ( reportPlugins == null )
+ {
+ reportPlugins = new ArrayList();
+ }
+ else
+ {
+ reportPlugins = new ArrayList( reportPlugins );
+ }
+
+ for ( Iterator i = defaultReports.iterator(); i.hasNext(); )
+ {
+ String report = (String) i.next();
+
+ StringTokenizer tok = new StringTokenizer( report, ":" );
+ if ( tok.countTokens() != 2 )
+ {
+ getLogger().warn( "Invalid default report ignored: '" + report + "' (must be groupId:artifactId)" );
+ }
+ else
+ {
+ String groupId = tok.nextToken();
+ String artifactId = tok.nextToken();
+
+ boolean found = false;
+ for ( Iterator j = reportPlugins.iterator(); j.hasNext() && !found; )
+ {
+ ReportPlugin reportPlugin = (ReportPlugin) j.next();
+ if ( reportPlugin.getGroupId().equals( groupId ) &&
+ reportPlugin.getArtifactId().equals( artifactId ) )
+ {
+ found = true;
+ }
+ }
+
+ if ( !found )
+ {
+ ReportPlugin reportPlugin = new ReportPlugin();
+ reportPlugin.setGroupId( groupId );
+ reportPlugin.setArtifactId( artifactId );
+ reportPlugins.add( reportPlugin );
+ }
+ }
+ }
}
List reports = new ArrayList();
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java?rev=290654&r1=290653&r2=290654&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java Wed Sep 21 01:40:42 2005
@@ -493,29 +493,31 @@
if ( resolveAsReportPlugin )
{
- for ( Iterator it = project.getReportPlugins().iterator(); it.hasNext(); )
+ if ( project.getReportPlugins() != null )
{
- ReportPlugin plugin = (ReportPlugin) it.next();
-
- if ( groupId.equals( plugin.getGroupId() ) && artifactId.equals( plugin.getArtifactId() ) )
+ for ( Iterator it = project.getReportPlugins().iterator(); it.hasNext() && version == null; )
{
- version = plugin.getVersion();
+ ReportPlugin plugin = (ReportPlugin) it.next();
- break;
+ if ( groupId.equals( plugin.getGroupId() ) && artifactId.equals( plugin.getArtifactId() ) )
+ {
+ version = plugin.getVersion();
+ }
}
}
}
else
{
- for ( Iterator it = project.getBuildPlugins().iterator(); it.hasNext(); )
+ if ( project.getBuildPlugins() != null )
{
- Plugin plugin = (Plugin) it.next();
-
- if ( groupId.equals( plugin.getGroupId() ) && artifactId.equals( plugin.getArtifactId() ) )
+ for ( Iterator it = project.getBuildPlugins().iterator(); it.hasNext() && version == null; )
{
- version = plugin.getVersion();
+ Plugin plugin = (Plugin) it.next();
- break;
+ if ( groupId.equals( plugin.getGroupId() ) && artifactId.equals( plugin.getArtifactId() ) )
+ {
+ version = plugin.getVersion();
+ }
}
}
}
Modified: maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=290654&r1=290653&r2=290654&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml Wed Sep 21 01:40:42 2005
@@ -168,6 +168,20 @@
<phase implementation="java.lang.String">deploy</phase>
</phases>
<!-- END SNIPPET: lifecycle -->
+ <!-- START SNIPPET: default-reports -->
+ <defaultReports>
+ <report implementation="java.lang.String">org.apache.maven.plugins:maven-project-info-reports-plugin</report>
+ <report implementation="java.lang.String">org.apache.maven.plugins:maven-checkstyle-plugin</report>
+ <report implementation="java.lang.String">org.apache.maven.plugins:maven-javadoc-plugin</report>
+ <!-- TODO: currently in mojo - should they be defaults any more?
+ <report implementation="java.lang.String">org.apache.maven.plugins:maven-changelog-plugin</report>
+ <report implementation="java.lang.String">org.apache.maven.plugins:maven-surefire-report-plugin</report>
+ <report implementation="java.lang.String">org.apache.maven.plugins:maven-jdepend-plugin</report>
+ <report implementation="java.lang.String">org.apache.maven.plugins:maven-jxr-plugin</report>
+ <report implementation="java.lang.String">org.apache.maven.plugins:maven-taglist-plugin</report>
+ -->
+ </defaultReports>
+ <!-- END SNIPPET: default-reports -->
<!-- START SNIPPET: default-lifecycle -->
<!-- NOT USED, ACCORDING TO CODE.
<defaultPhases>
Modified: maven/components/trunk/maven-model/maven.mdo
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-model/maven.mdo?rev=290654&r1=290653&r2=290654&view=diff
==============================================================================
--- maven/components/trunk/maven-model/maven.mdo (original)
+++ maven/components/trunk/maven-model/maven.mdo Wed Sep 21 01:40:42 2005
@@ -1298,7 +1298,8 @@
<field>
<name>systemPath</name>
<version>4.0.0</version>
- <description>FOR SYSTEM SCOPE ONLY. This specifies the path on the filesystem for this dependency.</description>
+ <description>FOR SYSTEM SCOPE ONLY. This specifies the path on the filesystem for this
+ dependency.</description>
<type>String</type>
</field>
<field>
@@ -2545,6 +2546,13 @@
<description>Section for management of reports and configuration</description>
<fields>
<field>
+ <name>excludeDefaults</name>
+ <version>4.0.0</version>
+ <type>boolean</type>
+ <description>If true, then the default reports are not included in the site generation</description>
+ <defaultValue>false</defaultValue>
+ </field>
+ <field>
<name>outputDirectory</name>
<version>4.0.0</version>
<type>String</type>
@@ -2654,7 +2662,7 @@
</codeSegment>
</codeSegments>
</class>
- <class>
+ <class>
<name>Activation</name>
<version>4.0.0</version>
<description><![CDATA[
@@ -2693,7 +2701,7 @@
Specifies that this profile will be activated based on existence of a file.
]]></description>
<association>
- <type>ActivationFile</type>
+ <type>ActivationFile</type>
</association>
</field>
</fields>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org