Author: eric
Date: Mon Dec 27 12:34:16 2010
New Revision: 1053057
URL: http://svn.apache.org/viewvc?rev=1053057&view=rev
Log:
OutputDirectory is String and not File (MAILETDOCS-1)
Modified:
james/mailet/maven-mailetdocs-plugin/trunk/src/main/java/org/apache/james/mailet/MailetdocsMojo.java
Modified:
james/mailet/maven-mailetdocs-plugin/trunk/src/main/java/org/apache/james/mailet/MailetdocsMojo.java
URL:
http://svn.apache.org/viewvc/james/mailet/maven-mailetdocs-plugin/trunk/src/main/java/org/apache/james/mailet/MailetdocsMojo.java?rev=1053057&r1=1053056&r2=1053057&view=diff
==============================================================================
---
james/mailet/maven-mailetdocs-plugin/trunk/src/main/java/org/apache/james/mailet/MailetdocsMojo.java
(original)
+++
james/mailet/maven-mailetdocs-plugin/trunk/src/main/java/org/apache/james/mailet/MailetdocsMojo.java
Mon Dec 27 12:34:16 2010
@@ -19,6 +19,11 @@
package org.apache.james.mailet;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Locale;
+
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.Predicate;
import org.apache.maven.doxia.siterenderer.Renderer;
@@ -26,12 +31,6 @@ import org.apache.maven.project.MavenPro
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.MavenReportException;
-import java.io.File;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Locale;
-
/**
* <p>Generates catalog and reports on mailets and matchers.</p>
* <h4>Notes</h4>
@@ -46,34 +45,33 @@ import java.util.Locale;
public class MailetdocsMojo extends AbstractMavenReport {
/**
- * <i>Maven Internal</i>: The Doxia Site Renderer.
+ * Directory where reports will go.
*
- * @component
+ * @parameter expression="${project.reporting.outputDirectory}"
+ * @required
+ * @readonly
*/
- private Renderer siteRenderer;
+ private String outputDirectory;
/**
- * <i>Maven Internal</i>: The Project descriptor.
- *
- * @parameter expression="${project}"
+ * @parameter default-value="${project}"
* @required
* @readonly
*/
private MavenProject project;
/**
- * The output directory.
- *
- * @parameter expression="${project.reporting.outputDirectory}"
+ * @component
* @required
- * @since 0.1
+ * @readonly
*/
- private File outputDirectory;
+ private Renderer siteRenderer;
/**
* Extracts only a given type from a list.
*/
private static final class TypePredicate implements Predicate {
+
private int type;
public TypePredicate(int typeMatcher) {
@@ -86,7 +84,7 @@ public class MailetdocsMojo extends Abst
}
protected void executeReport(Locale locale) throws MavenReportException {
-
+
List descriptors = new
DefaultDescriptorsExtractor().extractDescriptors(project, getLog());
Collections.sort(descriptors, new Comparator() {
@@ -165,6 +163,7 @@ public class MailetdocsMojo extends Abst
}
private void outputDescriptorIndex(List descriptors, String title) {
+
getSink().section2();
getSink().sectionTitle2();
getSink().text(title);
@@ -182,9 +181,11 @@ public class MailetdocsMojo extends Abst
getSink().list_();
getSink().section2_();
+
}
private void outputDescriptorList(List descriptors, String title) {
+
getSink().section1();
getSink().sectionTitle1();
getSink().text(title);
@@ -230,19 +231,16 @@ public class MailetdocsMojo extends Abst
getSink().section1_();
}
- protected String getOutputDirectory() {
- return outputDirectory.getAbsolutePath();
+ protected MavenProject getProject() {
+ return project;
}
- /**
- * @return Returns the siteRenderer.
- */
- public Renderer getSiteRenderer() {
- return siteRenderer;
+ protected String getOutputDirectory() {
+ return outputDirectory;
}
- protected MavenProject getProject() {
- return project;
+ protected Renderer getSiteRenderer() {
+ return siteRenderer;
}
public String getDescription(Locale arg0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
