You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by jo...@apache.org on 2020/06/20 20:26:00 UTC
[isis] 09/09: Merge remote-tracking branch 'origin/master'
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a52d01bd63a4b9afb669da97688aef7388689a19
Merge: e40663b c81c658
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Sat Jun 20 22:25:26 2020 +0200
Merge remote-tracking branch 'origin/master'
.../apache/isis/core/config/IsisConfiguration.java | 10 ++
.../i18n/po/TranslationServicePo.java | 12 +-
.../i18n/po/TranslationServicePoMenu.java | 40 +++++--
.../demoapp/dom/_infra/AsciiDocReaderService.java | 2 +-
.../_infra/DefaultTitleProvider.java} | 31 ++++--
.../{ => asciidocdesc}/HasAsciiDocDescription.java | 2 +-
.../asciidocdesc/HasAsciiDocDescription.svg} | 0
.../HasAsciiDocDescription_description.java | 4 +-
.../HasAsciiDocDescription_sources.java | 4 +-
.../_infra/utils/HtmlUtils.java} | 21 ++--
.../_infra/utils/LogUtils.java} | 7 +-
.../{ => dom/_infra}/utils/ThereCanBeOnlyOne.java | 20 +++-
....adoc => AssociatedActionDemo-description.adoc} | 0
.../dom/actions/assoc/AssociatedActionDemo.java | 27 +++--
.../dom/actions/assoc/AssociatedActionMenu.java | 18 ++-
...nDemo.adoc => AsyncActionDemo-description.adoc} | 0
.../demoapp/dom/actions/async/AsyncActionDemo.java | 8 +-
.../demoapp/dom/actions/async/AsyncActionMenu.java | 4 +-
...oc => DependentArgsActionDemo-description.adoc} | 0
.../actions/depargs/DependentArgsActionDemo.java | 12 +-
.../actions/depargs/DependentArgsActionMenu.java | 8 +-
.../{ErrorDemo.adoc => ErrorDemo-description.adoc} | 0
.../src/main/java/demoapp/dom/error/ErrorDemo.java | 10 +-
.../src/main/java/demoapp/dom/error/ErrorMenu.java | 4 +-
.../demoapp/dom/events/DemoEventSubscriber.java | 2 +-
...EventsDemo.adoc => EventsDemo-description.adoc} | 0
.../main/java/demoapp/dom/events/EventsDemo.java | 10 +-
.../java/demoapp/dom/events/EventsDemoMenu.java | 4 +-
.../java/demoapp/dom/homepage/DemoHomePage.java | 2 +-
.../{utils => dom/jee}/DemoRequestScopedBean.java | 2 +-
.../jee/{JeeDemo.adoc => JeeDemo-description.adoc} | 0
.../src/main/java/demoapp/dom/jee/JeeDemo.java | 11 +-
.../src/main/java/demoapp/dom/jee/JeeMenu.java | 1 -
.../main/java/demoapp/dom/mixins/MixinDemo.java | 18 +--
.../main/java/demoapp/dom/mixins/MixinMenu.java | 10 +-
...yDemo.adoc => MixinLegacyDemo-description.adoc} | 0
.../demoapp/dom/mixins/legacy/MixinLegacyDemo.java | 19 +---
.../demoapp/dom/mixins/legacy/MixinLegacyMenu.java | 12 +-
.../domain/src/main/java/demoapp/dom/package.jdo | 4 +
.../{TabDemo.adoc => TabDemo-description.adoc} | 0
.../src/main/java/demoapp/dom/tabs/TabDemo.java | 10 +-
.../src/main/java/demoapp/dom/tabs/TabMenu.java | 4 +-
...oltipDemo.adoc => TooltipDemo-description.adoc} | 0
.../main/java/demoapp/dom/tooltip/TooltipDemo.java | 17 +--
.../main/java/demoapp/dom/tooltip/TooltipMenu.java | 10 +-
.../{TreeDemo.adoc => TreeDemo-description.adoc} | 0
.../src/main/java/demoapp/dom/tree/TreeDemo.java | 8 +-
.../main/java/demoapp/dom/tree/TreeDemoMenu.java | 10 +-
.../java/demoapp/dom/types/FeaturedTypesMenu.java | 76 +++++++++++--
.../{BlobDemo.adoc => BlobDemo-description.adoc} | 0
.../main/java/demoapp/dom/types/blob/BlobDemo.java | 21 +---
.../{ClobDemo.adoc => ClobDemo-description.adoc} | 0
.../main/java/demoapp/dom/types/clob/ClobDemo.java | 23 +---
...MarkupDemo.adoc => MarkupDemo-description.adoc} | 0
.../java/demoapp/dom/types/markup/MarkupDemo.java | 22 +---
...esDemo.adoc => PrimitivesDemo-description.adoc} | 0
.../dom/types/primitive/PrimitivesDemo.java | 21 +---
.../{TextDemo.adoc => TextDemo-description.adoc} | 0
.../main/java/demoapp/dom/types/text/TextDemo.java | 15 +--
...oralDemo.adoc => TemporalDemo-description.adoc} | 0
.../java/demoapp/dom/types/time/TemporalDemo.java | 18 +--
.../{TupleDemo.adoc => TupleDemo-description.adoc} | 0
.../java/demoapp/dom/types/tuple/TupleDemo.java | 13 +--
.../demoapp/dom/types/tuple/TupleDemoMenu.java | 12 +-
.../{UuidDemo.adoc => UuidDemo-description.adoc} | 0
.../main/java/demoapp/dom/types/uuid/UuidDemo.java | 13 +--
.../dom/viewmodels/StatefulViewModelUsingJaxb.java | 53 ---------
.../java/demoapp/dom/viewmodels/ViewModels.java | 15 ++-
.../viewmodels/jaxbrefentity/ChildEntities.java | 36 ++++++
.../dom/viewmodels/jaxbrefentity/ChildEntity.java | 35 ++++++
...tatefulViewModelJaxbRefsEntity-description.adoc | 3 +
.../StatefulViewModelJaxbRefsEntity.java | 122 +++++++++++++++++++++
.../StatefulViewModelJaxbRefsEntity.layout.xml} | 3 +-
.../fixtures/ChildEntitySeedService.java | 44 ++++++++
.../StatefulViewModelUsingJaxb-description.adoc | 54 +++++++++
.../usingjaxb/StatefulViewModelUsingJaxb.java | 99 +++++++++++++++++
.../StatefulViewModelUsingJaxb.layout.xml | 6 +-
.../src/main/java/demoapp/utils/DemoStub.java | 110 -------------------
.../main/java/demoapp/webapp/DemoAppManifest.java | 6 +-
.../main/java/demoapp/webapp/menubars.layout.xml | 17 +--
.../webapp/{ => notifications}/Notification.java | 2 +-
.../{ => notifications}/NotificationsResource.java | 3 +-
examples/demo/jee/pom.xml | 50 ++++++++-
.../main/java/demoapp/webapp/jee/DemoAppJee.java} | 9 +-
.../java/demoapp/webapp/jee/DemoAppSetupCdi.java | 26 +++++
.../demo/jee/src/main/resources/log4j2-spring.xml | 60 ++++++++++
.../java/demoapp/webapp/vaadin/DemoAppVaadin.java | 2 +-
examples/demo/wicket/pom.xml | 2 +-
.../java/demoapp/webapp/wicket/DemoAppWicket.java | 2 +-
.../jdo/dom/user/ApplicationUserRepository.java | 14 ++-
.../shiro/IsisModuleExtSecmanShiroRealm.java | 22 ++--
.../adoc/modules/ROOT/pages/ro-spec.adoc | 2 +-
92 files changed, 898 insertions(+), 531 deletions(-)