This is an automated email from the ASF dual-hosted git repository. djencks pushed a commit to branch issue-14698-rearrange-adocs in repository https://gitbox.apache.org/repos/asf/camel.git
commit e318725109fe7b3c96ab8b6eb46e108976973917 Author: David Jencks <[email protected]> AuthorDate: Thu Mar 12 11:20:48 2020 -0700 update UpdateReadmeMojo.java to new docs structure; set correct location of eip docs --- .../camel/maven/packaging/UpdateReadmeMojo.java | 36 +++++++++++++++------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java index 6520d8b..9b09b3d 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java @@ -62,15 +62,27 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo { protected File buildDir; /** - * The documentation directory + * The component documentation directory */ @Parameter(defaultValue = "${project.basedir}/src/main/docs") - protected File docDir; + protected File componentDocDir; /** - * The documentation EIP directory + * The dataformat documentation directory */ - @Parameter(defaultValue = "${project.basedir}/src/main/docs/eips") + @Parameter(defaultValue = "${project.basedir}/src/main/docs") + protected File dataformatDocDir; + + /** + * The language documentation directory + */ + @Parameter(defaultValue = "${project.basedir}/src/main/docs/modules/languages/pages") + protected File languageDocDir; + + /** + * The EIP documentation directory + */ + @Parameter(defaultValue = "${project.basedir}/src/main/docs/modules/eips/pages") protected File eipDocDir; /** @@ -82,8 +94,10 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo { @Override public void execute(MavenProject project, MavenProjectHelper projectHelper, BuildContext buildContext) throws MojoFailureException, MojoExecutionException { buildDir = new File(project.getBuild().getDirectory()); - docDir = new File(project.getBasedir(), "src/main/docs"); - eipDocDir = new File(project.getBasedir(), "src/main/docs/eips"); + componentDocDir = new File(project.getBasedir(), "src/main/docs"); + dataformatDocDir = new File(project.getBasedir(), "src/main/docs"); + languageDocDir = new File(project.getBasedir(), "/src/main/docs/modules/languages/pages"); + eipDocDir = new File(project.getBasedir(), "src/main/docs/modules/eips/pages"); super.execute(project, projectHelper, buildContext); } @@ -111,7 +125,7 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo { // special for some components componentName = asComponentName(componentName); - File file = new File(docDir, componentName + "-component.adoc"); + File file = new File(componentDocDir, componentName + "-component.adoc"); ComponentModel model = generateComponentModel(json); String title = asComponentTitle(model.getScheme(), model.getTitle()); @@ -190,7 +204,7 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo { // special for some data formats dataFormatName = asDataFormatName(dataFormatName); - File file = new File(docDir, dataFormatName + "-dataformat.adoc"); + File file = new File(dataformatDocDir, dataFormatName + "-dataformat.adoc"); DataFormatModel model = generateDataFormatModel(json); // Bindy has 3 derived dataformats, but only one doc, so @@ -255,7 +269,7 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo { for (String languageName : languageNames) { String json = loadJsonFrom(jsonFiles, "language", languageName); if (json != null) { - File file = new File(docDir, languageName + "-language.adoc"); + File file = new File(languageDocDir, languageName + "-language.adoc"); LanguageModel model = JsonMapper.generateLanguageModel(json); // skip option named id @@ -304,9 +318,9 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo { } private void executeEips() throws MojoExecutionException { - // only run if in camel-core + // only run if in camel-core-engine String currentDir = Paths.get(".").normalize().toAbsolutePath().toString(); - if (!currentDir.endsWith("camel-core")) { + if (!currentDir.endsWith("camel-core-engine")) { return; }
