You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jd...@apache.org on 2005/06/18 06:23:23 UTC
svn commit: r191266 -
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version
/maven/components/trunk/maven-model
/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance
Author: jdcasey
Date: Fri Jun 17 21:23:20 2005
New Revision: 191266
URL: http://svn.apache.org/viewcvs?rev=191266&view=rev
Log:
Changing <reporter/> to <plugin/> in the reporting section.
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
maven/components/trunk/maven-model/maven.mdo
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
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=191266&r1=191265&r2=191266&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 Fri Jun 17 21:23:20 2005
@@ -6,7 +6,7 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.model.Plugin;
-import org.apache.maven.model.Reporter;
+import org.apache.maven.model.ReportPlugin;
import org.apache.maven.plugin.registry.MavenPluginRegistryBuilder;
import org.apache.maven.plugin.registry.PluginRegistry;
import org.apache.maven.plugin.registry.PluginRegistryUtils;
@@ -398,15 +398,15 @@
// won't this overwrite the above loop if it exists in both places (unlikely, I know)??
// maybe that's the idea...?
- if ( project.getReporters() != null )
+ if ( project.getReportPlugins() != null )
{
- for ( Iterator it = project.getReporters().iterator(); it.hasNext(); )
+ for ( Iterator it = project.getReportPlugins().iterator(); it.hasNext(); )
{
- Reporter reporter = (Reporter) it.next();
+ ReportPlugin reportPlugin = (ReportPlugin) it.next();
- if ( groupId.equals( reporter.getGroupId() ) && artifactId.equals( reporter.getArtifactId() ) )
+ if ( groupId.equals( reportPlugin.getGroupId() ) && artifactId.equals( reportPlugin.getArtifactId() ) )
{
- version = reporter.getVersion();
+ version = reportPlugin.getVersion();
break;
}
Modified: maven/components/trunk/maven-model/maven.mdo
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-model/maven.mdo?rev=191266&r1=191265&r2=191266&view=diff
==============================================================================
--- maven/components/trunk/maven-model/maven.mdo (original)
+++ maven/components/trunk/maven-model/maven.mdo Fri Jun 17 21:23:20 2005
@@ -2316,12 +2316,11 @@
<description>Where to store all of the generated reports</description>
</field>
<field>
- <name>reporters</name>
+ <name>plugins</name>
<version>4.0.0</version>
- <description>The reporters (specialized plugins) to use and their configuration</description>
+ <description>The report plugins) to use and their configuration</description>
<association>
- <!-- TODO: goal stuff relevant or not? -->
- <type>Reporter</type>
+ <type>ReportPlugin</type>
<multiplicity>*</multiplicity>
</association>
</field>
@@ -2330,28 +2329,28 @@
<codeSegment>
<version>4.0.0</version>
<code><![CDATA[
- Map reporterMap;
+ Map reportPluginMap;
- public void flushReporterMap()
+ public void flushReportPluginMap()
{
- this.reporterMap = null;
+ this.reportPluginMap = null;
}
- public Map getReportersAsMap()
+ public Map getReportPluginsAsMap()
{
- if ( reporterMap == null )
+ if ( reportPluginMap == null )
{
- reporterMap = new HashMap();
- if ( getReporters() != null )
+ reportPluginMap = new HashMap();
+ if ( getPlugins() != null )
{
- for ( Iterator it = getReporters().iterator(); it.hasNext(); )
+ for ( Iterator it = getPlugins().iterator(); it.hasNext(); )
{
- Reporter reporter = (Reporter) it.next();
- reporterMap.put( reporter.getKey(), reporter );
+ ReportPlugin reportPlugin = (ReportPlugin) it.next();
+ reportPluginMap.put( reportPlugin.getKey(), reportPlugin );
}
}
}
- return reporterMap;
+ return reportPluginMap;
}
]]></code>
</codeSegment>
@@ -2485,8 +2484,8 @@
</fields>
</class>
<!-- /BuildProfile support -->
- <class>
- <name>Reporter</name>
+ <class xml.tagName="plugin">
+ <name>ReportPlugin</name>
<version>4.0.0</version>
<fields>
<field>
Modified: maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java?rev=191266&r1=191265&r2=191266&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java Fri Jun 17 21:23:20 2005
@@ -717,15 +717,16 @@
{
// TODO: not the best solution. Perhaps a mojo tag that causes the plugin manager to populate project reports instead?
- List reportPlugins = project.getReporters();
+ List reportPlugins = project.getReportPlugins();
+
if ( reportPlugins != null )
{
for ( Iterator it = reportPlugins.iterator(); it.hasNext(); )
{
- org.apache.maven.model.Reporter reporter = (org.apache.maven.model.Reporter) it.next();
+ org.apache.maven.model.ReportPlugin reportPlugin = (org.apache.maven.model.ReportPlugin) it.next();
try
{
- pluginManager.verifyPlugin( reporter.getGroupId(), reporter.getArtifactId(), reporter.getVersion(),
+ pluginManager.verifyPlugin( reportPlugin.getGroupId(), reportPlugin.getArtifactId(), reportPlugin.getVersion(),
project, settings, localRepository );
}
catch ( ArtifactResolutionException e )
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=191266&r1=191265&r2=191266&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java Fri Jun 17 21:23:20 2005
@@ -706,13 +706,13 @@
// Plugins
// ----------------------------------------------------------------------
- public List getReporters()
+ public List getReportPlugins()
{
if ( model.getReporting() == null )
{
return null;
}
- return model.getReporting().getReporters();
+ return model.getReporting().getPlugins();
}
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=191266&r1=191265&r2=191266&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java Fri Jun 17 21:23:20 2005
@@ -24,8 +24,8 @@
import org.apache.maven.model.Model;
import org.apache.maven.model.ModelBase;
import org.apache.maven.model.Profile;
+import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.ReportSet;
-import org.apache.maven.model.Reporter;
import org.apache.maven.model.Reporting;
import org.apache.maven.model.Repository;
import org.apache.maven.model.Scm;
@@ -213,38 +213,38 @@
childReporting.setOutputDirectory( parentReporting.getOutputDirectory() );
}
- Map mergedReporters = new HashMap();
+ Map mergedReportPlugins = new HashMap();
- Map childReportersByKey = childReporting.getReportersAsMap();
+ Map childReportersByKey = childReporting.getReportPluginsAsMap();
- List parentReporters = parentReporting.getReporters();
+ List parentReportPlugins = parentReporting.getPlugins();
- if ( parentReporters != null )
+ if ( parentReportPlugins != null )
{
- for ( Iterator it = parentReporters.iterator(); it.hasNext(); )
+ for ( Iterator it = parentReportPlugins.iterator(); it.hasNext(); )
{
- Reporter parentReporter = (Reporter) it.next();
+ ReportPlugin parentReportPlugin = (ReportPlugin) it.next();
- String inherited = parentReporter.getInherited();
+ String inherited = parentReportPlugin.getInherited();
if ( StringUtils.isEmpty( inherited ) || Boolean.valueOf( inherited ).booleanValue() )
{
- Reporter childReporter = (Reporter) childReportersByKey.get( parentReporter.getKey() );
+ ReportPlugin childReportPlugin = (ReportPlugin) childReportersByKey.get( parentReportPlugin.getKey() );
- Reporter mergedReporter = parentReporter;
+ ReportPlugin mergedReportPlugin = parentReportPlugin;
- if ( childReporter != null )
+ if ( childReportPlugin != null )
{
- mergedReporter = childReporter;
+ mergedReportPlugin = childReportPlugin;
- mergeReporters( childReporter, parentReporter );
+ mergeReportPlugins( childReportPlugin, parentReportPlugin );
}
else if ( StringUtils.isEmpty( inherited ) )
{
- mergedReporter.unsetInheritanceApplied();
+ mergedReportPlugin.unsetInheritanceApplied();
}
- mergedReporters.put( mergedReporter.getKey(), mergedReporter );
+ mergedReportPlugins.put( mergedReportPlugin.getKey(), mergedReportPlugin );
}
}
}
@@ -255,19 +255,21 @@
String key = (String) entry.getKey();
- if ( !mergedReporters.containsKey( key ) )
+ if ( !mergedReportPlugins.containsKey( key ) )
{
- mergedReporters.put( key, entry.getValue() );
+ mergedReportPlugins.put( key, entry.getValue() );
}
}
- childReporting.setReporters( new ArrayList( mergedReporters.values() ) );
+ childReporting.setPlugins( new ArrayList( mergedReportPlugins.values() ) );
+
+ childReporting.flushReportPluginMap();
}
assembleDependencyManagementInheritance( child, parent );
}
- private void mergeReporters( Reporter dominant, Reporter recessive )
+ private void mergeReportPlugins( ReportPlugin dominant, ReportPlugin recessive )
{
if ( StringUtils.isEmpty( dominant.getVersion() ) )
{
@@ -350,6 +352,8 @@
}
dominant.setReportSets( new ArrayList( mergedReportSets.values() ) );
+
+ dominant.flushReportSetMap();
}
private void assembleDependencyManagementInheritance( ModelBase child, ModelBase parent )
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org