You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ev...@apache.org on 2005/05/04 02:47:02 UTC
svn commit: r168031 - in /maven/components/trunk: maven-core/
maven-core/src/main/java/org/apache/maven/execution/
maven-core/src/main/java/org/apache/maven/plugin/
maven-plugins/maven-site-plugin/
maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/
sandbox/maven-reports/maven-project-info-reports-plugin/
sandbox/maven-reports/maven-project-info-reports-plugin/src/main/resources/META-INF/plexus/
Author: evenisse
Date: Tue May 3 17:47:01 2005
New Revision: 168031
URL: http://svn.apache.org/viewcvs?rev=168031&view=rev
Log:
Initial version of site generation with repots.
Modified:
maven/components/trunk/maven-core/pom.xml
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
maven/components/trunk/sandbox/maven-reports/maven-project-info-reports-plugin/pom.xml
maven/components/trunk/sandbox/maven-reports/maven-project-info-reports-plugin/src/main/resources/META-INF/plexus/components.xml
Modified: maven/components/trunk/maven-core/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/pom.xml?rev=168031&r1=168030&r2=168031&view=diff
==============================================================================
--- maven/components/trunk/maven-core/pom.xml (original)
+++ maven/components/trunk/maven-core/pom.xml Tue May 3 17:47:01 2005
@@ -50,6 +50,11 @@
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.0-beta-2</version>
@@ -79,13 +84,14 @@
</dependencies>
<reports>
<plugins>
- <plugin>
+ <!-- plugin>
<groupId>org.apache.maven.reports</groupId>
<artifactId>mail-lists</artifactId>
- </plugin>
+ </plugin -->
<plugin>
- <groupId>org.apache.maven.reports</groupId>
- <artifactId>dependencies</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
</plugin>
</plugins>
</reports>
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java?rev=168031&r1=168030&r2=168031&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java Tue May 3 17:47:01 2005
@@ -27,6 +27,7 @@
import org.codehaus.plexus.context.Context;
import java.util.List;
+import java.util.Map;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl </a>
@@ -124,6 +125,18 @@
throws ComponentLookupException
{
return container.lookup( role, roleHint );
+ }
+
+ public List lookupList( String role )
+ throws ComponentLookupException
+ {
+ return container.lookupList( role );
+ }
+
+ public Map lookupMap( String role )
+ throws ComponentLookupException
+ {
+ return container.lookupMap( role );
}
public EventDispatcher getEventDispatcher()
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=168031&r1=168030&r2=168031&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Tue May 3 17:47:01 2005
@@ -216,6 +216,21 @@
}
}
+ if ( project.getReports() != null )
+ {
+ for ( Iterator it = project.getReports().getPlugins().iterator(); it.hasNext(); )
+ {
+ org.apache.maven.model.Plugin plugin = (org.apache.maven.model.Plugin) it.next();
+
+ if ( groupId.equals( plugin.getGroupId() ) && artifactId.equals( plugin.getArtifactId() ) )
+ {
+ pluginConfig = plugin;
+
+ break;
+ }
+ }
+ }
+
String version = null;
if ( pluginConfig != null )
@@ -791,7 +806,7 @@
artifactFilter = new ExclusionSetFilter( new String[]{"maven-core", "maven-artifact", "maven-model",
"maven-settings", "maven-monitor", "maven-plugin-api",
"maven-plugin-descriptor", "plexus-container-default",
- "maven-project", "plexus-container-artifact",
+ "maven-project", "plexus-container-artifact", "maven-reporting-api", "doxia-core",
"wagon-provider-api", "classworlds", "maven-plugin"} );
}
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java?rev=168031&r1=168030&r2=168031&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java Tue May 3 17:47:01 2005
@@ -16,14 +16,17 @@
* limitations under the License.
*/
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.path.PathTranslator;
+import org.apache.maven.reporting.MavenReport;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.util.introspection.ReflectionValueExtractor;
import java.io.File;
+import java.util.Iterator;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
@@ -88,6 +91,41 @@
catch ( ComponentLookupException e )
{
throw new ExpressionEvaluationException( "Cannot lookup component: " + role + ".", e );
+ }
+ }
+ else if (expression.equals( "reports" ) )
+ {
+ String role = PluginManager.ROLE;
+ try
+ {
+ PluginManager pluginManager = (PluginManager) context.lookup( role );
+ for ( Iterator it = context.getProject().getReports().getPlugins().iterator(); it.hasNext(); )
+ {
+ org.apache.maven.model.Plugin plugin = (org.apache.maven.model.Plugin) it.next();
+ pluginManager.verifyPlugin( plugin.getGroupId(), plugin.getArtifactId(), context );
+ }
+ }
+ catch ( ComponentLookupException cle )
+ {
+ throw new ExpressionEvaluationException( "Cannot lookup component: " + role + ".", cle );
+ }
+ catch ( ArtifactResolutionException are )
+ {
+ throw new ExpressionEvaluationException( "Cannot resolve component: " + role + ".", are );
+ }
+ catch ( PluginManagerException pme )
+ {
+ throw new ExpressionEvaluationException( "Cannot verify component: " + role + ".", pme );
+ }
+
+ role = MavenReport.ROLE;
+ try
+ {
+ value = context.lookupMap( role );
+ }
+ catch ( ComponentLookupException cle )
+ {
+ throw new ExpressionEvaluationException( "Cannot lookup component: " + role + ".", cle );
}
}
else if ( expression.equals( "localRepository" ) )
Modified: maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml?rev=168031&r1=168030&r2=168031&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-site-plugin/pom.xml Tue May 3 17:47:01 2005
@@ -16,6 +16,11 @@
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>doxia</groupId>
<artifactId>doxia-core</artifactId>
<version>1.0-alpha-2-SNAPSHOT</version>
@@ -29,11 +34,6 @@
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>1.0-alpha-3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-manager</artifactId>
- <version>2.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
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=168031&r1=168030&r2=168031&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 Tue May 3 17:47:01 2005
@@ -4,17 +4,21 @@
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.reporting.MavenReport;
import org.apache.maven.reporting.MavenReportConfiguration;
-import org.apache.maven.reporting.manager.MavenReportManager;
import org.codehaus.doxia.site.renderer.SiteRenderer;
import java.io.File;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
/**
* @goal site
* @description Doxia plugin
+ *
+ * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @version $Id$
*/
public class DoxiaMojo
extends AbstractMojo
@@ -32,7 +36,7 @@
private String generatedSiteDirectory;
/**
- * @parameter expressoin="${project.build.directory}/site"
+ * @parameter expression="${project.build.directory}/site"
* @required
*/
private String outputDirectory;
@@ -57,11 +61,11 @@
private MavenProject project;
/**
- * @parameter expression="${component.org.apache.maven.reporting.manager.MavenReportManager}"
+ * @parameter expression="${reports}"
* @required
* @readonly
*/
- private MavenReportManager reportManager;
+ private Map reports;
/**
* @parameter expression="${localRepository}"
@@ -87,16 +91,16 @@
config.setModel( project.getModel() );
config.setOutputDirectory( new File( generatedSiteDirectory ) );
-
- if ( project.getReports() != null )
+ if ( reports != null )
{
- reportManager.addReports( project.getReports(), localRepository, remoteRepositories );
-
- for ( Iterator i = reportManager.getReports().keySet().iterator(); i.hasNext(); )
+System.out.println(reports.size());
+ for ( Iterator i = reports.values().iterator(); i.hasNext(); )
{
- String reportName = (String) i.next();
+ MavenReport report = (MavenReport) i.next();
+
+ report.setConfiguration( config );
- reportManager.executeReport( reportName, config );
+ report.generate();
}
}
Modified: maven/components/trunk/sandbox/maven-reports/maven-project-info-reports-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/sandbox/maven-reports/maven-project-info-reports-plugin/pom.xml?rev=168031&r1=168030&r2=168031&view=diff
==============================================================================
--- maven/components/trunk/sandbox/maven-reports/maven-project-info-reports-plugin/pom.xml (original)
+++ maven/components/trunk/sandbox/maven-reports/maven-project-info-reports-plugin/pom.xml Tue May 3 17:47:01 2005
@@ -1,10 +1,10 @@
<project>
<modelVersion>4.0.0</modelVersion>
- <!-- parent>
+ <parent>
<artifactId>mojo</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<version>1.0-SNAPSHOT</version>
- </parent -->
+ </parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
Modified: maven/components/trunk/sandbox/maven-reports/maven-project-info-reports-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/sandbox/maven-reports/maven-project-info-reports-plugin/src/main/resources/META-INF/plexus/components.xml?rev=168031&r1=168030&r2=168031&view=diff
==============================================================================
--- maven/components/trunk/sandbox/maven-reports/maven-project-info-reports-plugin/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/trunk/sandbox/maven-reports/maven-project-info-reports-plugin/src/main/resources/META-INF/plexus/components.xml Tue May 3 17:47:01 2005
@@ -12,4 +12,30 @@
<instantiation-strategy>per-lookup</instantiation-strategy>
</component>
</components>
+ <dependencies>
+ <dependency>
+ <groupId>doxia</groupId>
+ <artifactId>doxia-core</artifactId>
+ <type>jar</type>
+ <version>1.0-alpha-2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId>
+ <type>jar</type>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <type>jar</type>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <type>jar</type>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
</component-set>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org