You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/06/11 06:04:17 UTC
[isis] branch master updated (42d29aa -> 7c56551)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 42d29aa ISIS-2727: remove AuthenticationProvider
add be2f793 ISIS-2442: adds docs for base subdomain; convert types to meta-annotations
add 58ab199 ISIS-2442: improves base subdomain docs a little more
add 856bf05 ISIS-2442: ports docx to latest version of docx4j, and removes guava dependency
add 0460f57 ISIS-2442: updates docs for docx
add e5f16ee ISIS-2442: resolves dependency convergence issue within docx4j itself
add 239b184 ISIS-2442: resolves dependency convergence issues (?)
add a3a0c25 ISIS-2442: resolves dependency convergence issues (?)
add 1196467 ISIS-2442: skips enforcer plugin for docx-applib
add aca83a3 ISIS-2442: makes docx merge test less stringent
new 7c56551 Merge pull request #593 from apache/ISIS-2442
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../comguide/modules/ROOT/pages/starter-apps.adoc | 4 +-
.../applib/services/calendar/CalendarService.adoc | 46 +-
.../types/{MoneyType.adoc => Description.adoc} | 10 +-
.../types/{DescriptionType.adoc => Fqcn.adoc} | 9 +-
.../applib/types/{FqcnType.adoc => Money.adoc} | 9 +-
.../base/applib/types/{NameType.adoc => Name.adoc} | 9 +-
.../applib/types/{MoneyType.adoc => Notes.adoc} | 10 +-
.../pages/index/base/applib/types/NotesType.adoc | 12 -
.../{MoneyType.adoc => ObjectIdentifier.adoc} | 9 +-
.../base/applib/types/ObjectIdentifierType.adoc | 12 -
.../types/{MoneyType.adoc => Percentage.adoc} | 9 +-
.../index/base/applib/types/PercentageType.adoc | 12 -
.../types/{MoneyType.adoc => ProperName.adoc} | 9 +-
.../index/base/applib/types/ProperNameType.adoc | 12 -
.../types/{MoneyType.adoc => Reference.adoc} | 11 +-
.../index/base/applib/types/ReferenceType.adoc | 12 -
.../applib/types/{MoneyType.adoc => Title.adoc} | 9 +-
.../pages/index/base/applib/types/TitleType.adoc | 12 -
.../types/{MoneyType.adoc => UrlTemplate.adoc} | 9 +-
.../index/base/applib/types/UrlTemplateType.adoc | 12 -
.../index/base/applib/types/UserNameType.adoc | 12 -
.../applib/types/{MoneyType.adoc => Username.adoc} | 9 +-
.../pages/index/base/applib/types/XxxType.adoc | 12 -
.../pages/index/docx/applib/DocxService.adoc | 40 ++
.../applib/DocxService~MergeDefinition.adoc} | 6 +-
core/adoc/modules/_overview/pages/about.adoc | 21 +-
core/pom.xml | 12 +-
.../adoc/modules/secman/pages/setting-up.adoc | 17 +-
isis-parent/pom.xml | 6 +-
.../setup-and-configure-dependencyManagement.adoc | 2 +-
.../adoc/modules/ROOT/partials/component-nav.adoc | 2 +-
subdomains/base/adoc/modules/base/nav.adoc | 3 +-
subdomains/base/adoc/modules/base/pages/about.adoc | 150 ++++++-
.../applib/services/calendar/CalendarService.java | 33 +-
.../{DescriptionType.java => Description.java} | 31 +-
.../base/applib/types/{FqcnType.java => Fqcn.java} | 25 +-
.../applib/types/{NameType.java => Money.java} | 25 +-
.../applib/types/{MoneyType.java => Name.java} | 25 +-
.../types/{DescriptionType.java => Notes.java} | 32 +-
.../subdomains/base/applib/types/NotesType.java | 36 --
...{DescriptionType.java => ObjectIdentifier.java} | 27 +-
.../base/applib/types/ObjectIdentifierType.java | 36 --
.../{DescriptionType.java => Percentage.java} | 24 +-
.../base/applib/types/PercentageType.java | 36 --
.../{DescriptionType.java => ProperName.java} | 26 +-
.../base/applib/types/ProperNameType.java | 36 --
.../subdomains/base/applib/types/Reference.java | 47 ++
.../base/applib/types/ReferenceType.java | 39 --
.../types/{DescriptionType.java => Title.java} | 26 +-
.../subdomains/base/applib/types/TitleType.java | 34 --
.../{DescriptionType.java => UrlTemplate.java} | 26 +-
.../base/applib/types/UrlTemplateType.java | 34 --
.../subdomains/base/applib/types/UserNameType.java | 34 --
.../types/{DescriptionType.java => Username.java} | 26 +-
.../isis/subdomains/base/applib/types/XxxType.java | 34 --
.../base/applib/valuetypes/LocalDateInterval.java | 1 -
.../adoc/modules/docx/attachments/Template.docx | Bin 0 -> 28756 bytes
.../modules/docx/examples/input-exact-match.html | 41 ++
.../adoc/modules/docx/images/template-docx.png | Bin 0 -> 472174 bytes
.../docx/images/word-enable-developer-ribbon.png | Bin 0 -> 435844 bytes
subdomains/docx/adoc/modules/docx/nav.adoc | 3 +-
subdomains/docx/adoc/modules/docx/pages/about.adoc | 124 ++++-
subdomains/docx/applib/pom.xml | 59 ++-
.../isis/subdomains/docx/applib/DocxService.java | 497 +++++++++++++++++++++
.../applib/exceptions/DocxServiceException.java | 13 +
.../docx/applib/exceptions/LoadInputException.java | 8 +
.../applib/exceptions/LoadTemplateException.java | 8 +
.../docx/applib/exceptions/MergeException.java | 11 +
.../docx/applib/traverse/AllMatches.java | 42 ++
.../docx/applib/traverse/CallbackAbstract.java | 32 ++
.../docx/applib/traverse/FirstMatch.java | 47 ++
.../isis/subdomains/docx/applib/util/Docx.java | 109 +++++
.../isis/subdomains/docx/applib/util/Dump.java | 181 ++++++++
.../isis/subdomains/docx/applib/util/Jdom2.java | 76 ++++
.../isis/subdomains/docx/applib/util/Types.java | 17 +
.../applib/src/main/resources/docx4j.properties | 31 ++
.../docx/applib/DocxService_merge_Test.java | 352 +++++++++++++++
.../isis/subdomains/docx/applib/IoHelper.java | 98 ++++
.../subdomains/docx/applib/Output-Expected.docx | Bin 0 -> 29005 bytes
.../subdomains/docx/applib/Output-Expected.pdf | Bin 0 -> 84424 bytes
.../isis/subdomains/docx/applib/Template.docx | Bin 0 -> 28756 bytes
.../subdomains/docx/applib/input-exact-match.html | 67 +++
.../subdomains/docx/applib/input-malformed.html | 69 +++
.../isis/subdomains/docx/applib/input-missing.html | 69 +++
.../isis/subdomains/docx/applib/input-surplus.html | 70 +++
subdomains/excel/adoc/modules/excel/nav.adoc | 3 +-
.../freemarker/adoc/modules/freemarker/nav.adoc | 3 +-
subdomains/ognl/adoc/modules/ognl/nav.adoc | 3 +-
subdomains/pdfbox/adoc/modules/pdfbox/nav.adoc | 3 +-
subdomains/pom.xml | 51 ++-
subdomains/spring/adoc/modules/spring/nav.adoc | 3 +-
.../adoc/modules/spring/partials/module-nav.adoc | 2 +-
.../xdocreport/adoc/modules/xdocreport/nav.adoc | 2 +-
subdomains/zip/adoc/modules/zip/nav.adoc | 3 +-
subdomains/zip/applib/pom.xml | 20 +-
95 files changed, 2651 insertions(+), 688 deletions(-)
copy antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/{MoneyType.adoc => Description.adoc} (81%)
rename antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/{DescriptionType.adoc => Fqcn.adoc} (84%)
rename antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/{FqcnType.adoc => Money.adoc} (83%)
rename antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/{NameType.adoc => Name.adoc} (85%)
copy antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/{MoneyType.adoc => Notes.adoc} (81%)
delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/NotesType.adoc
copy antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/{MoneyType.adoc => ObjectIdentifier.adoc} (77%)
delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/ObjectIdentifierType.adoc
copy antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/{MoneyType.adoc => Percentage.adoc} (79%)
delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/PercentageType.adoc
copy antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/{MoneyType.adoc => ProperName.adoc} (81%)
delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/ProperNameType.adoc
copy antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/{MoneyType.adoc => Reference.adoc} (78%)
delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/ReferenceType.adoc
copy antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/{MoneyType.adoc => Title.adoc} (83%)
delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/TitleType.adoc
copy antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/{MoneyType.adoc => UrlTemplate.adoc} (76%)
delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/UrlTemplateType.adoc
delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/UserNameType.adoc
copy antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/{MoneyType.adoc => Username.adoc} (80%)
delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/XxxType.adoc
create mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/docx/applib/DocxService.adoc
rename antora/components/refguide-index/modules/subdomains/pages/index/{base/applib/types/MoneyType.adoc => docx/applib/DocxService~MergeDefinition.adoc} (90%)
copy subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/{DescriptionType.java => Description.java} (50%)
rename subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/{FqcnType.java => Fqcn.java} (59%)
rename subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/{NameType.java => Money.java} (59%)
rename subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/{MoneyType.java => Name.java} (59%)
copy subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/{DescriptionType.java => Notes.java} (51%)
delete mode 100644 subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/NotesType.java
copy subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/{DescriptionType.java => ObjectIdentifier.java} (56%)
delete mode 100644 subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/ObjectIdentifierType.java
copy subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/{DescriptionType.java => Percentage.java} (60%)
delete mode 100644 subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/PercentageType.java
copy subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/{DescriptionType.java => ProperName.java} (57%)
delete mode 100644 subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/ProperNameType.java
create mode 100644 subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Reference.java
delete mode 100644 subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/ReferenceType.java
copy subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/{DescriptionType.java => Title.java} (58%)
delete mode 100644 subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/TitleType.java
copy subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/{DescriptionType.java => UrlTemplate.java} (55%)
delete mode 100644 subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/UrlTemplateType.java
delete mode 100644 subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/UserNameType.java
rename subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/{DescriptionType.java => Username.java} (57%)
delete mode 100644 subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/XxxType.java
create mode 100644 subdomains/docx/adoc/modules/docx/attachments/Template.docx
create mode 100644 subdomains/docx/adoc/modules/docx/examples/input-exact-match.html
create mode 100644 subdomains/docx/adoc/modules/docx/images/template-docx.png
create mode 100644 subdomains/docx/adoc/modules/docx/images/word-enable-developer-ribbon.png
create mode 100644 subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/DocxService.java
create mode 100644 subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/exceptions/DocxServiceException.java
create mode 100644 subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/exceptions/LoadInputException.java
create mode 100644 subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/exceptions/LoadTemplateException.java
create mode 100644 subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/exceptions/MergeException.java
create mode 100644 subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/traverse/AllMatches.java
create mode 100644 subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/traverse/CallbackAbstract.java
create mode 100644 subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/traverse/FirstMatch.java
create mode 100644 subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/util/Docx.java
create mode 100644 subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/util/Dump.java
create mode 100644 subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/util/Jdom2.java
create mode 100644 subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/util/Types.java
create mode 100644 subdomains/docx/applib/src/main/resources/docx4j.properties
create mode 100644 subdomains/docx/applib/src/test/java/org/apache/isis/subdomains/docx/applib/DocxService_merge_Test.java
create mode 100644 subdomains/docx/applib/src/test/java/org/apache/isis/subdomains/docx/applib/IoHelper.java
create mode 100644 subdomains/docx/applib/src/test/resources/org/apache/isis/subdomains/docx/applib/Output-Expected.docx
create mode 100644 subdomains/docx/applib/src/test/resources/org/apache/isis/subdomains/docx/applib/Output-Expected.pdf
create mode 100644 subdomains/docx/applib/src/test/resources/org/apache/isis/subdomains/docx/applib/Template.docx
create mode 100644 subdomains/docx/applib/src/test/resources/org/apache/isis/subdomains/docx/applib/input-exact-match.html
create mode 100644 subdomains/docx/applib/src/test/resources/org/apache/isis/subdomains/docx/applib/input-malformed.html
create mode 100644 subdomains/docx/applib/src/test/resources/org/apache/isis/subdomains/docx/applib/input-missing.html
create mode 100644 subdomains/docx/applib/src/test/resources/org/apache/isis/subdomains/docx/applib/input-surplus.html
[isis] 01/01: Merge pull request #593 from apache/ISIS-2442
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 7c5655162e5f6b039a28e7f14d75ab7986a6e9db
Merge: 42d29aa aca83a3
Author: Dan Haywood <da...@apache.org>
AuthorDate: Fri Jun 11 07:04:03 2021 +0100
Merge pull request #593 from apache/ISIS-2442
Isis 2442 : adds in docx subdomain library; also docs for base subdomain library
.../comguide/modules/ROOT/pages/starter-apps.adoc | 4 +-
.../applib/services/calendar/CalendarService.adoc | 46 +-
.../types/{MoneyType.adoc => Description.adoc} | 10 +-
.../types/{DescriptionType.adoc => Fqcn.adoc} | 9 +-
.../applib/types/{FqcnType.adoc => Money.adoc} | 9 +-
.../base/applib/types/{NameType.adoc => Name.adoc} | 9 +-
.../applib/types/{MoneyType.adoc => Notes.adoc} | 10 +-
.../pages/index/base/applib/types/NotesType.adoc | 12 -
.../{MoneyType.adoc => ObjectIdentifier.adoc} | 9 +-
.../base/applib/types/ObjectIdentifierType.adoc | 12 -
.../types/{MoneyType.adoc => Percentage.adoc} | 9 +-
.../index/base/applib/types/PercentageType.adoc | 12 -
.../types/{MoneyType.adoc => ProperName.adoc} | 9 +-
.../index/base/applib/types/ProperNameType.adoc | 12 -
.../types/{MoneyType.adoc => Reference.adoc} | 11 +-
.../index/base/applib/types/ReferenceType.adoc | 12 -
.../applib/types/{MoneyType.adoc => Title.adoc} | 9 +-
.../pages/index/base/applib/types/TitleType.adoc | 12 -
.../types/{MoneyType.adoc => UrlTemplate.adoc} | 9 +-
.../index/base/applib/types/UrlTemplateType.adoc | 12 -
.../index/base/applib/types/UserNameType.adoc | 12 -
.../applib/types/{MoneyType.adoc => Username.adoc} | 9 +-
.../pages/index/base/applib/types/XxxType.adoc | 12 -
.../pages/index/docx/applib/DocxService.adoc | 40 ++
.../applib/DocxService~MergeDefinition.adoc} | 6 +-
core/adoc/modules/_overview/pages/about.adoc | 21 +-
core/pom.xml | 12 +-
.../adoc/modules/secman/pages/setting-up.adoc | 17 +-
isis-parent/pom.xml | 6 +-
.../setup-and-configure-dependencyManagement.adoc | 2 +-
.../adoc/modules/ROOT/partials/component-nav.adoc | 2 +-
subdomains/base/adoc/modules/base/nav.adoc | 3 +-
subdomains/base/adoc/modules/base/pages/about.adoc | 150 ++++++-
.../applib/services/calendar/CalendarService.java | 33 +-
.../{DescriptionType.java => Description.java} | 31 +-
.../base/applib/types/{FqcnType.java => Fqcn.java} | 25 +-
.../applib/types/{NameType.java => Money.java} | 25 +-
.../applib/types/{MoneyType.java => Name.java} | 25 +-
.../types/{DescriptionType.java => Notes.java} | 32 +-
.../subdomains/base/applib/types/NotesType.java | 36 --
...{DescriptionType.java => ObjectIdentifier.java} | 27 +-
.../base/applib/types/ObjectIdentifierType.java | 36 --
.../{DescriptionType.java => Percentage.java} | 24 +-
.../base/applib/types/PercentageType.java | 36 --
.../{DescriptionType.java => ProperName.java} | 26 +-
.../base/applib/types/ProperNameType.java | 36 --
.../subdomains/base/applib/types/Reference.java | 47 ++
.../base/applib/types/ReferenceType.java | 39 --
.../types/{DescriptionType.java => Title.java} | 26 +-
.../subdomains/base/applib/types/TitleType.java | 34 --
.../{DescriptionType.java => UrlTemplate.java} | 26 +-
.../base/applib/types/UrlTemplateType.java | 34 --
.../subdomains/base/applib/types/UserNameType.java | 34 --
.../types/{DescriptionType.java => Username.java} | 26 +-
.../isis/subdomains/base/applib/types/XxxType.java | 34 --
.../base/applib/valuetypes/LocalDateInterval.java | 1 -
.../adoc/modules/docx/attachments/Template.docx | Bin 0 -> 28756 bytes
.../modules/docx/examples/input-exact-match.html | 41 ++
.../adoc/modules/docx/images/template-docx.png | Bin 0 -> 472174 bytes
.../docx/images/word-enable-developer-ribbon.png | Bin 0 -> 435844 bytes
subdomains/docx/adoc/modules/docx/nav.adoc | 3 +-
subdomains/docx/adoc/modules/docx/pages/about.adoc | 124 ++++-
subdomains/docx/applib/pom.xml | 59 ++-
.../isis/subdomains/docx/applib/DocxService.java | 497 +++++++++++++++++++++
.../applib/exceptions/DocxServiceException.java | 13 +
.../docx/applib/exceptions/LoadInputException.java | 8 +
.../applib/exceptions/LoadTemplateException.java | 8 +
.../docx/applib/exceptions/MergeException.java | 11 +
.../docx/applib/traverse/AllMatches.java | 42 ++
.../docx/applib/traverse/CallbackAbstract.java | 32 ++
.../docx/applib/traverse/FirstMatch.java | 47 ++
.../isis/subdomains/docx/applib/util/Docx.java | 109 +++++
.../isis/subdomains/docx/applib/util/Dump.java | 181 ++++++++
.../isis/subdomains/docx/applib/util/Jdom2.java | 76 ++++
.../isis/subdomains/docx/applib/util/Types.java | 17 +
.../applib/src/main/resources/docx4j.properties | 31 ++
.../docx/applib/DocxService_merge_Test.java | 352 +++++++++++++++
.../isis/subdomains/docx/applib/IoHelper.java | 98 ++++
.../subdomains/docx/applib/Output-Expected.docx | Bin 0 -> 29005 bytes
.../subdomains/docx/applib/Output-Expected.pdf | Bin 0 -> 84424 bytes
.../isis/subdomains/docx/applib/Template.docx | Bin 0 -> 28756 bytes
.../subdomains/docx/applib/input-exact-match.html | 67 +++
.../subdomains/docx/applib/input-malformed.html | 69 +++
.../isis/subdomains/docx/applib/input-missing.html | 69 +++
.../isis/subdomains/docx/applib/input-surplus.html | 70 +++
subdomains/excel/adoc/modules/excel/nav.adoc | 3 +-
.../freemarker/adoc/modules/freemarker/nav.adoc | 3 +-
subdomains/ognl/adoc/modules/ognl/nav.adoc | 3 +-
subdomains/pdfbox/adoc/modules/pdfbox/nav.adoc | 3 +-
subdomains/pom.xml | 51 ++-
subdomains/spring/adoc/modules/spring/nav.adoc | 3 +-
.../adoc/modules/spring/partials/module-nav.adoc | 2 +-
.../xdocreport/adoc/modules/xdocreport/nav.adoc | 2 +-
subdomains/zip/adoc/modules/zip/nav.adoc | 3 +-
subdomains/zip/applib/pom.xml | 20 +-
95 files changed, 2651 insertions(+), 688 deletions(-)