You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2016/02/19 20:34:27 UTC
svn commit: r1731292 - in
/webservices/axiom/branches/maven-site-plugin-3.5/buildutils/javadoc-postprocessor-plugin:
pom.xml
src/main/java/org/apache/axiom/buildutils/javadoc/PostProcessMojo.java
Author: veithen
Date: Fri Feb 19 19:34:27 2016
New Revision: 1731292
URL: http://svn.apache.org/viewvc?rev=1731292&view=rev
Log:
Make javadoc-postprocessor-plugin work with maven-site-plugin 3.5 (which requires an incompatible change in site.xml).
Modified:
webservices/axiom/branches/maven-site-plugin-3.5/buildutils/javadoc-postprocessor-plugin/pom.xml
webservices/axiom/branches/maven-site-plugin-3.5/buildutils/javadoc-postprocessor-plugin/src/main/java/org/apache/axiom/buildutils/javadoc/PostProcessMojo.java
Modified: webservices/axiom/branches/maven-site-plugin-3.5/buildutils/javadoc-postprocessor-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/buildutils/javadoc-postprocessor-plugin/pom.xml?rev=1731292&r1=1731291&r2=1731292&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/buildutils/javadoc-postprocessor-plugin/pom.xml (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/buildutils/javadoc-postprocessor-plugin/pom.xml Fri Feb 19 19:34:27 2016
@@ -33,7 +33,7 @@
<properties>
<maven.version>3.0</maven.version>
- <doxia.version>1.6</doxia.version>
+ <doxia.version>1.7</doxia.version>
</properties>
<dependencyManagement>
Modified: webservices/axiom/branches/maven-site-plugin-3.5/buildutils/javadoc-postprocessor-plugin/src/main/java/org/apache/axiom/buildutils/javadoc/PostProcessMojo.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/maven-site-plugin-3.5/buildutils/javadoc-postprocessor-plugin/src/main/java/org/apache/axiom/buildutils/javadoc/PostProcessMojo.java?rev=1731292&r1=1731291&r2=1731292&view=diff
==============================================================================
--- webservices/axiom/branches/maven-site-plugin-3.5/buildutils/javadoc-postprocessor-plugin/src/main/java/org/apache/axiom/buildutils/javadoc/PostProcessMojo.java (original)
+++ webservices/axiom/branches/maven-site-plugin-3.5/buildutils/javadoc-postprocessor-plugin/src/main/java/org/apache/axiom/buildutils/javadoc/PostProcessMojo.java Fri Feb 19 19:34:27 2016
@@ -26,7 +26,6 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
-import java.io.StringWriter;
import java.util.List;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -41,10 +40,6 @@ import org.apache.maven.plugins.annotati
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.DirectoryScanner;
-import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
-import org.codehaus.plexus.util.xml.XMLWriter;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.codehaus.plexus.util.xml.Xpp3DomWriter;
@Mojo(name="post-process")
public class PostProcessMojo extends AbstractMojo {
@@ -76,20 +71,13 @@ public class PostProcessMojo extends Abs
public void execute() throws MojoExecutionException, MojoFailureException {
DecorationModel decorationModel;
try {
- decorationModel = siteTool.getDecorationModel(project, reactorProjects, localRepository, repositories,
- siteTool.getRelativePath(siteDirectory.getAbsolutePath(), project.getBasedir().getAbsolutePath()),
- siteTool.getAvailableLocales(locales).get(0));
+ decorationModel = siteTool.getDecorationModel(siteDirectory,
+ siteTool.getSiteLocales(locales).get(0),
+ project, reactorProjects, localRepository, repositories);
} catch (SiteToolException ex) {
throw new MojoExecutionException("SiteToolException: " + ex.getMessage(), ex);
}
- StringWriter sw = new StringWriter();
- XMLWriter xmlWriter = new PrettyPrintXMLWriter(sw, null, null);
- for (Xpp3Dom element : ((Xpp3Dom)decorationModel.getBody().getHead()).getChildren()) {
- // Turn off escaping in scripts. Note that this mimics the behavior in the default-site.vm
- // template in doxia-site-renderer.
- Xpp3DomWriter.write(xmlWriter, element, !element.getName().equals("script"));
- }
- String headElements = sw.toString();
+ String head = decorationModel.getBody().getHead();
DirectoryScanner ds = new DirectoryScanner();
ds.setIncludes(new String[] { "**/*.html" });
ds.setBasedir(javadocDirectory);
@@ -106,7 +94,7 @@ public class PostProcessMojo extends Abs
String line;
while ((line = in.readLine()) != null) {
if (line.equals("</head>")) {
- out.println(headElements);
+ out.println(head);
}
out.println(line);
}