You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2013/08/27 20:25:11 UTC
svn commit: r1517906 [18/24] - in /maven/plugins/trunk:
maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/
maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/
maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/
maven-antr...
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java Tue Aug 27 18:25:03 2013
@@ -223,7 +223,7 @@ public abstract class AbstractFixJavadoc
* <br/>
* See <a href="#defaultSince">defaultSince</a>.
*/
- @Parameter( property = "comparisonVersion", defaultValue = "(,${project.version})" )
+ @Parameter ( property = "comparisonVersion", defaultValue = "(,${project.version})" )
private String comparisonVersion;
/**
@@ -231,13 +231,13 @@ public abstract class AbstractFixJavadoc
* <br/>
* If not specified, the <code>user.name</code> defined in the System properties will be used.
*/
- @Parameter( property = "defaultAuthor" )
+ @Parameter ( property = "defaultAuthor" )
private String defaultAuthor;
/**
* Default value for the Javadoc tag <code>@since</code>.
*/
- @Parameter( property = "defaultSince", defaultValue = "${project.version}" )
+ @Parameter ( property = "defaultSince", defaultValue = "${project.version}" )
private String defaultSince;
/**
@@ -247,20 +247,20 @@ public abstract class AbstractFixJavadoc
* <a href="http://svnbook.red-bean.com/en/1.1/ch07s02.html#svn-ch-7-sect-2.3.4">SVN keyword</a>.
* Refer to your SCM to use an other SCM keyword.
*/
- @Parameter( property = "defaultVersion", defaultValue = DEFAULT_VERSION_VALUE )
+ @Parameter ( property = "defaultVersion", defaultValue = DEFAULT_VERSION_VALUE )
private String defaultVersion = "\u0024Id: \u0024"; // can't use default-value="\u0024Id: \u0024"
/**
* The file encoding to use when reading the source files. If the property
* <code>project.build.sourceEncoding</code> is not set, the platform default encoding is used.
*/
- @Parameter( property = "encoding", defaultValue = "${project.build.sourceEncoding}" )
+ @Parameter ( property = "encoding", defaultValue = "${project.build.sourceEncoding}" )
private String encoding;
/**
* Comma separated excludes Java files, i.e. <code>**/*Test.java</code>.
*/
- @Parameter( property = "excludes" )
+ @Parameter ( property = "excludes" )
private String excludes;
/**
@@ -277,37 +277,37 @@ public abstract class AbstractFixJavadoc
* <li>link (fix only @link tag)</li>
* </ul>
*/
- @Parameter( property = "fixTags", defaultValue = "all" )
+ @Parameter ( property = "fixTags", defaultValue = "all" )
private String fixTags;
/**
* Flag to fix the classes or interfaces Javadoc comments according the <code>level</code>.
*/
- @Parameter( property = "fixClassComment", defaultValue = "true" )
+ @Parameter ( property = "fixClassComment", defaultValue = "true" )
private boolean fixClassComment;
/**
* Flag to fix the fields Javadoc comments according the <code>level</code>.
*/
- @Parameter( property = "fixFieldComment", defaultValue = "true" )
+ @Parameter ( property = "fixFieldComment", defaultValue = "true" )
private boolean fixFieldComment;
/**
* Flag to fix the methods Javadoc comments according the <code>level</code>.
*/
- @Parameter( property = "fixMethodComment", defaultValue = "true" )
+ @Parameter ( property = "fixMethodComment", defaultValue = "true" )
private boolean fixMethodComment;
/**
* Forcing the goal execution i.e. skip warranty messages (not recommended).
*/
- @Parameter( property = "force" )
+ @Parameter ( property = "force" )
private boolean force;
/**
* Flag to ignore or not Clirr.
*/
- @Parameter( property = "ignoreClirr", defaultValue = "false" )
+ @Parameter ( property = "ignoreClirr", defaultValue = "false" )
protected boolean ignoreClirr;
/**
@@ -315,7 +315,7 @@ public abstract class AbstractFixJavadoc
* <p/>
* <strong>Note:</strong> default value is {@code **\/*.java}.
*/
- @Parameter( property = "includes", defaultValue = JAVA_FILES )
+ @Parameter ( property = "includes", defaultValue = JAVA_FILES )
private String includes;
/**
@@ -332,19 +332,19 @@ public abstract class AbstractFixJavadoc
* (shows all classes and members)</li>
* </ul>
*/
- @Parameter( property = "level", defaultValue = "protected" )
+ @Parameter ( property = "level", defaultValue = "protected" )
private String level;
/**
* The local repository where the artifacts are located, used by the tests.
*/
- @Parameter( property = "localRepository" )
+ @Parameter ( property = "localRepository" )
private ArtifactRepository localRepository;
/**
* Output directory where Java classes will be rewritten.
*/
- @Parameter( property = "outputDirectory", defaultValue = "${project.build.sourceDirectory}" )
+ @Parameter ( property = "outputDirectory", defaultValue = "${project.build.sourceDirectory}" )
private File outputDirectory;
/**
@@ -442,9 +442,8 @@ public abstract class AbstractFixJavadoc
if ( javaClasses != null )
{
- for ( JavaClass javaClass : javaClasses )
- {
- processFix( javaClass );
+ for (JavaClass javaClass : javaClasses) {
+ processFix(javaClass);
}
}
}
@@ -529,19 +528,14 @@ public abstract class AbstractFixJavadoc
{
String[] split = StringUtils.split( fixTags, "," );
List<String> filtered = new LinkedList<String>();
- for ( String aSplit : split )
- {
+ for (String aSplit : split) {
String s = aSplit.trim();
- if ( JavadocUtil.equalsIgnoreCase( s, FIX_TAGS_ALL, AUTHOR_TAG, VERSION_TAG, SINCE_TAG, PARAM_TAG,
- THROWS_TAG, LINK_TAG ) )
- {
- filtered.add( s );
- }
- else
- {
- if ( getLog().isWarnEnabled() )
- {
- getLog().warn( "Unrecognized '" + s + "' for fixTags parameter. Ignored it!" );
+ if (JavadocUtil.equalsIgnoreCase(s, FIX_TAGS_ALL, AUTHOR_TAG, VERSION_TAG, SINCE_TAG, PARAM_TAG,
+ THROWS_TAG, LINK_TAG)) {
+ filtered.add(s);
+ } else {
+ if (getLog().isWarnEnabled()) {
+ getLog().warn("Unrecognized '" + s + "' for fixTags parameter. Ignored it!");
}
}
}
@@ -617,7 +611,7 @@ public abstract class AbstractFixJavadoc
getLog().info( "OK, let's proceed..." );
break;
}
- if ( JavadocUtil.equalsIgnoreCase( userExpression, "N", "No" ) )
+ if (JavadocUtil.equalsIgnoreCase( userExpression, "N", "No" ))
{
getLog().info( "No changes in your sources occur." );
return false;
@@ -679,7 +673,7 @@ public abstract class AbstractFixJavadoc
StringUtils.unifyLineSeparators( FileUtils.fileRead( invokerLogFile, "UTF-8" ) );
// see org.codehaus.mojo.clirr.AbstractClirrMojo#getComparisonArtifact()
final String artifactNotFoundMsg = "Unable to find a previous version of the project in the repository";
- if ( invokerLogContent.contains( artifactNotFoundMsg ) )
+ if (invokerLogContent.contains(artifactNotFoundMsg))
{
getLog().warn( "No previous artifact has been deployed, Clirr is ignored." );
return;
@@ -836,10 +830,8 @@ public abstract class AbstractFixJavadoc
return true;
}
- for ( String aFixTagsSplitted : fixTagsSplitted )
- {
- if ( aFixTagsSplitted.trim().equals( tag ) )
- {
+ for (String aFixTagsSplitted : fixTagsSplitted) {
+ if (aFixTagsSplitted.trim().equals(tag)) {
return true;
}
}
@@ -940,7 +932,7 @@ public abstract class AbstractFixJavadoc
}
}
- projectClassLoader = new URLClassLoader( urls.toArray( new URL[urls.size()] ), null );
+ projectClassLoader = new URLClassLoader(urls.toArray( new URL[urls.size()] ), null );
}
return projectClassLoader;
@@ -1103,7 +1095,7 @@ public abstract class AbstractFixJavadoc
String extraComment = javadocComment.substring( javadocComment.indexOf( END_JAVADOC ) + END_JAVADOC.length() );
if ( StringUtils.isNotEmpty( extraComment ) )
{
- if ( extraComment.contains( EOL ) )
+ if (extraComment.contains(EOL))
{
stringWriter.write( extraComment.substring( extraComment.indexOf( EOL ) + EOL.length() ) );
}
@@ -1328,22 +1320,18 @@ public abstract class AbstractFixJavadoc
{
StringBuilder value = new StringBuilder();
String[] lines = getLines( field.getInitializationExpression() );
- for ( String line : lines )
- {
- StringTokenizer token = new StringTokenizer( line.trim(), "\"\n\r" );
- while ( token.hasMoreTokens() )
- {
+ for (String line : lines) {
+ StringTokenizer token = new StringTokenizer(line.trim(), "\"\n\r");
+ while (token.hasMoreTokens()) {
String s = token.nextToken();
- if ( s.trim().equals( "+" ) )
- {
+ if (s.trim().equals("+")) {
continue;
}
- if ( s.trim().endsWith( "\\" ) )
- {
+ if (s.trim().endsWith("\\")) {
s += "\"";
}
- value.append( s );
+ value.append(s);
}
}
@@ -1709,10 +1697,9 @@ public abstract class AbstractFixJavadoc
}
String[] lines = getLines( comment );
- for ( String line : lines )
- {
- sb.append( indent ).append( " " ).append( line.trim() );
- sb.append( EOL );
+ for (String line : lines) {
+ sb.append(indent).append(" ").append(line.trim());
+ sb.append(EOL);
}
}
@@ -1932,8 +1919,7 @@ public abstract class AbstractFixJavadoc
{
String originalJavadocTag = it.next();
- if ( StringUtils.removeDuplicateWhitespace( originalJavadocTag ).trim().contains(
- "@" + docletTag.getName() ) )
+ if (StringUtils.removeDuplicateWhitespace(originalJavadocTag).trim().contains("@" + docletTag.getName()))
{
it.remove();
sb.append( originalJavadocTag );
@@ -1948,8 +1934,7 @@ public abstract class AbstractFixJavadoc
{
String originalJavadocTag = it.next();
- if ( StringUtils.removeDuplicateWhitespace( originalJavadocTag ).trim().contains(
- "@" + docletTag.getName() ) )
+ if (StringUtils.removeDuplicateWhitespace(originalJavadocTag).trim().contains("@" + docletTag.getName()))
{
it.remove();
sb.append( originalJavadocTag );
@@ -1967,8 +1952,8 @@ public abstract class AbstractFixJavadoc
}
}
- private void writeParamTag( final StringBuilder sb, final JavaMethod javaMethod,
- final JavaEntityTags javaEntityTags, String[] params )
+ private void writeParamTag( final StringBuilder sb, final JavaMethod javaMethod, final JavaEntityTags javaEntityTags,
+ String[] params )
{
params = fixQdox173( params );
@@ -1991,10 +1976,8 @@ public abstract class AbstractFixJavadoc
{
// is generic?
TypeVariable[] typeParams = javaMethod.getTypeParameters();
- for ( TypeVariable typeParam : typeParams )
- {
- if ( typeParam.getGenericValue().equals( paramName ) )
- {
+ for (TypeVariable typeParam : typeParams) {
+ if (typeParam.getGenericValue().equals(paramName)) {
found = true;
}
}
@@ -2537,7 +2520,7 @@ public abstract class AbstractFixJavadoc
}
sb.append( indent ).append( " * @" ).append( PARAM_TAG ).append( " " );
- sb.append( "<" ).append( typeParameter.getName() ).append( ">" );
+ sb.append("<").append(typeParameter.getName()).append(">");
sb.append( " " );
sb.append( getDefaultJavadocForType( typeParameter ) );
sb.append( EOL );
@@ -3385,7 +3368,7 @@ public abstract class AbstractFixJavadoc
private static String removeLastEmptyJavadocLines( final String content )
throws IOException
{
- if ( !content.contains( EOL ) )
+ if (!content.contains(EOL))
{
return content;
}
@@ -3485,7 +3468,7 @@ public abstract class AbstractFixJavadoc
line = reader.readLine();
}
- return lines.toArray( new String[lines.size()] );
+ return lines.toArray(new String[lines.size()]);
}
/**
@@ -3558,7 +3541,7 @@ public abstract class AbstractFixJavadoc
l.remove( 0 );
l.remove( 1 );
- return l.toArray( new String[l.size()] );
+ return l.toArray(new String[l.size()]);
}
return params;
@@ -3673,8 +3656,7 @@ public abstract class AbstractFixJavadoc
private String getMessage( String paramName, String mapName )
{
StringBuilder msg = new StringBuilder();
- msg.append( "No param '" ).append( paramName ).append( "' key found in " ).append( mapName ).append(
- " for the entity: " );
+ msg.append("No param '").append(paramName).append("' key found in ").append(mapName).append(" for the entity: ");
if ( isJavaMethod )
{
JavaMethod javaMethod = (JavaMethod) entity;
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=1517906&r1=1517905&r2=1517906&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 Tue Aug 27 18:25:03 2013
@@ -384,7 +384,6 @@ public abstract class AbstractJavadocMoj
* <additionalJOption>-J-Xmx1g </additionalJOption>
* </additionalJOptions>
* </pre>
- *
* @since 2.9
*/
@Parameter
@@ -1279,7 +1278,7 @@ public abstract class AbstractJavadocMoj
* <br/>
*/
@Parameter( property = "destDir", alias = "destDir", defaultValue = "${project.build.directory}/apidocs",
- required = true )
+ required = true )
protected File outputDirectory;
/**
@@ -1382,7 +1381,7 @@ public abstract class AbstractJavadocMoj
* stylesheetfile</a>.
*/
@Parameter( property = "stylesheetfile" )
- private String stylesheetfile;
+ private String stylesheetfile;
/**
* Specifies the class file that starts the taglet used in generating the documentation for that tag.
@@ -1664,10 +1663,9 @@ public abstract class AbstractJavadocMoj
/**
* To apply the security fix on generated javadoc see http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1571
- *
* @since 2.9.1
*/
- @Parameter( defaultValue = "true", property = "maven.javadoc.applyJavadocSecurityFix" )
+ @Parameter(defaultValue = "true", property = "maven.javadoc.applyJavadocSecurityFix")
private boolean applyJavadocSecurityFix = true;
// ----------------------------------------------------------------------
@@ -2047,7 +2045,7 @@ public abstract class AbstractJavadocMoj
}
else
{
- getLog().info( "applying javadoc security fix has been disabled" );
+ getLog().info( "applying javadoc security fix has been disabled" );
}
}
@@ -2069,8 +2067,7 @@ public abstract class AbstractJavadocMoj
for ( String sourcePath : sourcePaths )
{
File sourceDirectory = new File( sourcePath );
- JavadocUtil.addFilesFromSource( files, sourceDirectory, sourceFileIncludes, sourceFileExcludes,
- excludedPackages );
+ JavadocUtil.addFilesFromSource( files, sourceDirectory, sourceFileIncludes, sourceFileExcludes, excludedPackages );
}
}
@@ -2141,12 +2138,12 @@ public abstract class AbstractJavadocMoj
if ( getJavadocDirectory() != null )
{
String javadocDirRelative =
- PathUtils.toRelative( project.getBasedir(), getJavadocDirectory().getAbsolutePath() );
+ PathUtils.toRelative( project.getBasedir(), getJavadocDirectory().getAbsolutePath() );
File javadocDir = new File( subProject.getBasedir(), javadocDirRelative );
if ( javadocDir.exists() && javadocDir.isDirectory() )
{
List<String> l = JavadocUtil.pruneDirs( subProject, Collections.singletonList(
- javadocDir.getAbsolutePath() ) );
+ javadocDir.getAbsolutePath() ) );
sourcePaths.addAll( l );
}
}
@@ -3555,8 +3552,7 @@ public abstract class AbstractJavadocMoj
{
throw new IOException( "The environment variable JAVA_HOME is not correctly set." );
}
- if ( ( !new File( javaHome ).getCanonicalFile().exists() ) || ( new File(
- javaHome ).getCanonicalFile().isFile() ) )
+ if ( ( !new File( javaHome ).getCanonicalFile().exists() ) || ( new File( javaHome ).getCanonicalFile().isFile() ) )
{
throw new IOException(
"The environment variable JAVA_HOME=" + javaHome + " doesn't exist or is not a valid directory." );
@@ -4210,7 +4206,7 @@ public abstract class AbstractJavadocMoj
currentSourcePath += "/";
}
- if ( currentFile.contains( currentSourcePath ) )
+ if (currentFile.contains(currentSourcePath))
{
String packagename = currentFile.substring( currentSourcePath.length() + 1 );
@@ -4218,7 +4214,7 @@ public abstract class AbstractJavadocMoj
* Remove the miscellaneous files
* http://docs.oracle.com/javase/1.4.2/docs/tooldocs/solaris/javadoc.html#unprocessed
*/
- if ( packagename.contains( "doc-files" ) )
+ if (packagename.contains("doc-files"))
{
continue;
}
@@ -4262,8 +4258,7 @@ public abstract class AbstractJavadocMoj
File optionsFile = new File( javadocOutputDirectory, OPTIONS_FILE_NAME );
StringBuilder options = new StringBuilder();
- options.append(
- StringUtils.join( arguments.toArray( new String[arguments.size()] ), SystemUtils.LINE_SEPARATOR ) );
+ options.append( StringUtils.join(arguments.toArray(new String[arguments.size()]), SystemUtils.LINE_SEPARATOR ) );
try
{
@@ -4842,19 +4837,14 @@ public abstract class AbstractJavadocMoj
return;
}
- for ( Taglet taglet1 : taglets )
- {
- if ( ( taglet1 == null ) || ( StringUtils.isEmpty( taglet1.getTagletClass() ) ) )
- {
- if ( getLog().isWarnEnabled() )
- {
- getLog().warn( "A taglet option is empty. Ignore this option." );
- }
- }
- else
- {
- addArgIfNotEmpty( arguments, "-taglet", JavadocUtil.quotedArgument( taglet1.getTagletClass() ),
- SINCE_JAVADOC_1_4 );
+ for (Taglet taglet1 : taglets) {
+ if ((taglet1 == null) || (StringUtils.isEmpty(taglet1.getTagletClass()))) {
+ if (getLog().isWarnEnabled()) {
+ getLog().warn("A taglet option is empty. Ignore this option.");
+ }
+ } else {
+ addArgIfNotEmpty(arguments, "-taglet", JavadocUtil.quotedArgument(taglet1.getTagletClass()),
+ SINCE_JAVADOC_1_4);
}
}
}
@@ -5046,12 +5036,7 @@ public abstract class AbstractJavadocMoj
output ) )
{
- throw new MavenReportException( output + '\n' + '\n' + JavadocUtil.ERROR_INIT_VM + '\n'
- + "Or, try to reduce the Java heap size for the Javadoc goal using "
- + "-Dminmemory=<size> and -Dmaxmemory=<size>." + '\n' + '\n'
- + "Command line was: " + cmdLine + '\n' + '\n'
- + "Refer to the generated Javadoc files in '"
- + javadocOutputDirectory + "' dir.\n" );
+ throw new MavenReportException(output + '\n' + '\n' + JavadocUtil.ERROR_INIT_VM + '\n' + "Or, try to reduce the Java heap size for the Javadoc goal using " + "-Dminmemory=<size> and -Dmaxmemory=<size>." + '\n' + '\n' + "Command line was: " + cmdLine + '\n' + '\n' + "Refer to the generated Javadoc files in '" + javadocOutputDirectory + "' dir.\n");
}
if ( StringUtils.isNotEmpty( output ) )
@@ -5278,7 +5263,7 @@ public abstract class AbstractJavadocMoj
}
}
- ClassLoader javadocClassLoader = new URLClassLoader( urls.toArray( new URL[urls.size()] ), null );
+ ClassLoader javadocClassLoader = new URLClassLoader(urls.toArray( new URL[urls.size()] ), null );
return javadocClassLoader.getResource( resource );
}
@@ -5802,8 +5787,8 @@ public abstract class AbstractJavadocMoj
if ( plugin != null )
{
Xpp3Dom xpp3Dom = (Xpp3Dom) plugin.getConfiguration();
- if ( xpp3Dom != null && xpp3Dom.getChild( param ) != null && StringUtils.isNotEmpty(
- xpp3Dom.getChild( param ).getValue() ) )
+ if ( xpp3Dom != null && xpp3Dom.getChild( param ) != null
+ && StringUtils.isNotEmpty( xpp3Dom.getChild( param ).getValue() ) )
{
return xpp3Dom.getChild( param ).getValue();
}
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java Tue Aug 27 18:25:03 2013
@@ -100,17 +100,13 @@ import java.util.regex.PatternSyntaxExce
*/
public class JavadocUtil
{
- /**
- * The default timeout used when fetching url, i.e. 2000.
- */
+ /** The default timeout used when fetching url, i.e. 2000. */
public static final int DEFAULT_TIMEOUT = 2000;
- /**
- * Error message when VM could not be started using invoker.
- */
+ /** Error message when VM could not be started using invoker. */
protected static final String ERROR_INIT_VM =
"Error occurred during initialization of VM, try to reduce the Java heap size for the MAVEN_OPTS "
- + "environnement variable using -Xms:<size> and -Xmx:<size>.";
+ + "environnement variable using -Xms:<size> and -Xmx:<size>.";
/**
* Method that removes the invalid directories in the specified directories.
@@ -118,7 +114,7 @@ public class JavadocUtil
* directory <code>String</code> path.
*
* @param project the current Maven project not null
- * @param dirs the list of <code>String</code> directories path that will be validated.
+ * @param dirs the list of <code>String</code> directories path that will be validated.
* @return a List of valid <code>String</code> directories absolute paths.
*/
public static List<String> pruneDirs( MavenProject project, List<String> dirs )
@@ -163,7 +159,7 @@ public class JavadocUtil
pruned.add( f );
}
}
-
+
return pruned;
}
@@ -181,7 +177,7 @@ public class JavadocUtil
return false;
}
}
-
+
return true;
}
@@ -200,10 +196,9 @@ public class JavadocUtil
List<String> excludedNames = new ArrayList<String>();
for ( String path : sourcePaths )
{
- for ( String aSubpackagesList : subpackagesList )
- {
- List<String> excludes = getExcludedPackages( path, excludedPackages );
- excludedNames.addAll( excludes );
+ for (String aSubpackagesList : subpackagesList) {
+ List<String> excludes = getExcludedPackages(path, excludedPackages);
+ excludedNames.addAll(excludes);
}
}
@@ -212,7 +207,6 @@ public class JavadocUtil
/**
* Copy from {@link org.apache.maven.project.MavenProject#getCompileArtifacts()}
- *
* @param artifacts not null
* @return list of compile artifacts with compile scope
* @deprecated since 2.5, using {@link #getCompileArtifacts(Set, boolean)} instead of.
@@ -224,8 +218,7 @@ public class JavadocUtil
/**
* Copy from {@link org.apache.maven.project.MavenProject#getCompileArtifacts()}
- *
- * @param artifacts not null
+ * @param artifacts not null
* @param withTestScope flag to include or not the artifacts with test scope
* @return list of compile artifacts with or without test scope.
*/
@@ -241,8 +234,10 @@ public class JavadocUtil
// TODO: let the scope handler deal with this
if ( withTestScope )
{
- if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_PROVIDED.equals( a.getScope() )
- || Artifact.SCOPE_SYSTEM.equals( a.getScope() ) || Artifact.SCOPE_TEST.equals( a.getScope() ) )
+ if ( Artifact.SCOPE_COMPILE.equals( a.getScope() )
+ || Artifact.SCOPE_PROVIDED.equals( a.getScope() )
+ || Artifact.SCOPE_SYSTEM.equals( a.getScope() )
+ || Artifact.SCOPE_TEST.equals( a.getScope() ) )
{
list.add( a );
}
@@ -276,7 +271,7 @@ public class JavadocUtil
if ( StringUtils.isNotEmpty( arg ) )
{
- if ( arg.contains( "'" ) )
+ if (arg.contains("'"))
{
arg = StringUtils.replace( arg, "'", "\\'" );
}
@@ -303,7 +298,7 @@ public class JavadocUtil
if ( StringUtils.isNotEmpty( path ) )
{
path = path.replace( '\\', '/' );
- if ( path.contains( "\'" ) )
+ if (path.contains("\'"))
{
String split[] = path.split( "\'" );
path = "";
@@ -331,7 +326,7 @@ public class JavadocUtil
* to the <code>outputDirectory</code>.
*
* @param outputDirectory the output directory
- * @param javadocDir the javadoc directory
+ * @param javadocDir the javadoc directory
* @throws IOException if any
* @deprecated since 2.5, using {@link #copyJavadocResources(File, File, String)} instead of.
*/
@@ -345,8 +340,8 @@ public class JavadocUtil
* Convenience method that copy all <code>doc-files</code> directories from <code>javadocDir</code>
* to the <code>outputDirectory</code>.
*
- * @param outputDirectory the output directory
- * @param javadocDir the javadoc directory
+ * @param outputDirectory the output directory
+ * @param javadocDir the javadoc directory
* @param excludedocfilessubdir the excludedocfilessubdir parameter
* @throws IOException if any
* @since 2.5
@@ -373,17 +368,17 @@ public class JavadocUtil
}
}
- List<String> docFiles = FileUtils.getDirectoryNames( javadocDir, "resources,**/doc-files",
- StringUtils.join( excludes.iterator(), "," ), false,
- true );
+ List<String> docFiles =
+ FileUtils.getDirectoryNames( javadocDir, "resources,**/doc-files",
+ StringUtils.join( excludes.iterator(), "," ), false, true );
for ( String docFile : docFiles )
{
File docFileOutput = new File( outputDirectory, docFile );
FileUtils.mkdir( docFileOutput.getAbsolutePath() );
FileUtils.copyDirectoryStructure( new File( javadocDir, docFile ), docFileOutput );
List<String> files =
- FileUtils.getFileAndDirectoryNames( docFileOutput, StringUtils.join( excludes.iterator(), "," ), null,
- true, true, true, true );
+ FileUtils.getFileAndDirectoryNames( docFileOutput, StringUtils.join( excludes.iterator(), "," ),
+ null, true, true, true, true );
for ( String filename : files )
{
File file = new File( filename );
@@ -413,62 +408,46 @@ public class JavadocUtil
{
List<String> files = new ArrayList<String>();
- for ( String aFileList : fileList )
- {
+ for (String aFileList : fileList) {
boolean include = true;
- for ( int k = 0; k < excludePackages.length && include; k++ )
- {
+ for (int k = 0; k < excludePackages.length && include; k++) {
// handle wildcards (*) in the excludePackageNames
- String[] excludeName = excludePackages[k].split( "[*]" );
+ String[] excludeName = excludePackages[k].split("[*]");
- if ( excludeName.length == 0 )
- {
+ if (excludeName.length == 0) {
continue;
}
- if ( excludeName.length > 1 )
- {
+ if (excludeName.length > 1) {
int u = 0;
- while ( include && u < excludeName.length )
- {
- if ( !"".equals( excludeName[u].trim() ) && aFileList.contains( excludeName[u] ) )
- {
+ while (include && u < excludeName.length) {
+ if (!"".equals(excludeName[u].trim()) && aFileList.contains(excludeName[u])) {
include = false;
}
u++;
}
- }
- else
- {
- if ( aFileList.startsWith( sourceDirectory.toString() + File.separatorChar + excludeName[0] ) )
- {
- if ( excludeName[0].endsWith( String.valueOf( File.separatorChar ) ) )
- {
- int i = aFileList.lastIndexOf( File.separatorChar );
- String packageName = aFileList.substring( 0, i + 1 );
- File currentPackage = new File( packageName );
- File excludedPackage = new File( sourceDirectory, excludeName[0] );
- if ( currentPackage.equals( excludedPackage ) && aFileList.substring( i ).contains(
- ".java" ) )
- {
+ } else {
+ if (aFileList.startsWith(sourceDirectory.toString() + File.separatorChar + excludeName[0])) {
+ if (excludeName[0].endsWith(String.valueOf(File.separatorChar))) {
+ int i = aFileList.lastIndexOf(File.separatorChar);
+ String packageName = aFileList.substring(0, i + 1);
+ File currentPackage = new File(packageName);
+ File excludedPackage = new File(sourceDirectory, excludeName[0]);
+ if (currentPackage.equals(excludedPackage)
+ && aFileList.substring(i).contains(".java")) {
include = true;
- }
- else
- {
+ } else {
include = false;
}
- }
- else
- {
+ } else {
include = false;
}
}
}
}
- if ( include )
- {
- files.add( quotedPathArgument( aFileList ) );
+ if (include) {
+ files.add(quotedPathArgument(aFileList));
}
}
@@ -486,19 +465,15 @@ public class JavadocUtil
protected static List<String> getExcludedPackages( String sourceDirectory, String[] excludePackagenames )
{
List<String> files = new ArrayList<String>();
- for ( String excludePackagename : excludePackagenames )
- {
- String[] fileList = FileUtils.getFilesFromExtension( sourceDirectory, new String[]{ "java" } );
- for ( String aFileList : fileList )
- {
- String[] excludeName = excludePackagename.split( "[*]" );
+ for (String excludePackagename : excludePackagenames) {
+ String[] fileList = FileUtils.getFilesFromExtension(sourceDirectory, new String[]{"java"});
+ for (String aFileList : fileList) {
+ String[] excludeName = excludePackagename.split("[*]");
int u = 0;
- while ( u < excludeName.length )
- {
- if ( !"".equals( excludeName[u].trim() ) && aFileList.contains( excludeName[u] )
- && !sourceDirectory.contains( excludeName[u] ) )
- {
- files.add( aFileList );
+ while (u < excludeName.length) {
+ if (!"".equals(excludeName[u].trim()) && aFileList.contains(excludeName[u])
+ && !sourceDirectory.contains(excludeName[u])) {
+ files.add(aFileList);
}
u++;
}
@@ -527,11 +502,13 @@ public class JavadocUtil
* Convenience method that gets the files to be included in the javadoc.
*
* @param sourceDirectory the directory where the source files are located
- * @param files the variable that contains the appended filenames of the files to be included in the javadoc
+ * @param files the variable that contains the appended filenames of the files to be included in the javadoc
* @param excludePackages the packages to be excluded in the javadocs
*/
- protected static void addFilesFromSource( List<String> files, File sourceDirectory, List<String> sourceFileIncludes,
- List<String> sourceFileExcludes, String[] excludePackages )
+ protected static void addFilesFromSource( List<String> files, File sourceDirectory,
+ List<String> sourceFileIncludes,
+ List<String> sourceFileExcludes,
+ String[] excludePackages )
{
DirectoryScanner ds = new DirectoryScanner();
if ( sourceFileIncludes == null )
@@ -550,10 +527,11 @@ public class JavadocUtil
String[] pathList = new String[fileList.length];
for ( int x = 0; x < fileList.length; x++ )
{
- pathList[x] = new File( sourceDirectory, fileList[x] ).getAbsolutePath();
+ pathList[x] = new File( sourceDirectory, fileList[x] ).getAbsolutePath( );
}
- if ( pathList.length != 0 )
+
+ if ( pathList.length != 0 )
{
List<String> tmpFiles = getIncludedFiles( sourceDirectory, pathList, excludePackages );
files.addAll( tmpFiles );
@@ -568,15 +546,14 @@ public class JavadocUtil
*
* @param javadocExe not null file
* @return the javadoc version as float
- * @throws IOException if javadocExe is null, doesn't exist or is not a file
- * @throws CommandLineException if any
+ * @throws IOException if javadocExe is null, doesn't exist or is not a file
+ * @throws CommandLineException if any
* @throws IllegalArgumentException if no output was found in the command line
- * @throws PatternSyntaxException if the output contains a syntax error in the regular-expression pattern.
+ * @throws PatternSyntaxException if the output contains a syntax error in the regular-expression pattern.
* @see #parseJavadocVersion(String)
*/
protected static float getJavadocVersion( File javadocExe )
- throws IOException, CommandLineException, IllegalArgumentException
- {
+ throws IOException, CommandLineException, IllegalArgumentException {
if ( ( javadocExe == null ) || ( !javadocExe.exists() ) || ( !javadocExe.isFile() ) )
{
throw new IOException( "The javadoc executable '" + javadocExe + "' doesn't exist or is not a file. " );
@@ -618,44 +595,43 @@ public class JavadocUtil
* Here are some output for 'javadoc -J-version' depending the JDK used:
* <table>
* <tr>
- * <th>JDK</th>
- * <th>Output for 'javadoc -J-version'</th>
+ * <th>JDK</th>
+ * <th>Output for 'javadoc -J-version'</th>
* </tr>
* <tr>
- * <td>Sun 1.4</td>
- * <td>java full version "1.4.2_12-b03"</td>
+ * <td>Sun 1.4</td>
+ * <td>java full version "1.4.2_12-b03"</td>
* </tr>
* <tr>
- * <td>Sun 1.5</td>
- * <td>java full version "1.5.0_07-164"</td>
+ * <td>Sun 1.5</td>
+ * <td>java full version "1.5.0_07-164"</td>
* </tr>
* <tr>
- * <td>IBM 1.4</td>
- * <td>javadoc full version "J2RE 1.4.2 IBM Windows 32 build cn1420-20040626"</td>
+ * <td>IBM 1.4</td>
+ * <td>javadoc full version "J2RE 1.4.2 IBM Windows 32 build cn1420-20040626"</td>
* </tr>
* <tr>
- * <td>IBM 1.5 (French JVM)</td>
- * <td>javadoc version complète de "J2RE 1.5.0 IBM Windows 32 build pwi32pdev-20070426a"</td>
+ * <td>IBM 1.5 (French JVM)</td>
+ * <td>javadoc version complète de "J2RE 1.5.0 IBM Windows 32 build pwi32pdev-20070426a"</td>
* </tr>
* <tr>
- * <td>FreeBSD 1.5</td>
- * <td>java full version "diablo-1.5.0-b01"</td>
+ * <td>FreeBSD 1.5</td>
+ * <td>java full version "diablo-1.5.0-b01"</td>
* </tr>
* <tr>
- * <td>BEA jrockit 1.5</td>
- * <td>java full version "1.5.0_11-b03"</td>
+ * <td>BEA jrockit 1.5</td>
+ * <td>java full version "1.5.0_11-b03"</td>
* </tr>
* </table>
*
* @param output for 'javadoc -J-version'
* @return the version of the javadoc for the output.
- * @throws PatternSyntaxException if the output doesn't match with the output pattern
- * <tt>(?s).*?([0-9]+\\.[0-9]+)(\\.([0-9]+))?.*</tt>.
+ * @throws PatternSyntaxException if the output doesn't match with the output pattern
+ * <tt>(?s).*?([0-9]+\\.[0-9]+)(\\.([0-9]+))?.*</tt>.
* @throws IllegalArgumentException if the output is null
*/
protected static float parseJavadocVersion( String output )
- throws IllegalArgumentException
- {
+ throws IllegalArgumentException {
if ( StringUtils.isEmpty( output ) )
{
throw new IllegalArgumentException( "The output could not be null." );
@@ -689,27 +665,27 @@ public class JavadocUtil
* Here are some supported memory string depending the JDK used:
* <table>
* <tr>
- * <th>JDK</th>
- * <th>Memory argument support for <code>-Xms</code> or <code>-Xmx</code></th>
+ * <th>JDK</th>
+ * <th>Memory argument support for <code>-Xms</code> or <code>-Xmx</code></th>
* </tr>
* <tr>
- * <td>SUN</td>
- * <td>1024k | 128m | 1g | 1t</td>
+ * <td>SUN</td>
+ * <td>1024k | 128m | 1g | 1t</td>
* </tr>
* <tr>
- * <td>IBM</td>
- * <td>1024k | 1024b | 128m | 128mb | 1g | 1gb</td>
+ * <td>IBM</td>
+ * <td>1024k | 1024b | 128m | 128mb | 1g | 1gb</td>
* </tr>
* <tr>
- * <td>BEA</td>
- * <td>1024k | 1024kb | 128m | 128mb | 1g | 1gb</td>
+ * <td>BEA</td>
+ * <td>1024k | 1024kb | 128m | 128mb | 1g | 1gb</td>
* </tr>
* </table>
*
* @param memory the memory to be parsed, not null.
* @return the memory parsed with a supported unit. If no unit specified in the <code>memory</code> parameter,
- * the default unit is <code>m</code>. The units <code>g | gb</code> or <code>t | tb</code> will be converted
- * in <code>m</code>.
+ * the default unit is <code>m</code>. The units <code>g | gb</code> or <code>t | tb</code> will be converted
+ * in <code>m</code>.
* @throws IllegalArgumentException if the <code>memory</code> parameter is null or doesn't match any pattern.
*/
protected static String parseJavadocMemory( String memory )
@@ -793,7 +769,7 @@ public class JavadocUtil
* For security reasons, if an active proxy is defined and needs an authentication by
* username/password, hide the proxy password in the command line.
*
- * @param cmdLine a command line, not null
+ * @param cmdLine a command line, not null
* @param settings the user settings
* @return the cmdline with '*' for the http.proxyPassword JVM property
*/
@@ -810,8 +786,9 @@ public class JavadocUtil
}
Proxy activeProxy = settings.getActiveProxy();
- if ( activeProxy != null && StringUtils.isNotEmpty( activeProxy.getHost() ) && StringUtils.isNotEmpty(
- activeProxy.getUsername() ) && StringUtils.isNotEmpty( activeProxy.getPassword() ) )
+ if ( activeProxy != null && StringUtils.isNotEmpty( activeProxy.getHost() )
+ && StringUtils.isNotEmpty( activeProxy.getUsername() )
+ && StringUtils.isNotEmpty( activeProxy.getPassword() ) )
{
String pass = "-J-Dhttp.proxyPassword=\"" + activeProxy.getPassword() + "\"";
String hidepass =
@@ -832,10 +809,10 @@ public class JavadocUtil
*
* @param jarFile not null
* @return the list of <code>com.sun.tools.doclets.Taglet</code> class names from a given jarFile.
- * @throws IOException if jarFile is invalid or not found, or if the <code>JAVA_HOME/lib/tools.jar</code>
- * is not found.
+ * @throws IOException if jarFile is invalid or not found, or if the <code>JAVA_HOME/lib/tools.jar</code>
+ * is not found.
* @throws ClassNotFoundException if any
- * @throws NoClassDefFoundError if any
+ * @throws NoClassDefFoundError if any
*/
protected static List<String> getTagletClassNames( File jarFile )
throws IOException, ClassNotFoundException, NoClassDefFoundError
@@ -847,11 +824,11 @@ public class JavadocUtil
File tools = new File( System.getProperty( "java.home" ), "../lib/tools.jar" );
if ( tools.exists() && tools.isFile() )
{
- cl = new URLClassLoader( new URL[]{ jarFile.toURI().toURL(), tools.toURI().toURL() }, null );
+ cl = new URLClassLoader( new URL[] { jarFile.toURI().toURL(), tools.toURI().toURL() }, null );
}
else
{
- cl = new URLClassLoader( new URL[]{ jarFile.toURI().toURL() }, null );
+ cl = new URLClassLoader( new URL[] { jarFile.toURI().toURL() }, null );
}
List<String> tagletClasses = new ArrayList<String>();
@@ -873,7 +850,7 @@ public class JavadocUtil
/**
* Copy the given url to the given file.
*
- * @param url not null url
+ * @param url not null url
* @param file not null file where the url will be created
* @throws IOException if any
* @since 2.6
@@ -923,12 +900,12 @@ public class JavadocUtil
* <b>Note</b>: the Maven Home should be defined in the <code>maven.home</code> Java system property or defined in
* <code>M2_HOME</code> system env variables.
*
- * @param log a logger could be null.
+ * @param log a logger could be null.
* @param localRepositoryDir the localRepository not null.
- * @param projectFile a not null project file.
- * @param goals a not null goals list.
- * @param properties the properties for the goals, could be null.
- * @param invokerLog the log file where the invoker will be written, if null using <code>System.out</code>.
+ * @param projectFile a not null project file.
+ * @param goals a not null goals list.
+ * @param properties the properties for the goals, could be null.
+ * @param invokerLog the log file where the invoker will be written, if null using <code>System.out</code>.
* @throws MavenInvocationException if any
* @since 2.6
*/
@@ -950,15 +927,16 @@ public class JavadocUtil
}
if ( localRepositoryDir == null || !localRepositoryDir.isDirectory() )
{
- throw new IllegalArgumentException(
- "localRepositoryDir '" + localRepositoryDir + "' should be a directory." );
+ throw new IllegalArgumentException( "localRepositoryDir '" + localRepositoryDir
+ + "' should be a directory." );
}
String mavenHome = getMavenHome( log );
if ( StringUtils.isEmpty( mavenHome ) )
{
- String msg = "Could NOT invoke Maven because no Maven Home is defined. You need to have set the M2_HOME "
- + "system env variable or a maven.home Java system properties.";
+ String msg =
+ "Could NOT invoke Maven because no Maven Home is defined. You need to have set the M2_HOME "
+ + "system env variable or a maven.home Java system properties.";
if ( log != null )
{
log.error( msg );
@@ -998,9 +976,8 @@ public class JavadocUtil
if ( log != null && log.isDebugEnabled() )
{
- log.debug( "Invoking Maven for the goals: " + goals + " with " + ( properties == null
- ? "no properties"
- : "properties=" + properties ) );
+ log.debug( "Invoking Maven for the goals: " + goals + " with "
+ + ( properties == null ? "no properties" : "properties=" + properties ) );
}
InvocationResult result = invoke( log, invoker, request, invokerLog, goals, properties, null );
@@ -1009,8 +986,8 @@ public class JavadocUtil
String invokerLogContent = readFile( invokerLog, "UTF-8" );
// see DefaultMaven
- if ( invokerLogContent != null && ( !invokerLogContent.contains( "Scanning for projects..." )
- || invokerLogContent.contains( OutOfMemoryError.class.getName() ) ) )
+ if ( invokerLogContent != null && (!invokerLogContent.contains("Scanning for projects...")
+ || invokerLogContent.contains(OutOfMemoryError.class.getName())) )
{
if ( log != null )
{
@@ -1030,14 +1007,14 @@ public class JavadocUtil
String invokerLogContent = readFile( invokerLog, "UTF-8" );
// see DefaultMaven
- if ( invokerLogContent != null && ( !invokerLogContent.contains( "Scanning for projects..." )
- || invokerLogContent.contains( OutOfMemoryError.class.getName() ) ) )
+ if ( invokerLogContent != null && (!invokerLogContent.contains("Scanning for projects...")
+ || invokerLogContent.contains(OutOfMemoryError.class.getName())) )
{
throw new MavenInvocationException( ERROR_INIT_VM );
}
- throw new MavenInvocationException(
- "Error when invoking Maven, consult the invoker log file: " + invokerLog.getAbsolutePath() );
+ throw new MavenInvocationException( "Error when invoking Maven, consult the invoker log file: "
+ + invokerLog.getAbsolutePath() );
}
}
@@ -1073,7 +1050,7 @@ public class JavadocUtil
* </pre>
*
* @param path which can contain multiple paths separated with a colon (<code>:</code>) or a
- * semi-colon (<code>;</code>), platform independent. Could be null.
+ * semi-colon (<code>;</code>), platform independent. Could be null.
* @return the path splitted by colon or semi-colon or <code>null</code> if path was <code>null</code>.
* @since 2.6.1
*/
@@ -1103,12 +1080,12 @@ public class JavadocUtil
* </pre>
*
* @param path which can contain multiple paths by separating them with a colon (<code>:</code>) or a
- * semi-colon (<code>;</code>), platform independent. Could be null.
+ * semi-colon (<code>;</code>), platform independent. Could be null.
* @return the same path but separated with the current System path separator or <code>null</code> if path was
- * <code>null</code>.
+ * <code>null</code>.
+ * @since 2.6.1
* @see #splitPath(String)
* @see File#pathSeparator
- * @since 2.6.1
*/
protected static String unifyPathSeparator( final String path )
{
@@ -1166,13 +1143,13 @@ public class JavadocUtil
}
/**
- * @param log could be null
- * @param invoker not null
- * @param request not null
+ * @param log could be null
+ * @param invoker not null
+ * @param request not null
* @param invokerLog not null
- * @param goals not null
+ * @param goals not null
* @param properties could be null
- * @param mavenOpts could be null
+ * @param mavenOpts could be null
* @return the invocation result
* @throws MavenInvocationException if any
* @since 2.6
@@ -1212,8 +1189,8 @@ public class JavadocUtil
{
if ( log != null && log.isErrorEnabled() )
{
- log.error(
- "UnsupportedEncodingException: " + e.getMessage() + ". Using System.out to log the invoker." );
+ log.error( "UnsupportedEncodingException: " + e.getMessage()
+ + ". Using System.out to log the invoker." );
}
ps = System.out;
}
@@ -1236,9 +1213,8 @@ public class JavadocUtil
InvocationOutputHandler outputHandler = new PrintStreamHandler( ps, false );
request.setOutputHandler( outputHandler );
- outputHandler.consumeLine( "Invoking Maven for the goals: " + goals + " with " + ( properties == null
- ? "no properties"
- : "properties=" + properties ) );
+ outputHandler.consumeLine( "Invoking Maven for the goals: " + goals + " with "
+ + ( properties == null ? "no properties" : "properties=" + properties ) );
outputHandler.consumeLine( "" );
outputHandler.consumeLine( "M2_HOME=" + getMavenHome( log ) );
outputHandler.consumeLine( "MAVEN_OPTS=" + getMavenOpts( log ) );
@@ -1259,7 +1235,7 @@ public class JavadocUtil
/**
* @param log a logger could be null
* @return the Maven home defined in the <code>maven.home</code> system property or defined
- * in <code>M2_HOME</code> system env variables or null if never set.
+ * in <code>M2_HOME</code> system env variables or null if never set.
* @since 2.6
*/
private static String getMavenHome( Log log )
@@ -1285,8 +1261,9 @@ public class JavadocUtil
{
if ( log != null && log.isErrorEnabled() )
{
- log.error( "Cannot find Maven application directory. Either specify \'maven.home\' system property, or "
- + "M2_HOME environment variable." );
+ log
+ .error( "Cannot find Maven application directory. Either specify \'maven.home\' system property, or "
+ + "M2_HOME environment variable." );
}
}
@@ -1319,8 +1296,8 @@ public class JavadocUtil
/**
* @param log a logger could be null
* @return the <code>JAVA_HOME</code> from System.getProperty( "java.home" )
- * By default, <code>System.getProperty( "java.home" ) = JRE_HOME</code> and <code>JRE_HOME</code>
- * should be in the <code>JDK_HOME</code>
+ * By default, <code>System.getProperty( "java.home" ) = JRE_HOME</code> and <code>JRE_HOME</code>
+ * should be in the <code>JDK_HOME</code>
* @since 2.6
*/
private static File getJavaHome( Log log )
@@ -1355,7 +1332,7 @@ public class JavadocUtil
if ( log != null && log.isErrorEnabled() )
{
log.error( "Cannot find Java application directory. Either specify \'java.home\' system property, or "
- + "JAVA_HOME environment variable." );
+ + "JAVA_HOME environment variable." );
}
}
@@ -1388,12 +1365,12 @@ public class JavadocUtil
/**
* A Path tokenizer takes a path and returns the components that make up
* that path.
- * <p/>
+ *
* The path can use path separators of either ':' or ';' and file separators
* of either '/' or '\'.
*
* @version revision 439418 taken on 2009-09-12 from Ant Project
- * (see http://svn.apache.org/repos/asf/ant/core/trunk/src/main/org/apache/tools/ant/PathTokenizer.java)
+ * (see http://svn.apache.org/repos/asf/ant/core/trunk/src/main/org/apache/tools/ant/PathTokenizer.java)
*/
private static class PathTokenizer
{
@@ -1449,7 +1426,7 @@ public class JavadocUtil
* to nextToken will successfully return a token.
*
* @return <code>true</code> if and only if there is at least one token
- * in the string after the current position; <code>false</code> otherwise.
+ * in the string after the current position; <code>false</code> otherwise.
*/
public boolean hasMoreTokens()
{
@@ -1461,8 +1438,9 @@ public class JavadocUtil
* Returns the next path element from this tokenizer.
*
* @return the next path element from this tokenizer.
- * @throws NoSuchElementException if there are no more elements in this
- * tokenizer's path.
+ *
+ * @exception NoSuchElementException if there are no more elements in this
+ * tokenizer's path.
*/
public String nextToken()
throws NoSuchElementException
@@ -1549,19 +1527,19 @@ public class JavadocUtil
return token;
}
}
-
+
static List<String> toList( String src )
{
return toList( src, null, null );
}
-
+
static List<String> toList( String src, String elementPrefix, String elementSuffix )
{
if ( StringUtils.isEmpty( src ) )
{
return null;
}
-
+
List<String> result = new ArrayList<String>();
StringTokenizer st = new StringTokenizer( src, "[,:;]" );
@@ -1573,46 +1551,46 @@ public class JavadocUtil
{
sb.append( elementPrefix );
}
-
+
sb.append( st.nextToken() );
-
+
if ( StringUtils.isNotEmpty( elementSuffix ) )
{
sb.append( elementSuffix );
}
-
+
result.add( sb.toString() );
}
-
+
return result;
}
-
+
static <T> List<T> toList( T[] multiple )
{
return toList( null, multiple );
}
-
+
static <T> List<T> toList( T single, T[] multiple )
{
if ( single == null && ( multiple == null || multiple.length < 1 ) )
{
return null;
}
-
+
List<T> result = new ArrayList<T>();
if ( single != null )
{
result.add( single );
}
-
+
if ( multiple != null && multiple.length > 0 )
{
result.addAll( Arrays.asList( multiple ) );
}
-
+
return result;
}
-
+
// TODO: move to plexus-utils or use something appropriate from there
public static String toRelative( File basedir, String absolutePath )
{
@@ -1640,7 +1618,7 @@ public class JavadocUtil
return relative;
}
-
+
/**
* Convenience method to determine that a collection is not empty or null.
*/
@@ -1648,7 +1626,7 @@ public class JavadocUtil
{
return collection != null && !collection.isEmpty();
}
-
+
/**
* Convenience method to determine that a collection is empty or null.
*/
@@ -1660,14 +1638,18 @@ public class JavadocUtil
/**
* Validates an <code>URL</code> to point to a valid <code>package-list</code> resource.
*
- * @param url The URL to validate.
- * @param settings The user settings used to configure the connection to the URL or {@code null}.
+ * @param url The URL to validate.
+ * @param settings The user settings used to configure the connection to the URL or {@code null}.
* @param validateContent <code>true</code> to validate the content of the <code>package-list</code> resource;
- * <code>false</code> to only check the existence of the <code>package-list</code> resource.
+ * <code>false</code> to only check the existence of the <code>package-list</code> resource.
+ *
* @return <code>true</code> if <code>url</code> points to a valid <code>package-list</code> resource;
- * <code>false</code> else.
+ * <code>false</code> else.
+ *
* @throws IOException if reading the resource fails.
+ *
* @see #createHttpClient(org.apache.maven.settings.Settings, java.net.URL)
+ *
* @since 2.8
*/
protected static boolean isValidPackageList( URL url, Settings settings, boolean validateContent )
@@ -1790,8 +1772,10 @@ public class JavadocUtil
* Creates a new {@code HttpClient} instance.
*
* @param settings The settings to use for setting up the client or {@code null}.
- * @param url The {@code URL} to use for setting up the client or {@code null}.
+ * @param url The {@code URL} to use for setting up the client or {@code null}.
+ *
* @return A new {@code HttpClient} instance.
+ *
* @see #DEFAULT_TIMEOUT
* @since 2.8
*/
@@ -1813,18 +1797,18 @@ public class JavadocUtil
ProxyInfo proxyInfo = new ProxyInfo();
proxyInfo.setNonProxyHosts( activeProxy.getNonProxyHosts() );
- if ( StringUtils.isNotEmpty( activeProxy.getHost() ) && ( url == null || !ProxyUtils.validateNonProxyHosts(
- proxyInfo, url.getHost() ) ) )
+ if ( StringUtils.isNotEmpty( activeProxy.getHost() )
+ && ( url == null || !ProxyUtils.validateNonProxyHosts( proxyInfo, url.getHost() ) ) )
{
- HttpHost proxy = new HttpHost( activeProxy.getHost(), activeProxy.getPort() );
- httpClient.getParams().setParameter( ConnRoutePNames.DEFAULT_PROXY, proxy );
+ HttpHost proxy = new HttpHost(activeProxy.getHost(), activeProxy.getPort());
+ httpClient.getParams().setParameter(ConnRoutePNames.DEFAULT_PROXY, proxy);
if ( StringUtils.isNotEmpty( activeProxy.getUsername() ) && activeProxy.getPassword() != null )
{
Credentials credentials =
new UsernamePasswordCredentials( activeProxy.getUsername(), activeProxy.getPassword() );
- httpClient.getCredentialsProvider().setCredentials( AuthScope.ANY, credentials );
+ httpClient.getCredentialsProvider().setCredentials(AuthScope.ANY, credentials);
}
}
}
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/ResourceResolver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/ResourceResolver.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/ResourceResolver.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/resolver/ResourceResolver.java Tue Aug 27 18:25:03 2013
@@ -61,11 +61,11 @@ public final class ResourceResolver
public static final String TEST_SOURCES_CLASSIFIER = "test-sources";
private static final List<String> SOURCE_VALID_CLASSIFIERS =
- Arrays.asList( SOURCES_CLASSIFIER, TEST_SOURCES_CLASSIFIER );
+ Arrays.asList(SOURCES_CLASSIFIER, TEST_SOURCES_CLASSIFIER);
private static final List<String> RESOURCE_VALID_CLASSIFIERS =
- Arrays.asList( AbstractJavadocMojo.JAVADOC_RESOURCES_ATTACHMENT_CLASSIFIER,
- AbstractJavadocMojo.TEST_JAVADOC_RESOURCES_ATTACHMENT_CLASSIFIER );
+ Arrays.asList(AbstractJavadocMojo.JAVADOC_RESOURCES_ATTACHMENT_CLASSIFIER,
+ AbstractJavadocMojo.TEST_JAVADOC_RESOURCES_ATTACHMENT_CLASSIFIER);
private ResourceResolver()
{
@@ -146,46 +146,42 @@ public final class ResourceResolver
}
private static List<JavadocBundle> resolveBundleFromProject( SourceResolverConfig config, MavenProject project,
- Artifact artifact )
- throws IOException
+ Artifact artifact ) throws IOException
{
List<JavadocBundle> bundles = new ArrayList<JavadocBundle>();
-
+
List<String> classifiers = new ArrayList<String>();
if ( config.includeCompileSources() )
{
classifiers.add( AbstractJavadocMojo.JAVADOC_RESOURCES_ATTACHMENT_CLASSIFIER );
}
-
+
if ( config.includeTestSources() )
{
classifiers.add( AbstractJavadocMojo.TEST_JAVADOC_RESOURCES_ATTACHMENT_CLASSIFIER );
}
-
+
for ( String classifier : classifiers )
{
- File optionsFile = new File( project.getBuild().getDirectory(),
- "javadoc-bundle-options/javadoc-options-" + classifier + ".xml" );
+ File optionsFile = new File( project.getBuild().getDirectory(), "javadoc-bundle-options/javadoc-options-" + classifier + ".xml" );
if ( !optionsFile.exists() )
{
continue;
}
-
+
FileInputStream stream = null;
try
{
stream = new FileInputStream( optionsFile );
JavadocOptions options = new JavadocOptionsXpp3Reader().read( stream );
-
- bundles.add( new JavadocBundle( options, new File( project.getBasedir(),
- options.getJavadocResourcesDirectory() ) ) );
+
+ bundles.add( new JavadocBundle( options, new File( project.getBasedir(), options.getJavadocResourcesDirectory() ) ) );
}
catch ( XmlPullParserException e )
{
- IOException error = new IOException(
- "Failed to read javadoc options from: " + optionsFile + "\nReason: " + e.getMessage() );
+ IOException error = new IOException( "Failed to read javadoc options from: " + optionsFile + "\nReason: " + e.getMessage() );
error.initCause( e );
-
+
throw error;
}
finally
@@ -212,16 +208,12 @@ public final class ResourceResolver
if ( config.includeCompileSources() )
{
- toResolve.add(
- createResourceArtifact( artifact, AbstractJavadocMojo.JAVADOC_RESOURCES_ATTACHMENT_CLASSIFIER,
- config ) );
+ toResolve.add( createResourceArtifact( artifact, AbstractJavadocMojo.JAVADOC_RESOURCES_ATTACHMENT_CLASSIFIER, config ) );
}
if ( config.includeTestSources() )
{
- toResolve.add(
- createResourceArtifact( artifact, AbstractJavadocMojo.TEST_JAVADOC_RESOURCES_ATTACHMENT_CLASSIFIER,
- config ) );
+ toResolve.add( createResourceArtifact( artifact, AbstractJavadocMojo.TEST_JAVADOC_RESOURCES_ATTACHMENT_CLASSIFIER, config ) );
}
}
@@ -244,7 +236,7 @@ public final class ResourceResolver
config.log().debug( e.getMessage(), e );
}
}
-
+
List<JavadocBundle> result = new ArrayList<JavadocBundle>();
if ( dirs != null )
@@ -268,7 +260,7 @@ public final class ResourceResolver
{
IOException error = new IOException( "Failed to parse javadoc options: " + e.getMessage() );
error.initCause( e );
-
+
throw error;
}
finally
@@ -276,16 +268,15 @@ public final class ResourceResolver
close( reader );
}
}
-
+
result.add( new JavadocBundle( options, resources ) );
}
}
-
+
return result;
}
- private static List<String> resolveFromArtifacts( final SourceResolverConfig config,
- final List<Artifact> artifacts )
+ private static List<String> resolveFromArtifacts( final SourceResolverConfig config, final List<Artifact> artifacts )
throws ArtifactResolutionException, ArtifactNotFoundException
{
final List<Artifact> toResolve = new ArrayList<Artifact>( artifacts.size() );
@@ -352,9 +343,8 @@ public final class ResourceResolver
final ArtifactResolver resolver = config.artifactResolver();
- final ArtifactResolutionResult resolutionResult =
- resolver.resolveTransitively( artifactSet, pomArtifact, localRepo, remoteRepos, metadataSource,
- resolutionFilter );
+ final ArtifactResolutionResult resolutionResult = resolver.resolveTransitively(
+ artifactSet, pomArtifact, localRepo, remoteRepos, metadataSource, resolutionFilter );
final List<String> result = new ArrayList<String>( artifacts.size() );
for ( final Artifact a : (Collection<Artifact>) resolutionResult.getArtifacts() )
@@ -387,8 +377,8 @@ public final class ResourceResolver
{
if ( propagateErrors )
{
- throw new ArtifactResolutionException(
- "Failed to retrieve valid un-archiver component: " + a.getType(), a, e );
+ throw new ArtifactResolutionException( "Failed to retrieve valid un-archiver component: "
+ + a.getType(), a, e );
}
}
catch ( final ArchiverException e )