diff --git a/chi/org.eclipse.escet.chi.documentation/META-INF/MANIFEST.MF b/chi/org.eclipse.escet.chi.documentation/META-INF/MANIFEST.MF index 6f5be8186c4abcc018f053e7072430f93a835e48..0bde6efd4efdd1dc7763b7186c8b07c3b0b0128b 100644 --- a/chi/org.eclipse.escet.chi.documentation/META-INF/MANIFEST.MF +++ b/chi/org.eclipse.escet.chi.documentation/META-INF/MANIFEST.MF @@ -4,5 +4,4 @@ Bundle-Name: ESCET Chi Documentation (Incubation) Bundle-SymbolicName: org.eclipse.escet.chi.documentation;singleton:=true Bundle-Version: 0.5.0.qualifier Bundle-Vendor: Eclipse ESCET -Require-Bundle: org.eclipse.help, - org.eclipse.escet.common.asciidoc;bundle-version="0.5.0" +Require-Bundle: org.eclipse.help diff --git a/chi/org.eclipse.escet.chi.documentation/pom.xml b/chi/org.eclipse.escet.chi.documentation/pom.xml index 153d3c6e2d4ea1883b4924db31d6ea0ca4443152..13ba45bd247d7a6aa09ddcb51944999cc65c2b9f 100644 --- a/chi/org.eclipse.escet.chi.documentation/pom.xml +++ b/chi/org.eclipse.escet.chi.documentation/pom.xml @@ -128,70 +128,45 @@ - org.codehaus.mojo - exec-maven-plugin - 3.0.0 - - - org.eclipse.escet.common.asciidoc.html.multipage.AsciiDocMultiPageHtmlSplitter - - true - true - + org.eclipse.escet + org.eclipse.escet.common.asciidoc + ${project.version} - eclipse-help-multi-html-split + eclipse-help-multi-page-html-split generate-resources - java + multi-page-html-split - - ${project.basedir}/asciidoc - ${project.build.directory}/eclipse-help-intermediate/documentation.html - ${project.build.directory}/eclipse-help - --eclipse-help - + ${project.basedir}/asciidoc + documentation + + ${project.build.directory}/eclipse-help-intermediate/documentation.html + + ${project.build.directory}/eclipse-help + ECLIPSE_HELP - website-multi-html-split + website-multi-page-html-split generate-resources - java + multi-page-html-split - - ${project.basedir}/asciidoc - ${project.build.directory}/website-intermediate/documentation.html - ${project.build.directory}/website - --website - Chi website - . - + ${project.basedir}/asciidoc + documentation + + ${project.build.directory}/website-intermediate/documentation.html + + ${project.build.directory}/website + WEBSITE + Chi website + . - - - org.eclipse.escet - org.eclipse.escet.common.asciidoc - ${project.version} - eclipse-plugin - - - org.eclipse.escet - org.eclipse.escet.common.java - ${project.version} - eclipse-plugin - - - org.eclipse.escet - org.eclipse.escet.common.app.framework - ${project.version} - eclipse-plugin - - diff --git a/cif/org.eclipse.escet.cif.documentation/META-INF/MANIFEST.MF b/cif/org.eclipse.escet.cif.documentation/META-INF/MANIFEST.MF index 7e309628a0958bfe948eb8e93cf00ce6ee1267c3..ab984d3c61576ceb1929696683bffe8ee5479655 100644 --- a/cif/org.eclipse.escet.cif.documentation/META-INF/MANIFEST.MF +++ b/cif/org.eclipse.escet.cif.documentation/META-INF/MANIFEST.MF @@ -4,5 +4,4 @@ Bundle-Name: ESCET CIF Documentation (Incubation) Bundle-SymbolicName: org.eclipse.escet.cif.documentation;singleton:=true Bundle-Version: 0.5.0.qualifier Bundle-Vendor: Eclipse ESCET -Require-Bundle: org.eclipse.help, - org.eclipse.escet.common.asciidoc;bundle-version="0.5.0" +Require-Bundle: org.eclipse.help diff --git a/cif/org.eclipse.escet.cif.documentation/pom.xml b/cif/org.eclipse.escet.cif.documentation/pom.xml index 4fef2c6cd3a6e785af3173e2e21499338c9f4876..9f30c66003072acac040021fbd77b92fe6a9bb62 100644 --- a/cif/org.eclipse.escet.cif.documentation/pom.xml +++ b/cif/org.eclipse.escet.cif.documentation/pom.xml @@ -128,70 +128,45 @@ - org.codehaus.mojo - exec-maven-plugin - 3.0.0 - - - org.eclipse.escet.common.asciidoc.html.multipage.AsciiDocMultiPageHtmlSplitter - - true - true - + org.eclipse.escet + org.eclipse.escet.common.asciidoc + ${project.version} - eclipse-help-multi-html-split + eclipse-help-multi-page-html-split generate-resources - java + multi-page-html-split - - ${project.basedir}/asciidoc - ${project.build.directory}/eclipse-help-intermediate/documentation.html - ${project.build.directory}/eclipse-help - --eclipse-help - + ${project.basedir}/asciidoc + documentation + + ${project.build.directory}/eclipse-help-intermediate/documentation.html + + ${project.build.directory}/eclipse-help + ECLIPSE_HELP - website-multi-html-split + website-multi-page-html-split generate-resources - java + multi-page-html-split - - ${project.basedir}/asciidoc - ${project.build.directory}/website-intermediate/documentation.html - ${project.build.directory}/website - --website - CIF website - . - + ${project.basedir}/asciidoc + documentation + + ${project.build.directory}/website-intermediate/documentation.html + + ${project.build.directory}/website + WEBSITE + CIF website + . - - - org.eclipse.escet - org.eclipse.escet.common.asciidoc - ${project.version} - eclipse-plugin - - - org.eclipse.escet - org.eclipse.escet.common.java - ${project.version} - eclipse-plugin - - - org.eclipse.escet - org.eclipse.escet.common.app.framework - ${project.version} - eclipse-plugin - - diff --git a/common/org.eclipse.escet.common.asciidoc/.classpath b/common/org.eclipse.escet.common.asciidoc/.classpath index 685a6999c9acba0d0158b0929d7a4d384644452e..9713d3d2a15fc240b751587cc607ed187e5cb0d9 100644 --- a/common/org.eclipse.escet.common.asciidoc/.classpath +++ b/common/org.eclipse.escet.common.asciidoc/.classpath @@ -1,11 +1,11 @@ + - diff --git a/common/org.eclipse.escet.common.asciidoc/build.properties b/common/org.eclipse.escet.common.asciidoc/build.properties index 4ac126944e9b0d470d8b7615d789d0eb4b7ce02c..86415466cbbb64b2fa424028fb0ef1b2f902be25 100644 --- a/common/org.eclipse.escet.common.asciidoc/build.properties +++ b/common/org.eclipse.escet.common.asciidoc/build.properties @@ -10,7 +10,7 @@ # SPDX-License-Identifier: MIT ############################################################################### -source.. = src/ +source.. = src/main/java output.. = target/classes bin.includes = META-INF/,\ . diff --git a/common/org.eclipse.escet.common.asciidoc/pom.xml b/common/org.eclipse.escet.common.asciidoc/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..873133081fc31037bfdf315c13e5abc86aa4ee39 --- /dev/null +++ b/common/org.eclipse.escet.common.asciidoc/pom.xml @@ -0,0 +1,72 @@ + + + + 4.0.0 + + org.eclipse.escet + org.eclipse.escet.root + 0.5.0-SNAPSHOT + ../../ + + + org.eclipse.escet.common.asciidoc + maven-plugin + + + + com.google.guava + guava + 30.1-jre + + + commons-io + commons-io + 2.8.0 + + + org.apache.commons + commons-lang3 + 3.1 + + + org.apache.maven + maven-plugin-api + 3.8.5 + provided + + + org.apache.maven.plugin-tools + maven-plugin-annotations + 3.6.4 + provided + + + org.eclipse.escet + org.eclipse.escet.common.app.framework + ${project.version} + eclipse-plugin + + + org.eclipse.escet + org.eclipse.escet.common.java + ${project.version} + eclipse-plugin + + + org.jsoup + jsoup + 1.8.3 + + + diff --git a/common/org.eclipse.escet.common.asciidoc/src/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocEclipseHelpTocUtil.java b/common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocEclipseHelpTocUtil.java similarity index 100% rename from common/org.eclipse.escet.common.asciidoc/src/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocEclipseHelpTocUtil.java rename to common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocEclipseHelpTocUtil.java diff --git a/common/org.eclipse.escet.common.asciidoc/src/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocHtmlAnalyzer.java b/common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocHtmlAnalyzer.java similarity index 100% rename from common/org.eclipse.escet.common.asciidoc/src/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocHtmlAnalyzer.java rename to common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocHtmlAnalyzer.java diff --git a/common/org.eclipse.escet.common.asciidoc/src/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocHtmlModifier.java b/common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocHtmlModifier.java similarity index 99% rename from common/org.eclipse.escet.common.asciidoc/src/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocHtmlModifier.java rename to common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocHtmlModifier.java index 6a55cee9373aa8796a9328e203269392da676ab2..879fdffa73a9112c050c244bd0d1e0a392375e2b 100644 --- a/common/org.eclipse.escet.common.asciidoc/src/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocHtmlModifier.java +++ b/common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocHtmlModifier.java @@ -35,6 +35,7 @@ import java.util.Locale; import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import java.util.function.Consumer; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -75,9 +76,11 @@ class AsciiDocHtmlModifier { * {@link HtmlType#WEBSITE}, {@code null} otherwise. * @param parentWebsiteLink The relative path of the parent website to link to, if {@code htmlType} is * {@link HtmlType#WEBSITE}, {@code null} otherwise. + * @param logger The logger to use. */ static void generateAndWriteModifiedPages(Document singlePageDoc, AsciiDocHtmlPages htmlPages, Path sourceRootPath, - Path outputRootPath, HtmlType htmlType, String parentWebsiteName, String parentWebsiteLink) + Path outputRootPath, HtmlType htmlType, String parentWebsiteName, String parentWebsiteLink, + Consumer logger) { // Determine new section ids. determineNewSectionIds(htmlPages); @@ -87,7 +90,7 @@ class AsciiDocHtmlModifier { try { // Debug output. if (DEBUG) { - System.out.println("Modifying page: " + page.sourceFile.relPath); + logger.accept("Modifying page: " + page.sourceFile.relPath); } // Clone the original single-page HTML file for this page. diff --git a/common/org.eclipse.escet.common.asciidoc/src/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocHtmlPage.java b/common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocHtmlPage.java similarity index 100% rename from common/org.eclipse.escet.common.asciidoc/src/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocHtmlPage.java rename to common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocHtmlPage.java diff --git a/common/org.eclipse.escet.common.asciidoc/src/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocHtmlPages.java b/common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocHtmlPages.java similarity index 100% rename from common/org.eclipse.escet.common.asciidoc/src/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocHtmlPages.java rename to common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocHtmlPages.java diff --git a/common/org.eclipse.escet.common.asciidoc/src/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocHtmlUtil.java b/common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocHtmlUtil.java similarity index 100% rename from common/org.eclipse.escet.common.asciidoc/src/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocHtmlUtil.java rename to common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocHtmlUtil.java diff --git a/common/org.eclipse.escet.common.asciidoc/src/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocMultiPageHtmlSplitter.java b/common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocMultiPageHtmlSplitter.java similarity index 89% rename from common/org.eclipse.escet.common.asciidoc/src/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocMultiPageHtmlSplitter.java rename to common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocMultiPageHtmlSplitter.java index 439f0abeb199392b0f2063d42f58105b9a0ecacd..09fbd8d8f82604814194ae80979eb671e31a3ee3 100644 --- a/common/org.eclipse.escet.common.asciidoc/src/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocMultiPageHtmlSplitter.java +++ b/common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocMultiPageHtmlSplitter.java @@ -26,6 +26,7 @@ import java.util.Arrays; import java.util.List; import java.util.Locale; import java.util.function.BiPredicate; +import java.util.function.Consumer; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -103,7 +104,7 @@ public class AsciiDocMultiPageHtmlSplitter { rootBaseName = Strings.slice(rootBaseName, null, -".html".length()); splitHtml(sourceRootPath, singleHtmlPagePath, outputRootPath, htmlType, parentWebsiteName, parentWebsiteLink, - rootBaseName); + rootBaseName, System.out::println); } /** @@ -120,10 +121,12 @@ public class AsciiDocMultiPageHtmlSplitter { * @param parentWebsiteLink The relative path of the parent website to link to, if {@code htmlType} is * {@link HtmlType#WEBSITE}, {@code null} otherwise. * @param rootBaseName The base name (file name excluding file extension) of the root AsciiDoc file. + * @param logger The logger to use. * @throws IOException In case of an I/O error. */ public static void splitHtml(Path sourceRootPath, Path singleHtmlPagePath, Path outputRootPath, HtmlType htmlType, - String parentWebsiteName, String parentWebsiteLink, String rootBaseName) throws IOException + String parentWebsiteName, String parentWebsiteLink, String rootBaseName, Consumer logger) + throws IOException { // Check arguments. Assert.areEqual(parentWebsiteName != null, htmlType == HtmlType.WEBSITE); @@ -140,12 +143,12 @@ public class AsciiDocMultiPageHtmlSplitter { Files.createDirectories(outputRootPath); // Read and parse AsciiDoc-generated single-page HTML file. - System.out.println("Reading AsciiDoc-generated single-page HTML file: " + singleHtmlPagePath.toString()); + logger.accept("Reading AsciiDoc-generated single-page HTML file: " + singleHtmlPagePath.toString()); String generatedHtmlContent = Files.readString(singleHtmlPagePath, StandardCharsets.UTF_8); Document singlePageDoc = Jsoup.parse(generatedHtmlContent); // Find AsciiDoc source files. - System.out.println("Finding and analyzing AsciiDoc source files located in: " + sourceRootPath.toString()); + logger.accept("Finding and analyzing AsciiDoc source files located in: " + sourceRootPath.toString()); sourceRootPath = sourceRootPath.toAbsolutePath().normalize(); List sourcePaths = getSourcePaths(sourceRootPath); @@ -162,22 +165,22 @@ public class AsciiDocMultiPageHtmlSplitter { sourceFiles.add(sourceFile); } } - System.out.println(fmt("%d AsciiDoc source files found, %d analyzed.", sourcePaths.size(), sourceFiles.size())); + logger.accept(fmt("%d AsciiDoc source files found, %d analyzed.", sourcePaths.size(), sourceFiles.size())); // Analyze AsciiDoc-generated single-page HTML file. - System.out.println("Analyzing AsciiDoc-generated single-page HTML file: " + singleHtmlPagePath.toString()); + logger.accept("Analyzing AsciiDoc-generated single-page HTML file: " + singleHtmlPagePath.toString()); AsciiDocHtmlPages htmlPages = new AsciiDocHtmlPages(sourceFiles); Assert.areEqual(htmlPages.homePage.sourceFile.getBaseName(), rootBaseName); AsciiDocHtmlAnalyzer.analyze(singlePageDoc, htmlPages); // Generate and write multiple HTML files, one per page. - System.out.println("Generating multi-page HTML files at: " + outputRootPath.toString()); + logger.accept("Generating multi-page HTML files at: " + outputRootPath.toString()); AsciiDocHtmlModifier.generateAndWriteModifiedPages(singlePageDoc, htmlPages, sourceRootPath, outputRootPath, - htmlType, parentWebsiteName, parentWebsiteLink); + htmlType, parentWebsiteName, parentWebsiteLink, logger); // Copy single AsciiDoc-generated HTML file to output directory, with different name. if (htmlType == HtmlType.WEBSITE) { - System.out.println("Copying single-page HTML file to: " + outputRootPath.toString()); + logger.accept("Copying single-page HTML file to: " + outputRootPath.toString()); Path singlePathOutputPath = outputRootPath.resolve(rootBaseName + "-single-page.html"); Assert.check(!Files.exists(singlePathOutputPath), singlePathOutputPath); Files.copy(singleHtmlPagePath, singlePathOutputPath); @@ -186,13 +189,13 @@ public class AsciiDocMultiPageHtmlSplitter { // Generate Eclipse help 'toc.xml' file. if (htmlType == HtmlType.ECLIPSE_HELP) { Path tocXmlPath = outputRootPath.resolve("toc.xml"); - System.out.println("Generating Eclipse help TOC at: " + tocXmlPath.toString()); + logger.accept("Generating Eclipse help TOC at: " + tocXmlPath.toString()); org.w3c.dom.Document tocXmlDoc = AsciiDocEclipseHelpTocUtil.tocToEclipseHelpXml(htmlPages.toc); XmlSupport.writeFile(tocXmlDoc, "TOC", tocXmlPath.toString()); } // Done. - System.out.println("DONE: AsciiDoc multi-page HTML split completed."); + logger.accept("DONE: AsciiDoc multi-page HTML split completed."); } /** diff --git a/common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocMultiPageHtmlSplitterMojo.java b/common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocMultiPageHtmlSplitterMojo.java new file mode 100644 index 0000000000000000000000000000000000000000..7af3753b737f6ef7903ae268d14b2fa288f6c89d --- /dev/null +++ b/common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocMultiPageHtmlSplitterMojo.java @@ -0,0 +1,80 @@ +////////////////////////////////////////////////////////////////////////////// +// Copyright (c) 2022 Contributors to the Eclipse Foundation +// +// See the NOTICE file(s) distributed with this work for additional +// information regarding copyright ownership. +// +// This program and the accompanying materials are made available +// under the terms of the MIT License which is available at +// https://opensource.org/licenses/MIT +// +// SPDX-License-Identifier: MIT +////////////////////////////////////////////////////////////////////////////// + +package org.eclipse.escet.common.asciidoc.html.multipage; + +import java.io.File; + +import org.apache.maven.plugin.AbstractMojo; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.plugin.logging.Log; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + +/** + * AsciiDoc multi-page HTML splitter Maven mojo. + * + * @see AsciiDocMultiPageHtmlSplitter + */ +@Mojo(name = "multi-page-html-split") +public class AsciiDocMultiPageHtmlSplitterMojo extends AbstractMojo { + /** The path to the root directory that contains the AsciiDoc source files. */ + @Parameter(required = true) + private File sourceRootPath; + + /** The base name (file name excluding file extension) of the root AsciiDoc file. */ + @Parameter(required = true) + private String rootBaseName; + + /** The path to the single AsciiDoc-generated HTML file. */ + @Parameter(required = true) + private File singleHtmlPagePath; + + /** + * The path to the directory in which to write output. Is removed if it already exists. Is created if it does not + * yet exist. + */ + @Parameter(required = true) + private File outputRootPath; + + /** The HTML type. */ + @Parameter(required = true) + private HtmlType htmlType; + + /** + * The name of the parent website to link to, if {@code htmlType} is {@link HtmlType#WEBSITE}, {@code null} + * otherwise. + */ + @Parameter + private String parentWebsiteName; + + /** + * The relative path of the parent website to link to, if {@code htmlType} is {@link HtmlType#WEBSITE}, {@code null} + * otherwise. + */ + @Parameter + private String parentWebsiteLink; + + @Override + public void execute() throws MojoExecutionException, MojoFailureException { + Log log = getLog(); + try { + AsciiDocMultiPageHtmlSplitter.splitHtml(sourceRootPath.toPath(), singleHtmlPagePath.toPath(), + outputRootPath.toPath(), htmlType, parentWebsiteName, parentWebsiteLink, rootBaseName, log::info); + } catch (Throwable e) { + log.error(e); + throw new MojoExecutionException("Error while executing Maven plugin.", e); + } + } +} diff --git a/common/org.eclipse.escet.common.asciidoc/src/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocSourceFile.java b/common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocSourceFile.java similarity index 100% rename from common/org.eclipse.escet.common.asciidoc/src/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocSourceFile.java rename to common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocSourceFile.java diff --git a/common/org.eclipse.escet.common.asciidoc/src/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocSourceFileAnalyzer.java b/common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocSourceFileAnalyzer.java similarity index 100% rename from common/org.eclipse.escet.common.asciidoc/src/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocSourceFileAnalyzer.java rename to common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocSourceFileAnalyzer.java diff --git a/common/org.eclipse.escet.common.asciidoc/src/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocTocEntry.java b/common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocTocEntry.java similarity index 100% rename from common/org.eclipse.escet.common.asciidoc/src/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocTocEntry.java rename to common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/AsciiDocTocEntry.java diff --git a/common/org.eclipse.escet.common.asciidoc/src/org/eclipse/escet/common/asciidoc/html/multipage/HtmlType.java b/common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/HtmlType.java similarity index 100% rename from common/org.eclipse.escet.common.asciidoc/src/org/eclipse/escet/common/asciidoc/html/multipage/HtmlType.java rename to common/org.eclipse.escet.common.asciidoc/src/main/java/org/eclipse/escet/common/asciidoc/html/multipage/HtmlType.java diff --git a/org.eclipse.escet.setup b/org.eclipse.escet.setup index ad78517e40c59146e0ac987a12fc42aeafdafcaa..b103a565d70d7398a3e745af496cdcbf4df59da0 100644 --- a/org.eclipse.escet.setup +++ b/org.eclipse.escet.setup @@ -4,23 +4,15 @@ xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:git="http://www.eclipse.org/oomph/setup/git/1.0" + xmlns:pde="http://www.eclipse.org/oomph/setup/pde/1.0" xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0" xmlns:projects="http://www.eclipse.org/oomph/setup/projects/1.0" xmlns:setup="http://www.eclipse.org/oomph/setup/1.0" xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0" - xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0" xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0" - xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore" + xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/pde/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/PDE.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore" name="escet" label="Eclipse ESCET"> - - - - - - - - - ${org.eclipse.escet.git.clone.location}/releng/org.eclipse.escet.releng.target/org.eclipse.escet.releng.target.target - - - org.eclipse.equinox.executable.feature.group - - - true - - - true - - - planner - - - false - - - false - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xsi:type="pde:TargetPlatformTask" + name="eclipse-escet-target-platform"/> UTF-8 UTF-8 + + + 11 + 11 + 2.7.0 ${tycho.version} @@ -161,6 +166,9 @@ SPDX-License-Identifier: MIT cocoa x86_64 + + + consider @@ -336,6 +344,13 @@ SPDX-License-Identifier: MIT technology.escet + + + + org.apache.maven.plugins + maven-plugin-plugin + 3.6.4 + diff --git a/releng/org.eclipse.escet.releng.dev.documentation/META-INF/MANIFEST.MF b/releng/org.eclipse.escet.releng.dev.documentation/META-INF/MANIFEST.MF index 5bfc40470e1f1875685064d5299b4bc4018450b0..027d7e40899ea314e2f401a2f087d34e940bad0b 100644 --- a/releng/org.eclipse.escet.releng.dev.documentation/META-INF/MANIFEST.MF +++ b/releng/org.eclipse.escet.releng.dev.documentation/META-INF/MANIFEST.MF @@ -4,5 +4,4 @@ Bundle-Name: ESCET Development Documentation (Incubation) Bundle-SymbolicName: org.eclipse.escet.releng.dev.documentation;singleton:=true Bundle-Version: 0.5.0.qualifier Bundle-Vendor: Eclipse ESCET -Require-Bundle: org.eclipse.help, - org.eclipse.escet.common.asciidoc;bundle-version="0.5.0" +Require-Bundle: org.eclipse.help diff --git a/releng/org.eclipse.escet.releng.dev.documentation/pom.xml b/releng/org.eclipse.escet.releng.dev.documentation/pom.xml index 40428d3f56d41e1e2ecfa58cecd099aa78011094..e3f2dea36d864b88a677b69d3834963d97dd671c 100644 --- a/releng/org.eclipse.escet.releng.dev.documentation/pom.xml +++ b/releng/org.eclipse.escet.releng.dev.documentation/pom.xml @@ -126,70 +126,45 @@ - org.codehaus.mojo - exec-maven-plugin - 3.0.0 - - - org.eclipse.escet.common.asciidoc.html.multipage.AsciiDocMultiPageHtmlSplitter - - true - true - + org.eclipse.escet + org.eclipse.escet.common.asciidoc + ${project.version} - eclipse-help-multi-html-split + eclipse-help-multi-page-html-split generate-resources - java + multi-page-html-split - - ${project.basedir}/asciidoc - ${project.build.directory}/eclipse-help-intermediate/index.html - ${project.build.directory}/eclipse-help - --eclipse-help - + ${project.basedir}/asciidoc + index + + ${project.build.directory}/eclipse-help-intermediate/index.html + + ${project.build.directory}/eclipse-help + ECLIPSE_HELP - website-multi-html-split + website-multi-page-html-split generate-resources - java + multi-page-html-split - - ${project.basedir}/asciidoc - ${project.build.directory}/website-intermediate/index.html - ${project.build.directory}/website - --website - Eclipse ESCET™ website - .. - + ${project.basedir}/asciidoc + index + + ${project.build.directory}/website-intermediate/index.html + + ${project.build.directory}/website + WEBSITE + Eclipse ESCET™ website + .. - - - org.eclipse.escet - org.eclipse.escet.common.asciidoc - ${project.version} - eclipse-plugin - - - org.eclipse.escet - org.eclipse.escet.common.java - ${project.version} - eclipse-plugin - - - org.eclipse.escet - org.eclipse.escet.common.app.framework - ${project.version} - eclipse-plugin - - diff --git a/releng/org.eclipse.escet.releng.project.documentation/META-INF/MANIFEST.MF b/releng/org.eclipse.escet.releng.project.documentation/META-INF/MANIFEST.MF index 0a7eae662d8b8198afa4be293565b31e8065a5b7..fbe6292c53827c71d5a64066f39055d2b3521bd4 100644 --- a/releng/org.eclipse.escet.releng.project.documentation/META-INF/MANIFEST.MF +++ b/releng/org.eclipse.escet.releng.project.documentation/META-INF/MANIFEST.MF @@ -4,5 +4,4 @@ Bundle-Name: ESCET Project Documentation (Incubation) Bundle-SymbolicName: org.eclipse.escet.releng.project.documentation;singleton:=true Bundle-Version: 0.5.0.qualifier Bundle-Vendor: Eclipse ESCET -Require-Bundle: org.eclipse.help, - org.eclipse.escet.common.asciidoc;bundle-version="0.5.0" +Require-Bundle: org.eclipse.help diff --git a/releng/org.eclipse.escet.releng.project.documentation/pom.xml b/releng/org.eclipse.escet.releng.project.documentation/pom.xml index 6f1994d77c233f98dec64c01a9a270fed6db5a0c..82cf158bf022cc3b7f22f0dd677088cd2a20ad38 100644 --- a/releng/org.eclipse.escet.releng.project.documentation/pom.xml +++ b/releng/org.eclipse.escet.releng.project.documentation/pom.xml @@ -128,70 +128,45 @@ - org.codehaus.mojo - exec-maven-plugin - 3.0.0 - - - org.eclipse.escet.common.asciidoc.html.multipage.AsciiDocMultiPageHtmlSplitter - - true - true - + org.eclipse.escet + org.eclipse.escet.common.asciidoc + ${project.version} - eclipse-help-multi-html-split + eclipse-help-multi-page-html-split generate-resources - java + multi-page-html-split - - ${project.basedir}/asciidoc - ${project.build.directory}/eclipse-help-intermediate/documentation.html - ${project.build.directory}/eclipse-help - --eclipse-help - + ${project.basedir}/asciidoc + documentation + + ${project.build.directory}/eclipse-help-intermediate/documentation.html + + ${project.build.directory}/eclipse-help + ECLIPSE_HELP - website-multi-html-split + website-multi-page-html-split generate-resources - java + multi-page-html-split - - ${project.basedir}/asciidoc - ${project.build.directory}/website-intermediate/documentation.html - ${project.build.directory}/website - --website - Eclipse ESCET™ website - . - + ${project.basedir}/asciidoc + documentation + + ${project.build.directory}/website-intermediate/documentation.html + + ${project.build.directory}/website + WEBSITE + Eclipse ESCET™ website + . - - - org.eclipse.escet - org.eclipse.escet.common.asciidoc - ${project.version} - eclipse-plugin - - - org.eclipse.escet - org.eclipse.escet.common.java - ${project.version} - eclipse-plugin - - - org.eclipse.escet - org.eclipse.escet.common.app.framework - ${project.version} - eclipse-plugin - - diff --git a/releng/org.eclipse.escet.releng.target/org.eclipse.escet.releng.target.target b/releng/org.eclipse.escet.releng.target/org.eclipse.escet.releng.target.target index b1717424106914d404689cc5aac9bd22eb62e0b7..4fe5b50b2b0f1b67c48f17d138b718773e34203d 100644 --- a/releng/org.eclipse.escet.releng.target/org.eclipse.escet.releng.target.target +++ b/releng/org.eclipse.escet.releng.target/org.eclipse.escet.releng.target.target @@ -1,29 +1,13 @@ - + - - - - - - - - - - - - - - - - @@ -31,24 +15,54 @@ + + + + + + + + + + + + + + + + + + org.apache.maven + maven-plugin-api + 3.8.5 + pom + + + org.apache.maven.plugin-tools + maven-plugin-annotations + 3.6.4 + pom + + + diff --git a/tooldef/org.eclipse.escet.tooldef.documentation/META-INF/MANIFEST.MF b/tooldef/org.eclipse.escet.tooldef.documentation/META-INF/MANIFEST.MF index 8dba0dc820d198f9e23ed8c87e5a858965d98bc6..1241d9f408f22ef474e5b7d0a090c2e3f309036c 100644 --- a/tooldef/org.eclipse.escet.tooldef.documentation/META-INF/MANIFEST.MF +++ b/tooldef/org.eclipse.escet.tooldef.documentation/META-INF/MANIFEST.MF @@ -4,5 +4,4 @@ Bundle-Name: ESCET ToolDef Documentation (Incubation) Bundle-SymbolicName: org.eclipse.escet.tooldef.documentation;singleton:=true Bundle-Version: 0.5.0.qualifier Bundle-Vendor: Eclipse ESCET -Require-Bundle: org.eclipse.help, - org.eclipse.escet.common.asciidoc;bundle-version="0.5.0" +Require-Bundle: org.eclipse.help diff --git a/tooldef/org.eclipse.escet.tooldef.documentation/pom.xml b/tooldef/org.eclipse.escet.tooldef.documentation/pom.xml index 2bcf84a91625ef84a2acab39dfff7abb5b99bc2a..bc873d1ee41a6914cb0045c032815fb7bf74bf12 100644 --- a/tooldef/org.eclipse.escet.tooldef.documentation/pom.xml +++ b/tooldef/org.eclipse.escet.tooldef.documentation/pom.xml @@ -128,70 +128,45 @@ - org.codehaus.mojo - exec-maven-plugin - 3.0.0 - - - org.eclipse.escet.common.asciidoc.html.multipage.AsciiDocMultiPageHtmlSplitter - - true - true - + org.eclipse.escet + org.eclipse.escet.common.asciidoc + ${project.version} - eclipse-help-multi-html-split + eclipse-help-multi-page-html-split generate-resources - java + multi-page-html-split - - ${project.basedir}/asciidoc - ${project.build.directory}/eclipse-help-intermediate/documentation.html - ${project.build.directory}/eclipse-help - --eclipse-help - + ${project.basedir}/asciidoc + documentation + + ${project.build.directory}/eclipse-help-intermediate/documentation.html + + ${project.build.directory}/eclipse-help + ECLIPSE_HELP - website-multi-html-split + website-multi-page-html-split generate-resources - java + multi-page-html-split - - ${project.basedir}/asciidoc - ${project.build.directory}/website-intermediate/documentation.html - ${project.build.directory}/website - --website - ToolDef website - . - + ${project.basedir}/asciidoc + documentation + + ${project.build.directory}/website-intermediate/documentation.html + + ${project.build.directory}/website + WEBSITE + ToolDef website + . - - - org.eclipse.escet - org.eclipse.escet.common.asciidoc - ${project.version} - eclipse-plugin - - - org.eclipse.escet - org.eclipse.escet.common.java - ${project.version} - eclipse-plugin - - - org.eclipse.escet - org.eclipse.escet.common.app.framework - ${project.version} - eclipse-plugin - -