You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/08/30 12:46:18 UTC

[causeway] 01/01: Merge pull request #1848 from apache/3564-move.model4adoc

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/causeway.git

commit a8e97fd75346ad0345c0de0cf86f1c6a8226b883
Merge: 83b021df93 6e6a0d8857
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Aug 30 14:46:12 2023 +0200

    Merge pull request #1848 from apache/3564-move.model4adoc
    
    CAUSEWAY-3564: Replace causeway-tooling-model4adoc with causeway-extensions-docgen-model4adoc

 .../ROOT/pages/2023/2.0.0-RC3/mignotes.adoc        | 53 +++++++++++++++++++++-
 bom/pom.xml                                        | 16 ++++++-
 .../docgen/adoc/modules/docgen/pages/about.adoc    |  4 +-
 extensions/core/docgen/{ => help}/pom.xml          | 14 ++++--
 .../docgen/help/CausewayModuleExtDocgenHelp.java}  | 15 +++---
 .../extensions/docgen/help}/applib/HelpNode.java   |  2 +-
 .../extensions/docgen/help}/applib/HelpPage.java   |  2 +-
 .../docgen/help}/helptree/HelpNodeVm-PAGE.svg      |  0
 .../docgen/help}/helptree/HelpNodeVm-TOPIC.svg     |  0
 .../docgen/help}/helptree/HelpNodeVm.java          | 10 ++--
 .../help}/helptree/HelpNodeVm.layout.fallback.xml  |  0
 .../docgen/help}/helptree/HelpTreeAdapter.java     |  2 +-
 .../docgen/help}/menu/DocumentationMenu.java       | 10 ++--
 .../domainobjects/CausewayEntityDiagramPage.java   |  6 +--
 .../domainobjects/DomainEntityDiagramPage.java     |  6 +--
 .../domainobjects/EntityDiagramPageAbstract.java   |  8 ++--
 .../help}/topics/domainobjects/ObjectGraph.java    |  2 +-
 .../help}/topics/domainobjects/_DiagramUtils.java  |  2 +-
 .../help}/topics/welcome/WelcomeHelpPage.java      |  8 ++--
 .../core/docgen}/model4adoc/README.adoc            |  0
 .../core/docgen}/model4adoc/pom.xml                | 41 ++++++++++-------
 .../docgen}/model4adoc/AsciiDocFactory.java        | 18 ++++----
 .../docgen}/model4adoc/AsciiDocWriter.java         |  2 +-
 .../docgen}/model4adoc/BlockVisitor.java           |  2 +-
 .../extensions/docgen}/model4adoc/NodeWriter.java  |  2 +-
 .../model4adoc/StructuralNodeTraversor.java        |  2 +-
 .../docgen}/model4adoc/StructuralNodeVisitor.java  |  2 +-
 .../model4adoc/ast/ContentNodeAbstract.java        |  2 +-
 .../docgen}/model4adoc/ast/SimpleBlock.java        |  2 +-
 .../docgen}/model4adoc/ast/SimpleCell.java         |  2 +-
 .../docgen}/model4adoc/ast/SimpleColumn.java       |  2 +-
 .../docgen}/model4adoc/ast/SimpleDocument.java     |  2 +-
 .../docgen}/model4adoc/ast/SimpleList.java         |  2 +-
 .../docgen}/model4adoc/ast/SimpleListItem.java     |  2 +-
 .../docgen}/model4adoc/ast/SimpleRow.java          |  2 +-
 .../model4adoc/ast/SimpleStructuralNode.java       |  2 +-
 .../docgen}/model4adoc/ast/SimpleTable.java        |  2 +-
 .../model4adoc/include/IncludeStatement.java       |  2 +-
 .../model4adoc/include/IncludeStatements.java      |  2 +-
 .../extensions/docgen}/model4adoc/xref/Xref.java   |  2 +-
 .../test/ast/AbstractAsciiDocWriterTest.java       |  4 +-
 .../model4adoc/test/ast/AdmonitionTest.java        |  6 +--
 .../model4adoc/test/ast/AttributedTableTest.java   | 10 ++--
 .../test/ast/CalloutContinuationTest.java          |  6 +--
 .../model4adoc/test/ast/CollapsibleTest.java       |  6 +--
 .../model4adoc/test/ast/DocumentHeaderTest.java    |  8 ++--
 .../model4adoc/test/ast/NestedListTest.java        |  8 ++--
 .../docgen}/model4adoc/test/ast/OpenBlockTest.java | 14 +++---
 .../docgen}/model4adoc/test/ast/PlantumlTest.java  |  6 +--
 .../model4adoc/test/ast/SimpleListTest.java        | 16 +++----
 .../model4adoc/test/ast/SimpleTableTest.java       | 10 ++--
 .../docgen}/model4adoc/test/ast/SourceTest.java    |  6 +--
 .../docgen}/model4adoc/test/ast/_Debug.java        |  2 +-
 .../docgen}/model4adoc/test/ast/admonition.adoc    |  0
 .../model4adoc/test/ast/callout-continuation.adoc  |  0
 .../docgen}/model4adoc/test/ast/collapsible.adoc   |  0
 .../model4adoc/test/ast/document-header.adoc       |  0
 .../docgen}/model4adoc/test/ast/list-nested.adoc   |  0
 .../test/ast/list-open-block-continuation.adoc     |  0
 .../docgen}/model4adoc/test/ast/list-simple.adoc   |  0
 .../docgen}/model4adoc/test/ast/plantuml-svg.adoc  |  0
 .../docgen}/model4adoc/test/ast/source.adoc        |  0
 .../model4adoc/test/ast/table-attributed.adoc      |  0
 .../docgen}/model4adoc/test/ast/table-simple.adoc  |  0
 extensions/core/docgen/pom.xml                     | 34 ++++++++------
 ...ewayExtSecmanRegularUserRoleAndPermissions.java |  2 +-
 regressiontests/pom.xml                            |  4 +-
 tooling/cli/pom.xml                                |  4 +-
 .../cli/adocfix/OrphanedIncludeStatementFixer.java |  4 +-
 .../tooling/cli/projdoc/ProjectDocModel.java       | 14 +++---
 .../tooling/cli/projdoc/ProjectDocWriter.java      |  2 +-
 .../test/adocfix/IncludeStatementFixerTest.java    |  2 +-
 tooling/java2adoc/pom.xml                          |  4 +-
 .../tooling/j2adoc/convert/HtmlToAsciiDoc.java     |  2 +-
 .../j2adoc/convert/J2AdocConverterDefault.java     |  4 +-
 .../j2adoc/format/UnitFormatterAbstract.java       |  4 +-
 .../j2adoc/format/UnitFormatterCompact.java        |  2 +-
 .../format/UnitFormatterWithSourceAndCallouts.java |  2 +-
 .../format/UnitFormatterWithSourceAndSections.java |  2 +-
 .../tooling/j2adoc/convert/HtmlToAsciiDocTest.java |  4 +-
 .../causeway/tooling/j2adoc/test/J2AdocTest.java   |  2 +-
 tooling/pom.xml                                    | 13 ------
 82 files changed, 267 insertions(+), 195 deletions(-)