Author: evenisse
Date: Thu May 19 09:27:00 2005
New Revision: 170954
URL: http://svn.apache.org/viewcvs?rev=170954&view=rev
Log:
o clean import
o Use MavenProject instead of Model for obtain more informations
Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
maven/components/trunk/maven-reporting/maven-reporting-api/pom.xml
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReportConfiguration.java
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReportRenderer.java
maven/components/trunk/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportMojo.java
maven/components/trunk/maven-reports/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportMojo.java
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectReportsMojo.java
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=170954&r1=170953&r2=170954&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
Thu May 19 09:27:00 2005
@@ -124,7 +124,9 @@
MavenReportConfiguration config = new MavenReportConfiguration();
- config.setModel( project.getModel() );
+ config.setProject( project );
+
+ config.setReportOutputDirectory( new File( outputDirectory ) );
//Generate reports
if ( reports != null )
Modified: maven/components/trunk/maven-reporting/maven-reporting-api/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reporting/maven-reporting-api/pom.xml?rev=170954&r1=170953&r2=170954&view=diff
==============================================================================
--- maven/components/trunk/maven-reporting/maven-reporting-api/pom.xml
(original)
+++ maven/components/trunk/maven-reporting/maven-reporting-api/pom.xml Thu May
19 09:27:00 2005
@@ -9,7 +9,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
+ <artifactId>maven-project</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified:
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java?rev=170954&r1=170953&r2=170954&view=diff
==============================================================================
---
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
(original)
+++
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
Thu May 19 09:27:00 2005
@@ -17,10 +17,7 @@
*/
import org.codehaus.doxia.sink.Sink;
-import org.codehaus.doxia.module.xdoc.XdocSink;
-import java.io.File;
-import java.io.FileWriter;
import java.io.IOException;
/**
Modified:
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java?rev=170954&r1=170953&r2=170954&view=diff
==============================================================================
---
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java
(original)
+++
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java
Thu May 19 09:27:00 2005
@@ -18,7 +18,6 @@
import org.codehaus.doxia.sink.Sink;
-import java.io.File;
import java.io.IOException;
/**
Modified:
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReportConfiguration.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReportConfiguration.java?rev=170954&r1=170953&r2=170954&view=diff
==============================================================================
---
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReportConfiguration.java
(original)
+++
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReportConfiguration.java
Thu May 19 09:27:00 2005
@@ -18,6 +18,7 @@
import org.apache.maven.model.Model;
import org.apache.maven.model.Scm;
+import org.apache.maven.project.MavenProject;
import java.io.File;
import java.util.List;
@@ -28,10 +29,22 @@
*/
public class MavenReportConfiguration
{
- private Model model;
+ private MavenProject project;
private File basedir;
+ private File outputDirectory;
+
+ public void setReportOutputDirectory( File outputDirectory )
+ {
+ this.outputDirectory = outputDirectory;
+ }
+
+ public File getReportOutputDirectory()
+ {
+ return outputDirectory;
+ }
+
public File getBasedir()
{
return basedir;
@@ -44,17 +57,17 @@
public Model getModel()
{
- if ( model == null )
- {
- model = new Model();
- }
+ return project.getModel();
+ }
- return model;
+ public void setProject( MavenProject project )
+ {
+ this.project = project;
}
- public void setModel( Model model )
+ public MavenProject getProject()
{
- this.model = model;
+ return project;
}
public List getDependencies()
@@ -87,6 +100,11 @@
getModel().getBuild().setSourceDirectory( sourceDirectory );
}
+ public List getCompileSourceRoots()
+ {
+ return project.getCompileSourceRoots();
+ }
+
public String getScriptSourceDirectory()
{
return getModel().getBuild().getScriptSourceDirectory();
@@ -106,4 +124,10 @@
{
getModel().getBuild().setTestSourceDirectory( testSourceDirectory );
}
+
+ public List getTestCompileSourceRoots()
+ {
+ return project.getTestCompileSourceRoots();
+ }
+
}
Modified:
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReportRenderer.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReportRenderer.java?rev=170954&r1=170953&r2=170954&view=diff
==============================================================================
---
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReportRenderer.java
(original)
+++
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReportRenderer.java
Thu May 19 09:27:00 2005
@@ -16,8 +16,6 @@
* limitations under the License.
*/
-import org.codehaus.doxia.sink.Sink;
-
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="[EMAIL PROTECTED]">Emmanuel Venisse</a>
Modified:
maven/components/trunk/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportMojo.java?rev=170954&r1=170953&r2=170954&view=diff
==============================================================================
---
maven/components/trunk/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportMojo.java
(original)
+++
maven/components/trunk/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportMojo.java
Thu May 19 09:27:00 2005
@@ -86,7 +86,7 @@
{
MavenReportConfiguration config = new MavenReportConfiguration();
- config.setModel( project.getModel() );
+ config.setProject( project );
MavenReport report = new CheckstyleReport();
Modified:
maven/components/trunk/maven-reports/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reports/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportMojo.java?rev=170954&r1=170953&r2=170954&view=diff
==============================================================================
---
maven/components/trunk/maven-reports/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportMojo.java
(original)
+++
maven/components/trunk/maven-reports/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportMojo.java
Thu May 19 09:27:00 2005
@@ -85,7 +85,9 @@
{
MavenReportConfiguration config = new MavenReportConfiguration();
- config.setModel( project.getModel() );
+ config.setProject( project );
+
+ config.setReportOutputDirectory( new File( outputDirectory ) );
MavenReport report = new PmdReport();
Modified:
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectReportsMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectReportsMojo.java?rev=170954&r1=170953&r2=170954&view=diff
==============================================================================
---
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectReportsMojo.java
(original)
+++
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectReportsMojo.java
Thu May 19 09:27:00 2005
@@ -85,7 +85,9 @@
{
MavenReportConfiguration config = new MavenReportConfiguration();
- config.setModel( project.getModel() );
+ config.setProject( project );
+
+ config.setReportOutputDirectory( new File( outputDirectory ) );
MavenReport dependenciesReport = new DependenciesReport();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
