You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2005/10/21 03:20:22 UTC
svn commit: r327064 - in
/maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc:
JavadocJar.java JavadocReport.java
Author: brett
Date: Thu Oct 20 18:20:19 2005
New Revision: 327064
URL: http://svn.apache.org/viewcvs?rev=327064&view=rev
Log:
PR: MNG-1257
make javadoc work for WAR
Modified:
maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
Modified: maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java?rev=327064&r1=327063&r2=327064&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java (original)
+++ maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java Thu Oct 20 18:20:19 2005
@@ -66,7 +66,7 @@
throws MojoExecutionException
{
ArtifactHandler artifactHandler = project.getArtifact().getArtifactHandler();
- if ( !"java".equals( artifactHandler.getLanguage() ) || !artifactHandler.isAddedToClasspath() )
+ if ( !"java".equals( artifactHandler.getLanguage() ) )
{
getLog().info( "Not executing Javadoc as the project is not a Java classpath-capable package" );
}
Modified: maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java?rev=327064&r1=327063&r2=327064&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java (original)
+++ maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java Thu Oct 20 18:20:19 2005
@@ -602,7 +602,7 @@
throws MavenReportException
{
ArtifactHandler artifactHandler = project.getArtifact().getArtifactHandler();
- if ( !"java".equals( artifactHandler.getLanguage() ) || !artifactHandler.isAddedToClasspath() )
+ if ( !"java".equals( artifactHandler.getLanguage() ) )
{
getLog().info( "Not executing Javadoc as the project is not a Java classpath-capable package" );
return;
@@ -947,8 +947,8 @@
* conditionally based on the given flag.
*
* @param arguments
- * @param b the flag which controls if the argument is added or not.
- * @param value the argument value to be added.
+ * @param b the flag which controls if the argument is added or not.
+ * @param value the argument value to be added.
*/
private void addArgIf( List arguments, boolean b, String value )
{
@@ -962,8 +962,8 @@
* Convenience method to add an argument to the <code>command line</code>
* regarding the requested Java version.
*
- * @param b the flag which controls if the argument is added or not.
- * @param value the argument value to be added.
+ * @param b the flag which controls if the argument is added or not.
+ * @param value the argument value to be added.
* @param requiredJavaVersion the required Java version, for example 1.31f or 1.4f
* @see #addArgIf(java.util.List,boolean,String)
* @see <a href="http://jakarta.apache.org/commons/lang/api/org/apache/commons/lang/SystemUtils.html#isJavaVersionAtLeast(float)">SystemUtils.html#isJavaVersionAtLeast(float)</a>
@@ -983,12 +983,12 @@
/**
* Convenience method to add an argument to the <code>command line</code>
* if the the value is not null or empty.
- * <p>
+ * <p/>
* Moreover, the value could be comma separated.
*
* @param arguments
- * @param key the argument name.
- * @param value the argument value to be added.
+ * @param key the argument name.
+ * @param value the argument value to be added.
* @see #addArgIfNotEmpty(java.util.List,String,String,boolean)
*/
private void addArgIfNotEmpty( List arguments, String key, String value )
@@ -999,12 +999,12 @@
/**
* Convenience method to add an argument to the <code>command line</code>
* if the the value is not null or empty.
- * <p>
+ * <p/>
* Moreover, the value could be comma separated.
*
* @param arguments
- * @param key the argument name.
- * @param value the argument value to be added.
+ * @param key the argument name.
+ * @param value the argument value to be added.
* @param repeatKey repeat or not the key in the command line
*/
private void addArgIfNotEmpty( List arguments, String key, String value, boolean repeatKey )
@@ -1039,8 +1039,8 @@
* regarding the requested Java version.
*
* @param arguments
- * @param key the argument name.
- * @param value the argument value to be added.
+ * @param key the argument name.
+ * @param value the argument value to be added.
* @param requiredJavaVersion the required Java version, for example 1.31f or 1.4f
* @see #addArgIfNotEmpty(List, String, String, float, boolean)
*/
@@ -1053,10 +1053,10 @@
* Convenience method to add an argument to the <code>command line</code>
* regarding the requested Java version.
*
- * @param key the argument name.
- * @param value the argument value to be added.
+ * @param key the argument name.
+ * @param value the argument value to be added.
* @param requiredJavaVersion the required Java version, for example 1.31f or 1.4f
- * @param repeatKey repeat or not the key in the command line
+ * @param repeatKey repeat or not the key in the command line
* @see #addArgIfNotEmpty(java.util.List,String,String)
* @see <a href="http://jakarta.apache.org/commons/lang/api/org/apache/commons/lang/SystemUtils.html#isJavaVersionAtLeast(float)">SystemUtils.html#isJavaVersionAtLeast(float)</a>
*/