-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[JXR-188] Upgrade to Doxia 2.0.0 Milestone Stack
This closes #64
- Loading branch information
Showing
37 changed files
with
297 additions
and
239 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -31,7 +31,7 @@ | |
import org.apache.maven.project.MavenProject; | ||
|
||
/** | ||
* Creates an html-based, cross referenced version of Java source code | ||
* Creates an HTML-based, cross referenced version of Java source code | ||
* for a project. | ||
* | ||
* @author <a href="mailto:[email protected]">Fabrice Bellingard</a> | ||
|
@@ -52,21 +52,15 @@ public class JxrReport extends AbstractJxrReport { | |
@Parameter | ||
private String sourcePath; | ||
|
||
/** | ||
* Directory where the Xref files will be copied to. | ||
*/ | ||
@Parameter(defaultValue = "${project.reporting.outputDirectory}/xref") | ||
private String destDir; | ||
|
||
/** | ||
* Directory where Javadoc is generated for this project. | ||
*/ | ||
@Parameter(defaultValue = "${project.reporting.outputDirectory}/apidocs") | ||
private File javadocDir; | ||
|
||
@Override | ||
protected String getDestinationDirectory() { | ||
return destDir; | ||
protected File getPluginReportOutputDirectory() { | ||
return new File(getReportOutputDirectory(), "xref"); | ||
} | ||
|
||
@Override | ||
|
@@ -80,12 +74,12 @@ protected List<String> getSourceRoots() { | |
|
||
List<String> l = new ArrayList<>(); | ||
|
||
if (!"pom".equals(getProject().getPackaging().toLowerCase(Locale.US))) { | ||
if (!"pom".equals(getProject().getPackaging().toLowerCase(Locale.ENGLISH))) { | ||
l.addAll(sourceDirs); | ||
} | ||
|
||
if (getProject().getExecutionProject() != null) { | ||
if (!"pom".equals(getProject().getExecutionProject().getPackaging().toLowerCase(Locale.US))) { | ||
if (!"pom".equals(getProject().getExecutionProject().getPackaging().toLowerCase(Locale.ENGLISH))) { | ||
l.addAll(getProject().getExecutionProject().getCompileSourceRoots()); | ||
} | ||
} | ||
|
@@ -97,12 +91,12 @@ protected List<String> getSourceRoots() { | |
protected List<String> getSourceRoots(MavenProject project) { | ||
List<String> l = new ArrayList<>(); | ||
|
||
if (!"pom".equals(project.getPackaging().toLowerCase(Locale.US))) { | ||
if (!"pom".equals(project.getPackaging().toLowerCase(Locale.ENGLISH))) { | ||
l.addAll(project.getCompileSourceRoots()); | ||
} | ||
|
||
if (project.getExecutionProject() != null) { | ||
if (!"pom".equals(project.getExecutionProject().getPackaging().toLowerCase(Locale.US))) { | ||
if (!"pom".equals(project.getExecutionProject().getPackaging().toLowerCase(Locale.ENGLISH))) { | ||
l.addAll(project.getExecutionProject().getCompileSourceRoots()); | ||
} | ||
} | ||
|
@@ -129,14 +123,4 @@ public String getOutputName() { | |
protected File getJavadocDir() { | ||
return javadocDir; | ||
} | ||
|
||
@Override | ||
public void setReportOutputDirectory(File reportOutputDirectory) { | ||
if ((reportOutputDirectory != null) | ||
&& (!reportOutputDirectory.getAbsolutePath().endsWith("xref"))) { | ||
this.destDir = new File(reportOutputDirectory, "xref").getAbsolutePath(); | ||
} else { | ||
this.destDir = reportOutputDirectory.getAbsolutePath(); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.