You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/05/23 10:16:30 UTC
svn commit: r177940 -
/maven/components/trunk/maven-reports/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
Author: brett
Date: Mon May 23 01:16:29 2005
New Revision: 177940
URL: http://svn.apache.org/viewcvs?rev=177940&view=rev
Log:
some cleanup to execute file - still doesnt work when spaces in path
Modified:
maven/components/trunk/maven-reports/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
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=177940&r1=177939&r2=177940&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 Mon May 23 01:16:29 2005
@@ -130,9 +130,14 @@
cl.createArgument().setValue( "-classpath" );
cl.createArgument().setValue( classpath.toString() );
cl.createArgument().setValue( "@files" );
+ System.out.println( getJavadocPath() );
System.out.println( Commandline.toString( cl.getCommandline() ) );
System.out.println( cl.getWorkingDirectory() );
- CommandLineUtils.executeCommandLine( cl, new DefaultConsumer(), new DefaultConsumer() );
+ int exitCode = CommandLineUtils.executeCommandLine( cl, new DefaultConsumer(), new DefaultConsumer() );
+ if ( exitCode != 0 )
+ {
+ throw new MavenReportException( "exit code: " + exitCode );
+ }
}
catch ( Exception e )
{
@@ -171,18 +176,10 @@
*/
private String getJavadocPath()
{
- String osName = System.getProperty( "os.name" );
- String jdkPath;
- if ( osName.startsWith( "Windows" ) )
- {
- jdkPath = "%JAVA_HOME%";
- }
- else
- {
- jdkPath = "$JAVA_HOME";
- }
-
+ // TODO: this could probably be improved/configured
+ // TODO: doesn't work with spaces in java.home
String fileSeparator = System.getProperty( "file.separator" );
- return jdkPath + fileSeparator + "bin" + fileSeparator + "javadoc";
+ File f = new File( System.getProperty( "java.home" ), "bin/javadoc" );
+ return f.getAbsolutePath();
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org