Author: brett
Date: Sat Jun 18 09:52:44 2005
New Revision: 191301
URL: http://svn.apache.org/viewcvs?rev=191301&view=rev
Log:
PR: MNG-469
remove MavenConfiguration class
Removed:
maven/components/trunk/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReportConfiguration.java
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/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-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
maven/components/trunk/maven-reports/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
maven/components/trunk/maven-reports/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.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=191301&r1=191300&r2=191301&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
Sat Jun 18 09:52:44 2005
@@ -28,7 +28,6 @@
import org.apache.maven.plugin.version.PluginVersionResolutionException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.MavenReport;
-import org.apache.maven.reporting.MavenReportConfiguration;
import org.apache.maven.reporting.MavenReportException;
import org.apache.maven.settings.Settings;
import org.codehaus.plexus.i18n.I18N;
@@ -225,14 +224,8 @@
{
Locale locale = (Locale) i.next();
- MavenReportConfiguration config = new
MavenReportConfiguration();
-
- config.setProject( project );
-
File localeOutputDirectory = getOuputDirectory( locale );
- config.setReportOutputDirectory( localeOutputDirectory );
-
//Generate reports
if ( reports != null )
{
@@ -242,7 +235,7 @@
getLog().info( "Generate " + report.getName( locale )
+ " report." );
- report.setConfiguration( config );
+ report.setReportOutputDirectory( localeOutputDirectory
);
String outputFileName = report.getOutputName() +
".html";
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=191301&r1=191300&r2=191301&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
Sat Jun 18 09:52:44 2005
@@ -43,7 +43,9 @@
extends AbstractMojo
implements MavenReport
{
- /** @todo share, use default excludes from plexus utils. */
+ /**
+ * @todo share, use default excludes from plexus utils.
+ */
protected static final String[] DEFAULT_EXCLUDES = {// Miscellaneous
typical temporary files
"**/*~", "**/#*#", "**/.#*", "**/%*%", "**/._*",
@@ -62,47 +64,30 @@
// Mac
"**/.DS_Store"};
- private MavenReportConfiguration config;
-
private Sink sink;
private Locale locale = Locale.ENGLISH;
- public MavenReportConfiguration getConfiguration()
- {
- return config;
- }
-
- public void setConfiguration( MavenReportConfiguration config )
- {
- this.config = config;
- }
-
protected abstract SiteRenderer getSiteRenderer();
protected abstract String getOutputDirectory();
protected abstract MavenProject getProject();
+ private File reportOutputDirectory;
+
/**
* @see org.apache.maven.plugin.Mojo#execute()
*/
public void execute()
throws MojoExecutionException
{
- config = new MavenReportConfiguration();
-
- config.setProject( getProject() );
-
- config.setReportOutputDirectory( new File( getOutputDirectory() ) );
-
try
{
String outputDirectory = getOutputDirectory();
XhtmlSink sink = getSiteRenderer().createSink( new File(
outputDirectory ), getOutputName() + ".html",
- outputDirectory,
- getSiteDescriptor(),
"maven" );
+ outputDirectory,
getSiteDescriptor(), "maven" );
generate( sink, Locale.ENGLISH );
@@ -120,14 +105,9 @@
public void generate( Sink sink, Locale locale )
throws MavenReportException
{
- if ( config == null )
- {
- throw new MavenReportException( "You must specify a report
configuration." );
- }
-
if ( sink == null )
{
- throw new MavenReportException( "You must specify a sink
configuration." );
+ throw new MavenReportException( "You must specify a sink." );
}
else
{
@@ -158,7 +138,6 @@
}
private String getReportsMenu()
- throws MojoExecutionException
{
StringBuffer buffer = new StringBuffer();
buffer.append( "<menu name=\"Project Documentation\">\n" );
@@ -211,5 +190,19 @@
siteDescriptorContent = StringUtils.interpolate(
siteDescriptorContent, props );
return new StringInputStream( siteDescriptorContent );
+ }
+
+ public File getReportOutputDirectory()
+ {
+ if ( reportOutputDirectory == null )
+ {
+ reportOutputDirectory = new File( getOutputDirectory() );
+ }
+ return reportOutputDirectory;
+ }
+
+ public void setReportOutputDirectory( File reportOutputDirectory )
+ {
+ this.reportOutputDirectory = reportOutputDirectory;
}
}
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=191301&r1=191300&r2=191301&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
Sat Jun 18 09:52:44 2005
@@ -19,6 +19,7 @@
import org.codehaus.doxia.sink.Sink;
import java.io.IOException;
+import java.io.File;
import java.util.Locale;
/**
@@ -36,10 +37,6 @@
String CATEGORY_PROJECT_REPORTS = "Project Reports";
- MavenReportConfiguration getConfiguration();
-
- void setConfiguration( MavenReportConfiguration config );
-
void generate( Sink sink, Locale locale )
throws MavenReportException;
@@ -53,4 +50,9 @@
Sink getSink()
throws IOException;
+
+ // TODO: remove?
+ void setReportOutputDirectory( File outputDirectory );
+
+ File getReportOutputDirectory();
}
Modified:
maven/components/trunk/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java?rev=191301&r1=191300&r2=191301&view=diff
==============================================================================
---
maven/components/trunk/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
(original)
+++
maven/components/trunk/maven-reports/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
Sat Jun 18 09:52:44 2005
@@ -141,7 +141,7 @@
{
FileOutputStream out;
// TODO: I removed outputDirectory, and shouldn't have. Put it
back here.
- File resultFile = new File(
getConfiguration().getModel().getBuild().getDirectory() + "/site",
resultFileName );
+ File resultFile = new File(
getProject().getModel().getBuild().getDirectory() + "/site", resultFileName );
try
{
File parentFile = resultFile.getParentFile();
@@ -168,6 +168,7 @@
}
File[] files;
+ String sourceDirectory = getProject().getBuild().getSourceDirectory();
try
{
List filesList = getFilesToProcess( "**/*.java", null );
@@ -180,7 +181,7 @@
}
catch( IOException e )
{
- throw new MavenReportException( "Can't parse " +
getConfiguration().getSourceDirectory(), e );
+ throw new MavenReportException( "Can't parse " + sourceDirectory,
e );
}
Configuration config;
@@ -220,7 +221,8 @@
checker.configure( config );
- AuditListener sinkListener = new CheckstyleReportListener(
getSink(), getConfiguration().getSourceDirectory() );
+ // TODO: use source roots
+ AuditListener sinkListener = new CheckstyleReportListener(
getSink(), sourceDirectory );
if ( listener != null )
{
@@ -272,7 +274,7 @@
excludesStr.append( DEFAULT_EXCLUDES[i] );
}
- return FileUtils.getFiles( new File(
getConfiguration().getSourceDirectory() ), includes, excludesStr.toString() );
+ return FileUtils.getFiles( new File(
getProject().getBuild().getSourceDirectory() ), includes,
excludesStr.toString() );
}
private Properties createOverridingProperties()
@@ -280,7 +282,7 @@
Properties props = new Properties();
props.setProperty( "checkstyle.header.file", "LICENSE.txt" );
// TODO: explicit output directory when it is back
- props.setProperty( "checkstyle.cache.file",
getConfiguration().getModel().getBuild().getDirectory() +
"/checkstyle-cachefile" );
+ props.setProperty( "checkstyle.cache.file",
getProject().getModel().getBuild().getDirectory() + "/checkstyle-cachefile" );
return props;
}
}
Modified:
maven/components/trunk/maven-reports/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reports/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java?rev=191301&r1=191300&r2=191301&view=diff
==============================================================================
---
maven/components/trunk/maven-reports/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
(original)
+++
maven/components/trunk/maven-reports/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
Sat Jun 18 09:52:44 2005
@@ -24,6 +24,7 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.MavenReportException;
+import org.apache.maven.model.Model;
import org.codehaus.doxia.sink.Sink;
import org.codehaus.doxia.site.renderer.SiteRenderer;
import org.codehaus.plexus.util.FileUtils;
@@ -106,11 +107,6 @@
public void generate( Sink sink, Locale locale )
throws MavenReportException
{
- if ( getConfiguration() == null )
- {
- throw new MavenReportException( "You must specify a report
configuration." );
- }
-
executeReport( locale);
}
@@ -122,23 +118,24 @@
{
try
{
- File outputDir = new File(
getConfiguration().getReportOutputDirectory().getAbsolutePath() + "/apidocs" );
+ File outputDir = new File(
getReportOutputDirectory().getAbsolutePath() + "/apidocs" );
outputDir.mkdirs();
int actualYear = Calendar.getInstance().get( Calendar.YEAR );
String year;
- if ( getConfiguration().getModel().getInceptionYear() != null
- && Integer.valueOf(
getConfiguration().getModel().getInceptionYear() ).intValue() == actualYear )
+ Model model = getProject().getModel();
+ if ( model.getInceptionYear() != null
+ && Integer.valueOf( model.getInceptionYear() ).intValue() ==
actualYear )
{
- year = getConfiguration().getModel().getInceptionYear();
+ year = model.getInceptionYear();
}
else
{
- year = getConfiguration().getModel().getInceptionYear() + "-"
+ String.valueOf( actualYear );
+ year = model.getInceptionYear() + "-" + String.valueOf(
actualYear );
}
StringBuffer classpath = new StringBuffer();
- for ( Iterator i =
getConfiguration().getProject().getCompileClasspathElements().iterator();
i.hasNext(); )
+ for ( Iterator i =
getProject().getCompileClasspathElements().iterator(); i.hasNext(); )
{
classpath.append( (String) i.next() );
if ( i.hasNext() )
@@ -149,14 +146,14 @@
StringBuffer sourcePath = new StringBuffer();
String[] fileList = new String[1];
- for ( Iterator i =
getConfiguration().getCompileSourceRoots().iterator(); i.hasNext(); )
+ for ( Iterator i =
getProject().getCompileSourceRoots().iterator(); i.hasNext(); )
{
String sourceDirectory = (String) i.next();
fileList = FileUtils.getFilesFromExtension( sourceDirectory,
new String[] { "java" } );
sourcePath.append( sourceDirectory );
}
- File javadocDirectory = new File(
getConfiguration().getProject().getBuild().getDirectory() + "/javadoc" );
+ File javadocDirectory = new File(
getProject().getBuild().getDirectory() + "/javadoc" );
if ( fileList != null && fileList.length != 0 )
{
StringBuffer files = new StringBuffer();
@@ -181,11 +178,11 @@
cl.createArgument().setValue( "-author" );
cl.createArgument().setValue( "-windowtitle" );
cl.createArgument().setValue(
-
getConfiguration().getModel().getName() + " "
- +
getConfiguration().getModel().getVersion() );
+ model.getName() + " "
+ + model.getVersion() );
cl.createArgument().setValue( "-bottom" );
cl.createArgument().setValue( "Copyright © " + year + " "
- +
getConfiguration().getModel().getOrganization().getName()
+ + model.getOrganization().getName()
+ ". All Rights Reserved." );
cl.createArgument().setValue( "-sourcePath" );
cl.createArgument().setValue( sourcePath.toString() );
Modified:
maven/components/trunk/maven-reports/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-reports/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java?rev=191301&r1=191300&r2=191301&view=diff
==============================================================================
---
maven/components/trunk/maven-reports/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
(original)
+++
maven/components/trunk/maven-reports/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
Sat Jun 18 09:52:44 2005
@@ -132,7 +132,9 @@
PMD pmd = new PMD();
RuleContext ruleContext = new RuleContext();
Report report = new Report();
- PmdReportListener reportSink = new PmdReportListener( sink,
getConfiguration().getSourceDirectory() );
+ // TODO: use source roots instead
+ String sourceDirectory = getProject().getBuild().getSourceDirectory();
+ PmdReportListener reportSink = new PmdReportListener( sink,
sourceDirectory );
report.addListener( reportSink );
ruleContext.setReport( report );
@@ -149,7 +151,7 @@
}
catch ( IOException e )
{
- throw new MavenReportException( "Can't parse " +
getConfiguration().getSourceDirectory(), e );
+ throw new MavenReportException( "Can't parse " + sourceDirectory,
e );
}
for ( Iterator i = files.iterator(); i.hasNext(); )
@@ -209,7 +211,7 @@
private List getFilesToProcess( String includes, String excludes )
throws IOException
{
- File dir = new File( getConfiguration().getSourceDirectory() );
+ File dir = new File( getProject().getBuild().getSourceDirectory() );
if ( !dir.exists() )
{
return Collections.EMPTY_LIST;
Modified:
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.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/DependenciesReport.java?rev=191301&r1=191300&r2=191301&view=diff
==============================================================================
---
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
(original)
+++
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
Sat Jun 18 09:52:44 2005
@@ -115,7 +115,7 @@
{
try
{
- DependenciesRenderer r = new DependenciesRenderer( getSink(),
getConfiguration().getModel() );
+ DependenciesRenderer r = new DependenciesRenderer( getSink(),
getProject().getModel() );
r.render();
}
Modified:
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.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/MailingListsReport.java?rev=191301&r1=191300&r2=191301&view=diff
==============================================================================
---
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
(original)
+++
maven/components/trunk/maven-reports/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
Sat Jun 18 09:52:44 2005
@@ -116,7 +116,7 @@
{
try
{
- MailingListsRenderer r = new MailingListsRenderer( getSink(),
getConfiguration().getModel() );
+ MailingListsRenderer r = new MailingListsRenderer( getSink(),
getProject().getModel() );
r.render();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
