Author: vsiveton
Date: Sat May 31 04:01:40 2008
New Revision: 662001
URL: http://svn.apache.org/viewvc?rev=662001&view=rev
Log:
o separated mojo components and parameters
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=662001&r1=662000&r2=662001&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Sat May 31 04:01:40 2008
@@ -155,6 +155,48 @@
private static final float SINCE_JAVADOC_1_6 = 1.6f;
// ----------------------------------------------------------------------
+ // Mojo components
+ // ----------------------------------------------------------------------
+
+ /**
+ * Archiver manager
+ *
+ * @since 2.5
+ * @component
+ */
+ private ArchiverManager archiverManager;
+
+ /**
+ * Factory for creating artifact objects
+ *
+ * @component
+ */
+ private ArtifactFactory factory;
+
+ /**
+ * Used to resolve artifacts of aggregated modules
+ *
+ * @since 2.1
+ * @component
+ */
+ private ArtifactMetadataSource artifactMetadataSource;
+
+ /**
+ * Used for resolving artifacts
+ *
+ * @component
+ */
+ private ArtifactResolver resolver;
+
+ /**
+ * Project builder
+ *
+ * @since 2.5
+ * @component
+ */
+ private MavenProjectBuilder mavenProjectBuilder;
+
+ // ----------------------------------------------------------------------
// Mojo parameters
// ----------------------------------------------------------------------
@@ -217,13 +259,6 @@
private String additionalJOption;
/**
- * Used for resolving artifacts
- *
- * @component
- */
- private ArtifactResolver resolver;
-
- /**
* A list of artifacts containing resources which sould be copied into the
* javadoc output directory (like stylesheets, icons, etc.).
* <br/>
@@ -244,13 +279,6 @@
private ResourcesArtifact[] resourcesArtifacts;
/**
- * Factory for creating artifact objects
- *
- * @component
- */
- private ArtifactFactory factory;
-
- /**
* The local repository where the artifacts are located
*
* @parameter expression="${localRepository}"
@@ -280,14 +308,6 @@
protected boolean aggregate;
/**
- * Used to resolve artifacts of aggregated modules
- *
- * @since 2.1
- * @component
- */
- private ArtifactMetadataSource artifactMetadataSource;
-
- /**
* Set this to 'true' to debug Javadoc plugin. With this, 'options' and
'files' files are provided.
*
* @since 2.1
@@ -322,22 +342,6 @@
*/
protected boolean skip;
- /**
- * Project builder
- *
- * @since 2.5
- * @component
- */
- private MavenProjectBuilder mavenProjectBuilder;
-
- /**
- * Archiver manager
- *
- * @since 2.5
- * @component
- */
- private ArchiverManager archiverManager;
-
// ----------------------------------------------------------------------
// Javadoc Options
// ----------------------------------------------------------------------
