This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch release-2.0.0-M7-RC1 in repository https://gitbox.apache.org/repos/asf/isis.git
commit 68c5ca1509ad05fd19fcda3350869e0a373c87f9 Author: Dan Haywood <[email protected]> AuthorDate: Sat Feb 12 00:17:29 2022 +0000 ISIS-2859: updates from generating website --- .../documentation/pages/asciidoc-syntax.adoc | 2 + .../applib/pages/index/annotation/Action.adoc | 1 - .../applib/pages/index/annotation/Collection.adoc | 1 - .../pages/index/annotation/DomainObject.adoc | 3 - .../pages/index/annotation/ParameterLayout.adoc | 1 - .../applib/pages/index/annotation/Property.adoc | 1 - .../pages/index/annotation/PropertyLayout.adoc | 1 - .../pages/index/annotation/ValueSemantics.adoc | 1 - .../pages/index/jaxb/JavaSqlJaxbAdapters.adoc | 1 - .../pages/index/jaxb/JavaTimeJaxbAdapters.adoc | 1 - .../pages/index/jaxb/JavaUtilJaxbAdapters.adoc | 1 - .../applib/pages/index/spec/SpecificationAnd.adoc | 1 - .../applib/pages/index/spec/SpecificationNot.adoc | 1 - .../applib/pages/index/spec/SpecificationOr.adoc | 1 - .../modules/applib/pages/index/util/ZipWriter.adoc | 1 - .../pages/index/util/schema/CommonDtoUtils.adoc | 3 - .../commons/pages/index/collections/Can.adoc | 1 - .../pages/index/restclient/RestfulClient.adoc | 1 - .../applib/user/events/UserCreatedEvent.adoc | 1 - .../shirorealmldap/realm/impl/IsisLdapRealm.adoc | 7 +- .../jdo/applib/services/JdoSupportService.adoc | 2 - .../applib/annotation/InteractAs.adoc | 1 - .../applib/jmocking/JUnitRuleMockery2.adoc | 1 - .../index/markdown/applib/value/Converter.adoc | 2 - .../restfulobjects/applib/util/JsonNodeUtils.adoc | 1 - build-site.sh | 2 +- core/adoc/modules/_overview/pages/about.adoc | 345 ++------------------- .../adoc/modules/config/pages/sections/_nav.adoc | 2 - .../modules/config/pages/sections/isis.applib.adoc | 9 - .../isis.core.meta-model.introspector.adoc | 11 + .../sections/isis.core.meta-model.validator.adoc | 20 +- .../config/pages/sections/isis.viewer.wicket.adoc | 42 +-- preview.sh | 4 +- scripts/ci/_adoc-copy-examples.sh | 2 +- scripts/ci/build-artifacts.sh | 2 +- scripts/ci/build-docker-images.sh | 8 +- scripts/ci/build-regressiontests.sh | 2 +- .../j2adoc/format/UnitFormatterAbstract.java | 14 +- 38 files changed, 63 insertions(+), 438 deletions(-) diff --git a/antora/components/conguide/modules/documentation/pages/asciidoc-syntax.adoc b/antora/components/conguide/modules/documentation/pages/asciidoc-syntax.adoc index 397995c..c8e59d5 100644 --- a/antora/components/conguide/modules/documentation/pages/asciidoc-syntax.adoc +++ b/antora/components/conguide/modules/documentation/pages/asciidoc-syntax.adoc @@ -801,6 +801,8 @@ For example: [c4plantuml,c4-demo,svg] ---- @startuml +!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4.puml +!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Context.puml !includeurl https://raw.githubusercontent.com/RicardoNiepel/C4-PlantUML/master/C4_Container.puml title System Context diagram for Internet Banking System diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotation/Action.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Action.adoc index 5216100..aa56154 100644 --- a/antora/components/refguide-index/modules/applib/pages/index/annotation/Action.adoc +++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/Action.adoc @@ -107,7 +107,6 @@ Subscribers of this event can interact with the business rule checking (hide, di For example: ---- - public class SomeObject{ public static class ChangeStartDateDomainEvent extends ActionDomainEvent<SomeObject> { ... } diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotation/Collection.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Collection.adoc index 2ec70ad..ee23161 100644 --- a/antora/components/refguide-index/modules/applib/pages/index/annotation/Collection.adoc +++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/Collection.adoc @@ -44,7 +44,6 @@ Subscribers of this event can interact with the business rule checking (hide, di For example: ---- - public class Order { public static class OrderLineItems extends CollectionDomainEvent { ... } diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainObject.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainObject.adoc index ae2faf7..5577593 100644 --- a/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainObject.adoc +++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainObject.adoc @@ -258,7 +258,6 @@ Indicates that an invocation of _any_ action of the domain object (that do not t For example: ---- - @DomainObject(actionDomainEvent=SomeObject.GenericActionDomainEvent.class) public class SomeObject{ public static class GenericActionDomainEvent extends ActionDomainEvent<Object> { ... } @@ -280,7 +279,6 @@ Indicates that changes to _any_ property of the domain object (that do not thems For example: ---- - @DomainObject(propertyDomainEvent=SomeObject.GenericPropertyDomainEvent.class) public class SomeObject{ @@ -298,7 +296,6 @@ Indicates that changes to _any_ collection of the domain object (that do not the For example: ---- - @DomainObject(collectionDomainEvent=Order.GenericCollectionDomainEvent.class) public class Order { diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotation/ParameterLayout.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/ParameterLayout.adoc index 788bbec..455eafd 100644 --- a/antora/components/refguide-index/modules/applib/pages/index/annotation/ParameterLayout.adoc +++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/ParameterLayout.adoc @@ -115,7 +115,6 @@ This is intended to be used so that an exclusive end date of an interval can be For example: ---- - public void updateDates( @ParameterLayout(named="From") LocalDate startDate, @ParameterLayout(named="To"), renderDay=RenderDay.AS_DAY_BEFORE) LocalDate endDate) { ... } diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotation/Property.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Property.adoc index 7ea41b0..851a9f3 100644 --- a/antora/components/refguide-index/modules/applib/pages/index/annotation/Property.adoc +++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/Property.adoc @@ -139,7 +139,6 @@ Subscribers of this event can interact with the business rule checking (hide, di For example: ---- - public static class StartDateChanged extends PropertyDomainEvent { ... } @Property(domainEvent=StartDateChanged.class) diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotation/PropertyLayout.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/PropertyLayout.adoc index 852032e..e4c0a94 100644 --- a/antora/components/refguide-index/modules/applib/pages/index/annotation/PropertyLayout.adoc +++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/PropertyLayout.adoc @@ -198,7 +198,6 @@ This is intended to be used so that an exclusive end date of an interval can be For example: ---- - public LocalDate getStartDate() { ... } @PropertyLayout(renderDay=RenderDay.AS_DAY_BEFORE) diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotation/ValueSemantics.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/ValueSemantics.adoc index a70688f..e108464 100644 --- a/antora/components/refguide-index/modules/applib/pages/index/annotation/ValueSemantics.adoc +++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/ValueSemantics.adoc @@ -130,7 +130,6 @@ This is intended to be used so that an exclusive end date of an interval can be For example: ---- - public LocalDate getStartDate() { ... } @ValueSemantics(dateRenderAdjustDays = ValueSemantics.AS_DAY_BEFORE) diff --git a/antora/components/refguide-index/modules/applib/pages/index/jaxb/JavaSqlJaxbAdapters.adoc b/antora/components/refguide-index/modules/applib/pages/index/jaxb/JavaSqlJaxbAdapters.adoc index a05dd2e..a9dc525 100644 --- a/antora/components/refguide-index/modules/applib/pages/index/jaxb/JavaSqlJaxbAdapters.adoc +++ b/antora/components/refguide-index/modules/applib/pages/index/jaxb/JavaSqlJaxbAdapters.adoc @@ -6,7 +6,6 @@ Provides JAXB XmlAdapters for java sql temporal types. Example: ---- - @XmlElement @XmlJavaTypeAdapter(JavaSqlJaxbAdapters.DateAdapter.class) @Getter @Setter private java.sql.Date date; ---- diff --git a/antora/components/refguide-index/modules/applib/pages/index/jaxb/JavaTimeJaxbAdapters.adoc b/antora/components/refguide-index/modules/applib/pages/index/jaxb/JavaTimeJaxbAdapters.adoc index 96882c8..69e3ddf 100644 --- a/antora/components/refguide-index/modules/applib/pages/index/jaxb/JavaTimeJaxbAdapters.adoc +++ b/antora/components/refguide-index/modules/applib/pages/index/jaxb/JavaTimeJaxbAdapters.adoc @@ -6,7 +6,6 @@ Provides JAXB XmlAdapters for Java time temporal types. Example: ---- - @XmlElement @XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateAdapter.class) @Getter @Setter private java.time.LocalDate localDate; ---- diff --git a/antora/components/refguide-index/modules/applib/pages/index/jaxb/JavaUtilJaxbAdapters.adoc b/antora/components/refguide-index/modules/applib/pages/index/jaxb/JavaUtilJaxbAdapters.adoc index c236c25..fdf04ab 100644 --- a/antora/components/refguide-index/modules/applib/pages/index/jaxb/JavaUtilJaxbAdapters.adoc +++ b/antora/components/refguide-index/modules/applib/pages/index/jaxb/JavaUtilJaxbAdapters.adoc @@ -6,7 +6,6 @@ Provides JAXB XmlAdapters for Java util temporal types. Example: ---- - @XmlElement @XmlJavaTypeAdapter(JavaUtilJaxbAdapters.DateAdapter.class) @Getter @Setter private java.utilDate javaLocalDate; ---- diff --git a/antora/components/refguide-index/modules/applib/pages/index/spec/SpecificationAnd.adoc b/antora/components/refguide-index/modules/applib/pages/index/spec/SpecificationAnd.adoc index edf16f4..03882ac 100644 --- a/antora/components/refguide-index/modules/applib/pages/index/spec/SpecificationAnd.adoc +++ b/antora/components/refguide-index/modules/applib/pages/index/spec/SpecificationAnd.adoc @@ -8,7 +8,6 @@ Subclasses represent the intersection of multiple xref:refguide:applib:index/spe For example: ---- - public class MilkAndSugarSpec extends SpecificationAnd { public MilkAndSugarSpec() { super(new MustBeMilkySpec(), new TwoLumpsOfSugarSpec()); diff --git a/antora/components/refguide-index/modules/applib/pages/index/spec/SpecificationNot.adoc b/antora/components/refguide-index/modules/applib/pages/index/spec/SpecificationNot.adoc index 38a0693..0c6e9fd 100644 --- a/antora/components/refguide-index/modules/applib/pages/index/spec/SpecificationNot.adoc +++ b/antora/components/refguide-index/modules/applib/pages/index/spec/SpecificationNot.adoc @@ -8,7 +8,6 @@ Subclasses represent the logical inverse of a xref:refguide:applib:index/spec/Sp For example: ---- - public class NoSugarThanksSpec extends SpecificationNot { public NoSugarThanksSpec() { super( diff --git a/antora/components/refguide-index/modules/applib/pages/index/spec/SpecificationOr.adoc b/antora/components/refguide-index/modules/applib/pages/index/spec/SpecificationOr.adoc index 14b2d12..aa2e3a2 100644 --- a/antora/components/refguide-index/modules/applib/pages/index/spec/SpecificationOr.adoc +++ b/antora/components/refguide-index/modules/applib/pages/index/spec/SpecificationOr.adoc @@ -8,7 +8,6 @@ Subclasses represent the conjunction of multiple xref:refguide:applib:index/spec For example: ---- - public class TeaOrCoffeeSpec extends SpecificationOr { public TeaOrCoffeeSpec() { super(new MustBeTeaSpec(), new MustBeCoffeeSpec()); diff --git a/antora/components/refguide-index/modules/applib/pages/index/util/ZipWriter.adoc b/antora/components/refguide-index/modules/applib/pages/index/util/ZipWriter.adoc index 4855de8..9eb06ec 100644 --- a/antora/components/refguide-index/modules/applib/pages/index/util/ZipWriter.adoc +++ b/antora/components/refguide-index/modules/applib/pages/index/util/ZipWriter.adoc @@ -6,7 +6,6 @@ Zip utility for generating compressed output. Typical use: ---- - val zipWriter = ZipWriter.newInstance(); for (Map.Entry entry : schemaMap.entrySet()) { diff --git a/antora/components/refguide-index/modules/applib/pages/index/util/schema/CommonDtoUtils.adoc b/antora/components/refguide-index/modules/applib/pages/index/util/schema/CommonDtoUtils.adoc index 8bf4f11..eb2cdaa 100644 --- a/antora/components/refguide-index/modules/applib/pages/index/util/schema/CommonDtoUtils.adoc +++ b/antora/components/refguide-index/modules/applib/pages/index/util/schema/CommonDtoUtils.adoc @@ -10,9 +10,6 @@ class CommonDtoUtils { ValueWithTypeDto getFundamentalValueFromJson(ValueType valueType, String json) String getFundamentalValueAsJson(ValueWithTypeDto valueDto) String getFundamentalValueAsJson(ValueType valueType, ValueDto valueDto) - String enumDtoToJson(EnumDto dto) - String blobDtoToJson(BlobDto dto) - String clobDtoToJson(ClobDto dto) D recordFundamentalValue(ValueType valueType, D valueDto, Object pojo) Object getValueAsObject(ValueWithTypeDto valueDto) Object getValueAsObject(ValueType valueType, ValueDto valueDto) diff --git a/antora/components/refguide-index/modules/commons/pages/index/collections/Can.adoc b/antora/components/refguide-index/modules/commons/pages/index/collections/Can.adoc index 56f19ad..afc2228 100644 --- a/antora/components/refguide-index/modules/commons/pages/index/collections/Can.adoc +++ b/antora/components/refguide-index/modules/commons/pages/index/collections/Can.adoc @@ -442,7 +442,6 @@ Removes the element at the specified position in this list (optional operation). Given _n_ indices, returns an equivalent of(where nulls are being ignored) ---- - Can.of( this.get(indices[0]).orElse(null), this.get(indices[1]).orElse(null), diff --git a/antora/components/refguide-index/modules/extensions/pages/index/restclient/RestfulClient.adoc b/antora/components/refguide-index/modules/extensions/pages/index/restclient/RestfulClient.adoc index 4e40cc0..5c2a9e9 100644 --- a/antora/components/refguide-index/modules/extensions/pages/index/restclient/RestfulClient.adoc +++ b/antora/components/refguide-index/modules/extensions/pages/index/restclient/RestfulClient.adoc @@ -6,7 +6,6 @@ Setup the Restful Client with Basic-Auth:Synchronous example:Asynchronous exampl For example: ---- - RestfulClientConfig clientConfig = new RestfulClientConfig(); clientConfig.setRestfulBase("http://localhost:8080/helloworld/restful/";); clientConfig.setUseBasicAuth(true); // default = false diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/events/UserCreatedEvent.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/events/UserCreatedEvent.adoc index 08d6d51..1091829 100644 --- a/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/events/UserCreatedEvent.adoc +++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/events/UserCreatedEvent.adoc @@ -6,7 +6,6 @@ SecMan fires this event when a new user entity just got persisted. Users may subscribe to this event in order to apply business logic to the newly created user. eg. add default roles ---- - @Component public class Listener { @EventListener(UserCreatedEvent.class) diff --git a/antora/components/refguide-index/modules/extensions/pages/index/shirorealmldap/realm/impl/IsisLdapRealm.adoc b/antora/components/refguide-index/modules/extensions/pages/index/shirorealmldap/realm/impl/IsisLdapRealm.adoc index 85595ef..55b161b 100644 --- a/antora/components/refguide-index/modules/extensions/pages/index/shirorealmldap/realm/impl/IsisLdapRealm.adoc +++ b/antora/components/refguide-index/modules/extensions/pages/index/shirorealmldap/realm/impl/IsisLdapRealm.adoc @@ -6,7 +6,6 @@ Implementation of _org.apache.shiro.realm.ldap.JndiLdapRealm_ that also returns Sample config for `shiro.ini` : ---- - contextFactory = org.apache.isis.extensions.shirorealmldap.realm.impl.IsisLdapContextFactory contextFactory.url = ldap://localhost:10389 contextFactory.authenticationMechanism = CRAM-MD5 @@ -43,14 +42,12 @@ securityManager.realms = $ldapRealm The permissions for each role can be specified using the _#setResourcePath(String)_ to an 'ini' file with a [roles] section, eg: ---- - ldapRealm.resourcePath=classpath:webapp/myroles.ini ---- where `myroles.ini` is in `src/main/resources/webapp` , and takes the form: ---- - [roles] user_role = *:ToDoItemsJdo:*:*,\ *:ToDoItem:*:* @@ -88,7 +85,7 @@ class IsisLdapRealm { <.> xref:#setResourcePath__String[setResourcePath(String)] + -- - +ldapRealm.resourcePath=classpath:webapp/myroles.ini -- == Members @@ -97,14 +94,12 @@ class IsisLdapRealm { === setResourcePath(String) ---- - ldapRealm.resourcePath=classpath:webapp/myroles.ini ---- where `myroles.ini` is in `src/main/resources/webapp` , and takes the form:This 'ini' file can then be referenced by other realms (if multiple realm are configured with the Shiro security manager). ---- - [roles] user_role = *:ToDoItemsJdo:*:*,\ *:ToDoItem:*:* diff --git a/antora/components/refguide-index/modules/persistence/pages/index/jdo/applib/services/JdoSupportService.adoc b/antora/components/refguide-index/modules/persistence/pages/index/jdo/applib/services/JdoSupportService.adoc index 3ab07da..0881422 100644 --- a/antora/components/refguide-index/modules/persistence/pages/index/jdo/applib/services/JdoSupportService.adoc +++ b/antora/components/refguide-index/modules/persistence/pages/index/jdo/applib/services/JdoSupportService.adoc @@ -90,7 +90,6 @@ To perform the most common use-case of executing a (type-safe) query against the Typical usage: ---- - final QToDoItem q = QToDoItem.candidate(); return executeQuery(ToDoItem.class, q.atPath.eq(atPath).and( @@ -107,7 +106,6 @@ To perform a common use-case of executing a (type-safe) query against the specif Typical usage: ---- - final QToDoItem q = QToDoItem.candidate(); return executeQueryUnique(ToDoItem.class, q.atPath.eq(atPath).and( diff --git a/antora/components/refguide-index/modules/testing/pages/index/integtestsupport/applib/annotation/InteractAs.adoc b/antora/components/refguide-index/modules/testing/pages/index/integtestsupport/applib/annotation/InteractAs.adoc index e8d0154..69f27fa 100644 --- a/antora/components/refguide-index/modules/testing/pages/index/integtestsupport/applib/annotation/InteractAs.adoc +++ b/antora/components/refguide-index/modules/testing/pages/index/integtestsupport/applib/annotation/InteractAs.adoc @@ -6,7 +6,6 @@ Offers an alternative to xref:refguide:applib:index/services/iactnlayer/Interact Example: ---- - @Test @InteractAs( userName = "sven", diff --git a/antora/components/refguide-index/modules/testing/pages/index/unittestsupport/applib/jmocking/JUnitRuleMockery2.adoc b/antora/components/refguide-index/modules/testing/pages/index/unittestsupport/applib/jmocking/JUnitRuleMockery2.adoc index 04b8726..93fdef3 100644 --- a/antora/components/refguide-index/modules/testing/pages/index/unittestsupport/applib/jmocking/JUnitRuleMockery2.adoc +++ b/antora/components/refguide-index/modules/testing/pages/index/unittestsupport/applib/jmocking/JUnitRuleMockery2.adoc @@ -4,7 +4,6 @@ Use as a `@Rule` , meaning that the `@RunWith(JMock.class)` can be ignored. ---- - public class MyTest { @Rule diff --git a/antora/components/refguide-index/modules/valuetypes/pages/index/markdown/applib/value/Converter.adoc b/antora/components/refguide-index/modules/valuetypes/pages/index/markdown/applib/value/Converter.adoc index ee21164..24d8c08 100644 --- a/antora/components/refguide-index/modules/valuetypes/pages/index/markdown/applib/value/Converter.adoc +++ b/antora/components/refguide-index/modules/valuetypes/pages/index/markdown/applib/value/Converter.adoc @@ -27,7 +27,6 @@ For syntax highlighting to work, the client/browser needs to load specific java- 1) In your web-app's _scripts/application.js_ include the bundled _src/main/resources/prism1.14.js_ . ---- - function includeJs(jsFilePath) { var js = document.createElement("script"); js.type = "text/javascript"; @@ -41,6 +40,5 @@ includeJs("/scripts/prism1.14.js"); 2) In your web-app's _css/application.css_ include the bundled _src/main/resources/prism.css_ . ---- - _@import "prism.css"_ . ---- diff --git a/antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/applib/util/JsonNodeUtils.adoc b/antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/applib/util/JsonNodeUtils.adoc index ceee061..e81bc30 100644 --- a/antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/applib/util/JsonNodeUtils.adoc +++ b/antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/applib/util/JsonNodeUtils.adoc @@ -29,7 +29,6 @@ Walks the path, ensuring keys exist and are maps, or creating required maps as i For example, if given a list ("a", "b", "c") and starting with an empty map, then will create: ---- - { "a": { "b: { diff --git a/build-site.sh b/build-site.sh index 33ee109..f0db845 100644 --- a/build-site.sh +++ b/build-site.sh @@ -1,3 +1,3 @@ #!/bin/bash export ANTORA_CACHE_DIR=.antora-cache-dir -sh scripts/ci/_build-site.sh $* +bash scripts/ci/_build-site.sh $* diff --git a/core/adoc/modules/_overview/pages/about.adoc b/core/adoc/modules/_overview/pages/about.adoc index b673a9a..6251848 100644 --- a/core/adoc/modules/_overview/pages/about.adoc +++ b/core/adoc/modules/_overview/pages/about.adoc @@ -783,240 +783,7 @@ Artifact: demo-domain Type: jar Directory: /examples/demo/domain ---- -|.Components -**** -demoapp.dom.AppConfiguration + -demoapp.dom._infra.DefaultTitleProvider + -demoapp.dom._infra.LibraryPreloadingService + -demoapp.dom._infra.resources.AsciiDocConverterService + -demoapp.dom._infra.resources.AsciiDocReaderService + -demoapp.dom._infra.resources.AsciiDocValueSemanticsWithPreprocessing + -demoapp.dom._infra.resources.MarkdownReaderService + -demoapp.dom._infra.resources.MarkupReaderService + -demoapp.dom._infra.resources.MarkupVariableResolverService + -demoapp.dom._infra.resources.ResourceReaderService + -demoapp.dom._infra.samples.NameSamples + -demoapp.dom._infra.urlencoding.UrlEncodingServiceNaiveInMemory + -demoapp.dom.domain._changes.EntityChangesSubscriberToCaptureChangesInMemory + -demoapp.dom.domain._commands.ExposePersistedCommands$TableColumnOrderDefault + -demoapp.dom.domain._interactions.ExecutionListenerToCaptureInteractionsInMemory + -demoapp.dom.domain.actions.Action.commandPublishing.ActionCommandPublishingSeeding + -demoapp.dom.domain.actions.Action.commandPublishing.jdo.ActionCommandPublishingJdoEntities + -demoapp.dom.domain.actions.Action.commandPublishing.jpa.ActionCommandPublishingJpaEntities + -demoapp.dom.domain.actions.Action.domainEvent.subscribers.ActionDomainEventControlService + -demoapp.dom.domain.actions.Action.executionPublishing.ActionExecutionPublishingSeeding + -demoapp.dom.domain.actions.Action.executionPublishing.jdo.ActionExecutionPublishingJdoEntities + -demoapp.dom.domain.actions.Action.executionPublishing.jpa.ActionExecutionPublishingJpaEntities + -demoapp.dom.domain.collections.Collection.domainEvent.subscribers.CollectionDomainEventControlService + -demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.disabled.DomainObjectEntityChangePublishingDisabledSeeding + -demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.disabled.jdo.DomainObjectEntityChangePublishingDisabledJdoEntities + -demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.disabled.jpa.DomainObjectEntityChangePublishingDisabledJpaEntities + -demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.enabled.DomainObjectEntityChangePublishingEnabledSeeding + -demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.enabled.jdo.DomainObjectEntityChangePublishingEnabledJdoEntities + -demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.enabled.jpa.DomainObjectEntityChangePublishingEnabledJpaEntities + -demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotatedSeeding + -demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.enabled.jdo.DomainObjectEntityChangePublishingEnabledMetaAnnotatedJdoEntities + -demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.enabled.jpa.DomainObjectEntityChangePublishingEnabledMetaAnnotatedJpaEntities + -demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotOverridden.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenSeeding + -demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotOverridden.enabled.jdo.DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJdoEntities + -demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotOverridden.enabled.jpa.DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJpaEntities + -demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.JaxbRefSeeding + -demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.jdo.JaxbRefJdoEntities + -demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.jpa.JaxbRefJpaEntities + -demoapp.dom.domain.objects.other.embedded.jdo.ComplexNumberJdoValueSemantics + -demoapp.dom.domain.objects.other.embedded.jdo.NumberConstantJdoRepository + -demoapp.dom.domain.objects.other.embedded.jpa.ComplexNumberJpaValueSemantics + -demoapp.dom.domain.objects.other.embedded.jpa.NumberConstantJpaRepository + -demoapp.dom.domain.objects.other.embedded.persistence.NumberConstantSeeding + -demoapp.dom.domain.objects.other.embedded.samples.ComplexNumberSamples + -demoapp.dom.domain.properties.Property.commandPublishing.PropertyCommandPublishingSeeding + -demoapp.dom.domain.properties.Property.commandPublishing.jdo.PropertyCommandPublishingJdoEntities + -demoapp.dom.domain.properties.Property.commandPublishing.jpa.PropertyCommandPublishingJpaEntities + -demoapp.dom.domain.properties.Property.domainEvent.subscribers.PropertyDomainEventControlService + -demoapp.dom.domain.properties.Property.executionPublishing.PropertyExecutionPublishingSeeding + -demoapp.dom.domain.properties.Property.executionPublishing.jdo.PropertyExecutionPublishingJdoEntities + -demoapp.dom.domain.properties.Property.executionPublishing.jpa.PropertyExecutionPublishingJpaEntities + -demoapp.dom.domain.properties.Property.projecting.jdo.PropertyProjectingChildJdoEntities + -demoapp.dom.domain.properties.Property.projecting.jpa.PropertyProjectingChildJpaEntities + -demoapp.dom.domain.properties.Property.projecting.persistence.PropertyProjectingChildSeeding + -demoapp.dom.domain.properties.PropertyLayout.navigable.FileTreeNodeService + -demoapp.dom.domain.properties.PropertyLayout.repainting.PdfJsViewerAdvisorFallback + -demoapp.dom.featured.customui.geocoding.GeoapifyClient + -demoapp.dom.services.core.errorreportingservice.ErrorReportingServiceDemoImplementation + -demoapp.dom.services.core.eventbusservice.EventLogEntryJdoRepository + -demoapp.dom.services.core.eventbusservice.EventLogEntryJpaRepository + -demoapp.dom.services.core.eventbusservice.EventSubscriberDemoImplementation + -demoapp.dom.services.core.wrapperFactory.WrapperFactorySeeding + -demoapp.dom.services.core.wrapperFactory.jdo.WrapperFactoryJdoEntities + -demoapp.dom.services.core.wrapperFactory.jpa.WrapperFactoryJpaEntities + -demoapp.dom.services.extensions.secman.apptenancy.ApplicationTenancyEvaluatorForDemo + -demoapp.dom.services.extensions.secman.apptenancy.jdo.TenantedJdoEntities + -demoapp.dom.services.extensions.secman.apptenancy.jpa.TenantedJpaEntities + -demoapp.dom.services.extensions.secman.apptenancy.persistence.TenantedSeeding + -demoapp.dom.services.extensions.secman.appuser.seed.AppUserSeeding + -demoapp.dom.types.isis.blobs.jdo.IsisBlobJdoEntities + -demoapp.dom.types.isis.blobs.jpa.IsisBlobJpaEntities + -demoapp.dom.types.isis.blobs.persistence.IsisBlobSeeding + -demoapp.dom.types.isis.blobs.samples.IsisBlobsSamples + -demoapp.dom.types.isis.clobs.jdo.IsisClobJdoEntities + -demoapp.dom.types.isis.clobs.jpa.IsisClobJpaEntities + -demoapp.dom.types.isis.clobs.persistence.IsisClobSeeding + -demoapp.dom.types.isis.clobs.samples.IsisClobsSamples + -demoapp.dom.types.isis.localresourcepaths.jdo.IsisLocalResourcePathJdoEntities + -demoapp.dom.types.isis.localresourcepaths.jpa.IsisLocalResourcePathJpaEntities + -demoapp.dom.types.isis.localresourcepaths.persistence.IsisLocalResourcePathSeeding + -demoapp.dom.types.isis.localresourcepaths.samples.IsisLocalResourcePathsSamples + -demoapp.dom.types.isis.markups.jdo.IsisMarkupJdoEntities + -demoapp.dom.types.isis.markups.jpa.IsisMarkupJpaEntities + -demoapp.dom.types.isis.markups.persistence.IsisMarkupSeeding + -demoapp.dom.types.isis.markups.samples.IsisMarkupSamples + -demoapp.dom.types.isis.passwords.jdo.IsisPasswordJdoEntities + -demoapp.dom.types.isis.passwords.jpa.IsisPasswordJpaEntities + -demoapp.dom.types.isis.passwords.persistence.IsisPasswordSeeding + -demoapp.dom.types.isis.passwords.samples.IsisPasswordsSamples + -demoapp.dom.types.isisext.asciidocs.jdo.IsisAsciiDocJdoEntities + -demoapp.dom.types.isisext.asciidocs.jpa.IsisAsciiDocJpaEntities + -demoapp.dom.types.isisext.asciidocs.persistence.IsisAsciiDocSeeding + -demoapp.dom.types.isisext.asciidocs.samples.IsisAsciiDocSamples + -demoapp.dom.types.isisext.cal.jdo.IsisCalendarEventEntities + -demoapp.dom.types.isisext.cal.jpa.IsisCalendarEventEntities + -demoapp.dom.types.isisext.cal.persistence.IsisCalendarEventSeeding + -demoapp.dom.types.isisext.cal.samples.IsisCalendarEventSamples + -demoapp.dom.types.isisext.markdowns.jdo.IsisMarkdownJdoEntities + -demoapp.dom.types.isisext.markdowns.jpa.IsisMarkdownJpaEntities + -demoapp.dom.types.isisext.markdowns.persistence.IsisMarkdownSeeding + -demoapp.dom.types.isisext.markdowns.samples.IsisMarkdownSamples + -demoapp.dom.types.javaawt.images.jdo.JavaAwtBufferedImageJdoEntities + -demoapp.dom.types.javaawt.images.jpa.JavaAwtBufferedImageJpaEntities + -demoapp.dom.types.javaawt.images.persistence.JavaAwtBufferedImageSeeding + -demoapp.dom.types.javaawt.images.samples.JavaAwtBufferedImageService + -demoapp.dom.types.javaawt.images.samples.JavaAwtBufferedImagesSamples + -demoapp.dom.types.javalang.booleans.jdo.WrapperBooleanJdoEntities + -demoapp.dom.types.javalang.booleans.jpa.WrapperBooleanJpaEntities + -demoapp.dom.types.javalang.booleans.persistence.WrapperBooleanSeeding + -demoapp.dom.types.javalang.booleans.samples.WrapperBooleanSamples + -demoapp.dom.types.javalang.bytes.jdo.WrapperByteJdoEntities + -demoapp.dom.types.javalang.bytes.jpa.WrapperByteJpaEntities + -demoapp.dom.types.javalang.bytes.persistence.WrapperByteSeeding + -demoapp.dom.types.javalang.bytes.samples.WrapperByteSamples + -demoapp.dom.types.javalang.characters.jdo.WrapperCharacterJdoEntities + -demoapp.dom.types.javalang.characters.jpa.WrapperCharacterJpaEntities + -demoapp.dom.types.javalang.characters.persistence.WrapperCharacterSeeding + -demoapp.dom.types.javalang.characters.samples.WrapperCharacterSamples + -demoapp.dom.types.javalang.doubles.jdo.WrapperDoubleJdoEntities + -demoapp.dom.types.javalang.doubles.jpa.WrapperDoubleJpaEntities + -demoapp.dom.types.javalang.doubles.persistence.WrapperDoubleSeeding + -demoapp.dom.types.javalang.doubles.samples.WrapperDoubleSamples + -demoapp.dom.types.javalang.floats.jdo.WrapperFloatJdoEntities + -demoapp.dom.types.javalang.floats.jpa.WrapperFloatJpaEntities + -demoapp.dom.types.javalang.floats.persistence.WrapperFloatSeeding + -demoapp.dom.types.javalang.floats.samples.WrapperFloatSamples + -demoapp.dom.types.javalang.integers.jdo.WrapperIntegerJdoEntities + -demoapp.dom.types.javalang.integers.jpa.WrapperIntegerJpaEntities + -demoapp.dom.types.javalang.integers.persistence.WrapperIntegerSeeding + -demoapp.dom.types.javalang.integers.samples.WrapperIntegerSamples + -demoapp.dom.types.javalang.longs.jdo.WrapperLongJdoEntities + -demoapp.dom.types.javalang.longs.jpa.WrapperLongJpaEntities + -demoapp.dom.types.javalang.longs.persistence.WrapperLongSeeding + -demoapp.dom.types.javalang.longs.samples.WrapperLongSamples + -demoapp.dom.types.javalang.shorts.jdo.WrapperShortJdoEntities + -demoapp.dom.types.javalang.shorts.jpa.WrapperShortJpaEntities + -demoapp.dom.types.javalang.shorts.persistence.WrapperShortSeeding + -demoapp.dom.types.javalang.shorts.samples.WrapperShortSamples + -demoapp.dom.types.javalang.strings.jdo.JavaLangStringJdoEntities + -demoapp.dom.types.javalang.strings.jpa.JavaLangStringJpaEntities + -demoapp.dom.types.javalang.strings.persistence.JavaLangStringSeeding + -demoapp.dom.types.javamath.bigdecimals.jdo.JavaMathBigDecimalJdoEntities + -demoapp.dom.types.javamath.bigdecimals.jpa.JavaMathBigDecimalJpaEntities + -demoapp.dom.types.javamath.bigdecimals.persistence.JavaMathBigDecimalSeeding + -demoapp.dom.types.javamath.bigdecimals.samples.JavaMathBigDecimalSamples + -demoapp.dom.types.javamath.bigintegers.jdo.JavaMathBigIntegerJdoEntities + -demoapp.dom.types.javamath.bigintegers.jpa.JavaMathBigIntegerJpaEntities + -demoapp.dom.types.javamath.bigintegers.persistence.JavaMathBigIntegerSeeding + -demoapp.dom.types.javamath.bigintegers.samples.JavaMathBigIntegerSamples + -demoapp.dom.types.javanet.urls.jdo.JavaNetUrlJdoEntities + -demoapp.dom.types.javanet.urls.jpa.JavaNetUrlJpaEntities + -demoapp.dom.types.javanet.urls.persistence.JavaNetUrlSeeding + -demoapp.dom.types.javanet.urls.samples.JavaNetUrlSamples + -demoapp.dom.types.javasql.javasqldate.jdo.JavaSqlDateJdoEntities + -demoapp.dom.types.javasql.javasqldate.jpa.JavaSqlDateJpaEntities + -demoapp.dom.types.javasql.javasqldate.persistence.JavaSqlDateSeeding + -demoapp.dom.types.javasql.javasqldate.samples.JavaSqlDateSamples + -demoapp.dom.types.javasql.javasqltimestamp.jdo.JavaSqlTimestampJdoEntities + -demoapp.dom.types.javasql.javasqltimestamp.jpa.JavaSqlTimestampJpaEntities + -demoapp.dom.types.javasql.javasqltimestamp.persistence.JavaSqlTimestampSeeding + -demoapp.dom.types.javasql.javasqltimestamp.samples.JavaSqlTimestampSamples + -demoapp.dom.types.javatime.javatimelocaldate.jdo.JavaTimeLocalDateJdoEntities + -demoapp.dom.types.javatime.javatimelocaldate.jpa.JavaTimeLocalDateJpaEntities + -demoapp.dom.types.javatime.javatimelocaldate.persistence.JavaTimeLocalDateSeeding + -demoapp.dom.types.javatime.javatimelocaldate.samples.JavaTimeLocalDateSamples + -demoapp.dom.types.javatime.javatimelocaldatetime.jdo.JavaTimeLocalDateTimeJdoEntities + -demoapp.dom.types.javatime.javatimelocaldatetime.jpa.JavaTimeLocalDateTimeJpaEntities + -demoapp.dom.types.javatime.javatimelocaldatetime.persistence.JavaTimeLocalDateTimeSeeding + -demoapp.dom.types.javatime.javatimelocaldatetime.samples.JavaTimeLocalDateTimeSamples + -demoapp.dom.types.javatime.javatimelocaltime.jdo.JavaTimeLocalTimeJdoEntities + -demoapp.dom.types.javatime.javatimelocaltime.jpa.JavaTimeLocalTimeJpaEntities + -demoapp.dom.types.javatime.javatimelocaltime.persistence.JavaTimeLocalTimeSeeding + -demoapp.dom.types.javatime.javatimelocaltime.samples.JavaTimeLocalTimeSamples + -demoapp.dom.types.javatime.javatimeoffsetdatetime.jdo.JavaTimeOffsetDateTimeJdoEntities + -demoapp.dom.types.javatime.javatimeoffsetdatetime.jpa.JavaTimeOffsetDateTimeJpaEntities + -demoapp.dom.types.javatime.javatimeoffsetdatetime.persistence.JavaTimeOffsetDateTimeSeeding + -demoapp.dom.types.javatime.javatimeoffsetdatetime.samples.JavaTimeOffsetDateTimeSamples + -demoapp.dom.types.javatime.javatimeoffsettime.jdo.JavaTimeOffsetTimeJdoEntities + -demoapp.dom.types.javatime.javatimeoffsettime.jpa.JavaTimeOffsetTimeJpaEntities + -demoapp.dom.types.javatime.javatimeoffsettime.persistence.JavaTimeOffsetTimeSeeding + -demoapp.dom.types.javatime.javatimeoffsettime.samples.JavaTimeOffsetTimeSamples + -demoapp.dom.types.javatime.javatimezoneddatetime.jdo.JavaTimeZonedDateTimeJdoEntities + -demoapp.dom.types.javatime.javatimezoneddatetime.jpa.JavaTimeZonedDateTimeJpaEntities + -demoapp.dom.types.javatime.javatimezoneddatetime.persistence.JavaTimeZonedDateTimeSeeding + -demoapp.dom.types.javatime.javatimezoneddatetime.samples.JavaTimeZonedDateTimeSamples + -demoapp.dom.types.javautil.javautildate.jdo.JavaUtilDateJdoEntities + -demoapp.dom.types.javautil.javautildate.jpa.JavaUtilDateJpaEntities + -demoapp.dom.types.javautil.javautildate.persistence.JavaUtilDateSeeding + -demoapp.dom.types.javautil.javautildate.samples.JavaUtilDateSamples + -demoapp.dom.types.javautil.uuids.jdo.JavaUtilUuidJdoEntities + -demoapp.dom.types.javautil.uuids.jpa.JavaUtilUuidJpaEntities + -demoapp.dom.types.javautil.uuids.persistence.JavaUtilUuidSeeding + -demoapp.dom.types.javautil.uuids.samples.JavaUtilUuidSamples + -demoapp.dom.types.jodatime.jodadatetime.jdo.JodaDateTimeJdoEntities + -demoapp.dom.types.jodatime.jodadatetime.persistence.JodaDateTimeJdoSeeding + -demoapp.dom.types.jodatime.jodadatetime.samples.JodaDateTimeSamples + -demoapp.dom.types.jodatime.jodalocaldate.jdo.JodaLocalDateJdoEntities + -demoapp.dom.types.jodatime.jodalocaldate.persistence.JodaLocalDateJdoSeeding + -demoapp.dom.types.jodatime.jodalocaldate.samples.JodaLocalDateSamples + -demoapp.dom.types.jodatime.jodalocaldatetime.jdo.JodaLocalDateTimeJdoEntities + -demoapp.dom.types.jodatime.jodalocaldatetime.persistence.JodaLocalDateTimeSeeding + -demoapp.dom.types.jodatime.jodalocaldatetime.samples.JodaLocalDateTimeSamples + -demoapp.dom.types.jodatime.jodalocaltime.jdo.JodaLocalTimeJdoEntities + -demoapp.dom.types.jodatime.jodalocaltime.persistence.JodaLocalTimeSeeding + -demoapp.dom.types.jodatime.jodalocaltime.samples.JodaLocalTimeSamples + -demoapp.dom.types.primitive.booleans.jdo.PrimitiveBooleanJdoEntities + -demoapp.dom.types.primitive.booleans.jpa.PrimitiveBooleanJpaEntities + -demoapp.dom.types.primitive.booleans.persistence.PrimitiveBooleanSeeding + -demoapp.dom.types.primitive.bytes.jdo.PrimitiveByteJdoEntities + -demoapp.dom.types.primitive.bytes.jpa.PrimitiveByteJpaEntities + -demoapp.dom.types.primitive.bytes.persistence.PrimitiveByteSeeding + -demoapp.dom.types.primitive.chars.jdo.PrimitiveCharJdoEntities + -demoapp.dom.types.primitive.chars.jpa.PrimitiveCharJpaEntities + -demoapp.dom.types.primitive.chars.persistence.PrimitiveCharSeeding + -demoapp.dom.types.primitive.doubles.jdo.PrimitiveDoubleJdoEntities + -demoapp.dom.types.primitive.doubles.jpa.PrimitiveDoubleJpaEntities + -demoapp.dom.types.primitive.doubles.persistence.PrimitiveDoubleSeeding + -demoapp.dom.types.primitive.floats.jdo.PrimitiveFloatJdoEntities + -demoapp.dom.types.primitive.floats.jpa.PrimitiveFloatJpaEntities + -demoapp.dom.types.primitive.floats.persistence.PrimitiveFloatSeeding + -demoapp.dom.types.primitive.ints.jdo.PrimitiveIntJdoEntities + -demoapp.dom.types.primitive.ints.jpa.PrimitiveIntJpaEntities + -demoapp.dom.types.primitive.ints.persistence.PrimitiveIntSeeding + -demoapp.dom.types.primitive.longs.jdo.PrimitiveLongJdoEntities + -demoapp.dom.types.primitive.longs.jpa.PrimitiveLongJpaEntities + -demoapp.dom.types.primitive.longs.persistence.PrimitiveLongSeeding + -demoapp.dom.types.primitive.shorts.jdo.PrimitiveShortJdoEntities + -demoapp.dom.types.primitive.shorts.jpa.PrimitiveShortJpaEntities + -demoapp.dom.types.primitive.shorts.persistence.PrimitiveShortSeeding + -**** - -.Dependencies +|.Dependencies **** com.h2database:h2:jar:<managed> + org.apache.isis.extensions:isis-extensions-command-log-jdo:jar:<managed> + @@ -1090,12 +857,7 @@ Artifact: demo-web Type: jar Directory: /examples/demo/web ---- -|.Components -**** -demoapp.web._infra.utils.ThereCanBeOnlyOne + -**** - -.Dependencies +|.Dependencies **** org.apache.isis.examples.apps:demo-domain:jar:${project.version} + org.apache.isis.extensions:isis-extensions-command-replay-primary:jar:<managed> + @@ -1115,12 +877,7 @@ Artifact: demo-wicket-common Type: jar Directory: /examples/demo/wicket/common ---- -|.Components -**** -demoapp.webapp.wicket.common.ui.custom.WhereInTheWorldPanelFactory + -**** - -.Dependencies +|.Dependencies **** org.apache.isis.examples.apps:demo-web:jar:${project.version} + org.apache.isis.extensions:isis-extensions-fullcalendar-ui:jar:<managed> + @@ -1306,6 +1063,7 @@ Directory: /commons .Dependencies **** com.fasterxml.jackson.core:jackson-databind:jar:<managed> + +com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:<managed> + org.apache.isis.core:isis-jdk-supplemental:pom:<managed> + org.junit.jupiter:junit-jupiter-api:jar:<managed> + org.junit.jupiter:junit-jupiter-engine:jar:<managed> + @@ -3487,12 +3245,7 @@ Artifact: isis-valuetypes-asciidoc-ui-vaa Type: jar Directory: /valuetypes/asciidoc/ui/vaadin ---- -|.Components -**** -o.a.i.valuetypes.asciidoc.ui.vaa.components.AsciiDocFieldFactoryVaa + -**** - -.Dependencies +|.Dependencies **** org.apache.isis.incubator.viewer:isis-viewer-vaadin-ui:jar:${project.version} + org.apache.isis.valuetypes:isis-valuetypes-prism-vaadin:jar:${project.version} + @@ -5924,7 +5677,7 @@ eg. code mining, automated documentation. .Dependencies **** -org.checkerframework:checker-qual:jar:3.21.1 + +org.checkerframework:checker-qual:jar:3.21.2 + org.junit.jupiter:junit-jupiter-api:jar:<managed> + org.junit.jupiter:junit-jupiter-engine:jar:<managed> + org.junit.vintage:junit-vintage-engine:jar:<managed> + @@ -6238,31 +5991,7 @@ Artifact: isis-regressiontests-stable Type: jar Directory: /regressiontests/stable ---- -|.Components -**** -o.a.i.testdomain.conf.Configuration_headless$HeadlessCommandSupport + -o.a.i.testdomain.jdo.JdoInventoryDao + -o.a.i.testdomain.jdo.JdoTestFixtures + -o.a.i.testdomain.jpa.JpaInventoryDao + -o.a.i.testdomain.jpa.JpaTestFixtures + -o.a.i.testdomain.jpa.springdata.EmployeeRepository + -o.a.i.testdomain.model.valuetypes.ValueTypeExampleService + -o.a.i.testdomain.publishing.PublishingTestFactoryAbstract$CommitListener + -o.a.i.testdomain.publishing.PublishingTestFactoryJdo + -o.a.i.testdomain.publishing.PublishingTestFactoryJpa + -o.a.i.testdomain.publishing.subscriber.CommandSubscriberForTesting + -o.a.i.testdomain.publishing.subscriber.EntityChangesSubscriberForTesting + -o.a.i.testdomain.publishing.subscriber.EntityPropertyChangeSubscriberForTesting + -o.a.i.testdomain.publishing.subscriber.ExecutionSubscriberForTesting + -o.a.i.testdomain.util.event.LifecycleEventSubscriberJdoForTesting + -o.a.i.testdomain.util.event.LifecycleEventSubscriberJpaForTesting + -o.a.i.testdomain.util.interaction.DomainObjectTesterFactory + -o.a.i.testdomain.util.interaction.InteractionBoundaryProbe + -o.a.i.testdomain.util.kv.KVStoreForTesting + -o.a.i.testdomain.util.rest.RestEndpointService + -**** - -.Dependencies +|.Dependencies **** org.apache.isis.extensions:isis-extensions-fullcalendar-applib:jar:<managed> + org.apache.isis.extensions:isis-extensions-secman-encryption-jbcrypt:jar:<managed> + @@ -6676,30 +6405,7 @@ Artifact: isis-viewer-javafx-ui Type: jar Directory: /incubator/viewers/javafx/ui ---- -|.Components -**** -o.a.i.incubator.viewer.javafx.ui.components.UiComponentFactoryFx + -o.a.i.incubator.viewer.javafx.ui.components.markup.MarkupFieldFactory + -o.a.i.incubator.viewer.javafx.ui.components.number.NumberFieldFactory + -o.a.i.incubator.viewer.javafx.ui.components.objectref.ObjectReferenceFieldFactory + -o.a.i.incubator.viewer.javafx.ui.components.other.FallbackFieldFactory + -o.a.i.incubator.viewer.javafx.ui.components.temporal.TemporalFieldFactory + -o.a.i.incubator.viewer.javafx.ui.components.text.TextFieldFactory + -o.a.i.incubator.viewer.javafx.ui.decorator.disabling.DisablingDecoratorForButton + -o.a.i.incubator.viewer.javafx.ui.decorator.disabling.DisablingDecoratorForFormField + -o.a.i.incubator.viewer.javafx.ui.decorator.icon.IconDecoratorForLabeled + -o.a.i.incubator.viewer.javafx.ui.decorator.icon.IconDecoratorForMenuItem + -o.a.i.incubator.viewer.javafx.ui.decorator.icon.IconServiceDefault + -o.a.i.incubator.viewer.javafx.ui.decorator.prototyping.PrototypingDecoratorForButton + -o.a.i.incubator.viewer.javafx.ui.decorator.prototyping.PrototypingDecoratorForFormField + -o.a.i.incubator.viewer.javafx.ui.decorator.prototyping.PrototypingInfoPopupProvider + -o.a.i.incubator.viewer.javafx.ui.main.MainViewFx + -o.a.i.incubator.viewer.javafx.ui.main.UiActionHandlerFx + -o.a.i.incubator.viewer.javafx.ui.main.UiBuilderFx + -o.a.i.incubator.viewer.javafx.ui.main.UiContextFxDefault + -**** - -.Dependencies +|.Dependencies **** org.apache.isis.core:isis-core-runtimeservices:jar:<managed> + org.apache.isis.incubator.viewer:isis-viewer-javafx-model:jar:<managed> + @@ -6794,12 +6500,12 @@ Directory: /incubator/viewers/vaadin/model **** com.github.fge:jackson-coreutils:jar:1.8 + com.vaadin:vaadin:jar:<managed> + -io.swagger:swagger-compat-spec-parser:jar:1.0.39 + -io.swagger:swagger-parser:jar:1.0.39 + -io.swagger.core.v3:swagger-core:jar:2.0.5 + -io.swagger.core.v3:swagger-models:jar:2.0.5 + -io.swagger.parser.v3:swagger-parser-core:jar:2.0.5 + -io.swagger.parser.v3:swagger-parser-v3:jar:2.0.5 + +io.swagger:swagger-compat-spec-parser:jar:1.0.51 + +io.swagger:swagger-parser:jar:1.0.51 + +io.swagger.core.v3:swagger-core:jar:2.1.12 + +io.swagger.core.v3:swagger-models:jar:2.1.12 + +io.swagger.parser.v3:swagger-parser-core:jar:2.0.20 + +io.swagger.parser.v3:swagger-parser-v3:jar:2.0.20 + org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> + org.apache.isis.core:isis-core-webapp:jar:<managed> + org.apache.isis.viewer:isis-viewer-common:jar:<managed> + @@ -6813,23 +6519,7 @@ Artifact: isis-viewer-vaadin-ui Type: jar Directory: /incubator/viewers/vaadin/ui ---- -|.Components -**** -o.a.i.incubator.viewer.vaadin.ui.auth.LogoutHandlerVaa + -o.a.i.incubator.viewer.vaadin.ui.auth.VaadinAuthenticationHandler + -o.a.i.incubator.viewer.vaadin.ui.components.UiComponentFactoryVaa + -o.a.i.incubator.viewer.vaadin.ui.components.blob.BlobFieldFactory + -o.a.i.incubator.viewer.vaadin.ui.components.clob.ClobFieldFactory + -o.a.i.incubator.viewer.vaadin.ui.components.markup.MarkupFieldFactory + -o.a.i.incubator.viewer.vaadin.ui.components.other.FallbackFieldFactory + -o.a.i.incubator.viewer.vaadin.ui.components.temporal.TemporalFieldFactory + -o.a.i.incubator.viewer.vaadin.ui.components.text.TextFieldFactory + -o.a.i.incubator.viewer.vaadin.ui.components.text.uuid.UuidFieldFactory + -o.a.i.incubator.viewer.vaadin.ui.pages.main.UiActionHandlerVaa + -o.a.i.incubator.viewer.vaadin.ui.pages.main.UiContextVaaDefault + -**** - -.Dependencies +|.Dependencies **** com.vaadin:vaadin-spring:jar:<managed> + commons-fileupload:commons-fileupload:jar:1.4 + @@ -6847,6 +6537,11 @@ Directory: /incubator/viewers/vaadin/viewer ---- |.Dependencies **** +com.vaadin:vaadin-core:jar:<managed> + +com.vaadin:vaadin-spring:jar:<managed> + +org.apache.isis.core:isis-core-runtimeservices:jar:<managed> + +org.apache.isis.incubator.viewer:isis-viewer-vaadin-model:jar:<managed> + org.apache.isis.incubator.viewer:isis-viewer-vaadin-ui:jar:<managed> + +org.springframework.boot:spring-boot-starter-web:jar:<managed> + **** |=== diff --git a/core/config/src/main/adoc/modules/config/pages/sections/_nav.adoc b/core/config/src/main/adoc/modules/config/pages/sections/_nav.adoc index 6133a6d..dcc4c56 100644 --- a/core/config/src/main/adoc/modules/config/pages/sections/_nav.adoc +++ b/core/config/src/main/adoc/modules/config/pages/sections/_nav.adoc @@ -15,7 +15,5 @@ ** xref:refguide:config:sections/eclipselink.adoc[Eclipselink Configuration] ** xref:refguide:config:sections/resteasy.adoc[RestEasy Configuration] ** xref:refguide:config:sections/isis.extensions.adoc[Extensions] -** xref:refguide:config:sections/isis.value-types.adoc[Value types] ** xref:refguide:config:sections/isis.testing.adoc[Testing] -** xref:refguide:config:sections/isis.legacy.adoc[Legacy] ** xref:refguide:config:sections/Other.adoc[Other] diff --git a/core/config/src/main/adoc/modules/config/pages/sections/isis.applib.adoc b/core/config/src/main/adoc/modules/config/pages/sections/isis.applib.adoc index 60808a8..8c8313b 100644 --- a/core/config/src/main/adoc/modules/config/pages/sections/isis.applib.adoc +++ b/core/config/src/main/adoc/modules/config/pages/sections/isis.applib.adoc @@ -143,15 +143,6 @@ This setting can be overridden on a case-by-case basis using ``Action#executionD | -[[isis.applib.annotation.action.explicit]] -isis.applib.annotation.action. + -explicit - -| -| Whether or not a public method needs to be annotated with @``Action`` in order to be picked up as an action in the metamodel. - - -| [[isis.applib.annotation.collection-layout.default-view]] isis.applib.annotation. + collection-layout.default-view diff --git a/core/config/src/main/adoc/modules/config/pages/sections/isis.core.meta-model.introspector.adoc b/core/config/src/main/adoc/modules/config/pages/sections/isis.core.meta-model.introspector.adoc index d288d75..22397bf 100644 --- a/core/config/src/main/adoc/modules/config/pages/sections/isis.core.meta-model.introspector.adoc +++ b/core/config/src/main/adoc/modules/config/pages/sections/isis.core.meta-model.introspector.adoc @@ -45,6 +45,17 @@ For now this is _experimental_. Leave this disabled (the default). | +[[isis.core.meta-model.introspector.policy]] +isis.core.meta-model.introspector. + +policy + +| +| Policy as to how introspection should process class members and supporting methods. + +Default is to only introspect public class members, while annotating these is optional. + + +| [[isis.core.meta-model.introspector.validate-incrementally]] isis.core.meta-model.introspector. + validate-incrementally diff --git a/core/config/src/main/adoc/modules/config/pages/sections/isis.core.meta-model.validator.adoc b/core/config/src/main/adoc/modules/config/pages/sections/isis.core.meta-model.validator.adoc index 16fdeb9..1f7c047 100644 --- a/core/config/src/main/adoc/modules/config/pages/sections/isis.core.meta-model.validator.adoc +++ b/core/config/src/main/adoc/modules/config/pages/sections/isis.core.meta-model.validator.adoc @@ -111,25 +111,27 @@ jdoql.variables-clause | +[[isis.core.meta-model.validator.parallelize]] +isis.core.meta-model.validator. + +parallelize + +| true +| Whether to perform metamodel validation in parallel. + + +| [[isis.core.meta-model.validator.no-params-only]] isis.core.meta-model.validator. + no-params-only -| +| true | If set, then checks that the supports ``hideXxx`` and ``disableXxx`` methods for actions do not have take parameters. Historically, the programming model allowed these methods to accept the same number of parameters as the action method to which they relate, the rationale being for similarity with the ``validateXxx`` method. However, since these parameters serve no function, the programming model has been simplified so that these supporting methods are discovered if they have exactly no parameters. Note that this aspect of the programming model relates to the ``hideXxx`` and ``disableXxx`` supporting methods that relate to the entire method. Do not confuse these with the ``hideNXxx`` and ``disableNXxx`` supporting methods, which relate to the N-th parameter, and allow up to N-1 parameters to be passed in (allowing the Nth parameter to be dynamically hidden or disabled). - -| -[[isis.core.meta-model.validator.parallelize]] -isis.core.meta-model.validator. + -parallelize - -| true -| Whether to perform metamodel validation in parallel. +@deprecated this option is ignored by the framework, behavior is now fixated to noParamsOnly = true diff --git a/core/config/src/main/adoc/modules/config/pages/sections/isis.viewer.wicket.adoc b/core/config/src/main/adoc/modules/config/pages/sections/isis.viewer.wicket.adoc index 1200d2d..1efd0e8 100644 --- a/core/config/src/main/adoc/modules/config/pages/sections/isis.viewer.wicket.adoc +++ b/core/config/src/main/adoc/modules/config/pages/sections/isis.viewer.wicket.adoc @@ -204,16 +204,6 @@ NOTE: For further discussion, see for example https://stackoverflow.com/question | -[[isis.viewer.wicket.date-pattern]] -isis.viewer.wicket.date-pattern - -| dd-MM-yyyy -| The pattern used for rendering and parsing dates. - -Each Date scalar panel will use ``#getDatePattern()`` or ``#getDateTimePattern()`` depending on its date type. In the case of panels with a date picker, the pattern will be dynamically adjusted so that it can be used by the https://github.com/Eonasdan/bootstrap-datetimepicker[Bootstrap Datetime Picker] component (which uses http://momentjs.com/docs/#/parsing/string-format/[Moment.js formats], rather than those of regular Java code). - - -| [[isis.viewer.wicket.date-picker.max-date]] isis.viewer.wicket.date-picker. + max-date @@ -236,17 +226,6 @@ As per http://eonasdan.github.io/bootstrap-datetimepicker/Options/#maxdate, in I | -[[isis.viewer.wicket.date-time-pattern]] -isis.viewer.wicket. + -date-time-pattern - -| dd-MM-yyyy HH:mm -| The pattern used for rendering and parsing date/times. - -Each Date scalar panel will use ``#getDatePattern()`` or ``#getDateTimePattern()`` depending on its date type. In the case of panels with a date time picker, the pattern will be dynamically adjusted so that it can be used by the https://github.com/Eonasdan/bootstrap-datetimepicker[Bootstrap Datetime Picker] component (which uses http://momentjs.com/docs/#/parsing/string-format/[Moment.js formats], rather than those of regular Java code). - - -| [[isis.viewer.wicket.development-utilities.enable]] isis.viewer.wicket. + development-utilities.enable @@ -422,7 +401,7 @@ isis.viewer.wicket.prompt-style This can be overridden on a case-by-case basis using ``@PropertyLayout#promptStyle`` and ``@ActionLayout#promptStyle``. -This behaviour is disabled by default; the viewer will use an inline prompt in these cases, making for a smoother user experience. If enabled then this reinstates the pre-1.15.0 behaviour of using a dialog prompt in all cases. +This behaviour is disabled by default; the viewer will use an inline prompt in these cases, making for a smoother user experience. | @@ -545,16 +524,6 @@ Expected to be in the list of ``#getEnabled()`` themes. | -[[isis.viewer.wicket.themes.provider]] -isis.viewer.wicket.themes.provider - -| org.apache.isis.viewer.wicket.ui. + -components.widgets.themepicker. + -IsisWicketThemeSupportDefault -| Specifies an implementation of ``IsisWicketThemeSupport`` - - -| [[isis.viewer.wicket.themes.show-chooser]] isis.viewer.wicket.themes. + show-chooser @@ -604,15 +573,6 @@ wicket-source-plugin This behaviour is disabled by default. Please be aware that enabloing it can substantially impact performance. -| -[[isis.viewer.wicket.timestamp-pattern]] -isis.viewer.wicket. + -timestamp-pattern - -| yyyy-MM-dd HH:mm:ss.SSS -| @deprecated - seemingly unused - - |=== diff --git a/preview.sh b/preview.sh index a9d66a7..4be70c4 100644 --- a/preview.sh +++ b/preview.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash export ANTORA_CACHE_DIR=.antora-cache-dir export ANTORA_TARGET_SITE=antora/target/site @@ -139,7 +139,7 @@ export ANTORA_CMD=antora SECONDS=0 echo "\$PLAYBOOK_FILE = $PLAYBOOK_FILE" -sh build-site.sh $PLAYBOOK_FILE || exit 1 +bash build-site.sh $PLAYBOOK_FILE || exit 1 if [[ "$SKIP_SERVE" == "true" ]]; then echo "skipping serving" diff --git a/scripts/ci/_adoc-copy-examples.sh b/scripts/ci/_adoc-copy-examples.sh index abd4a2f..69d31e7 100644 --- a/scripts/ci/_adoc-copy-examples.sh +++ b/scripts/ci/_adoc-copy-examples.sh @@ -29,5 +29,5 @@ echo "doc gen: copying over examples ..." for examples_sh in $(find $PROJECT_ROOT_PATH -name examples.sh -print) do echo $examples_sh - sh $examples_sh + /bin/bash $examples_sh done diff --git a/scripts/ci/build-artifacts.sh b/scripts/ci/build-artifacts.sh index 418af2a..4f425da 100644 --- a/scripts/ci/build-artifacts.sh +++ b/scripts/ci/build-artifacts.sh @@ -53,7 +53,7 @@ if [ -z "$SETTINGS_XML" ]; then SETTINGS_XML=$PROJECT_ROOT_PATH/.m2/settings.xml fi -sh $SCRIPT_DIR/_print-environment.sh "build-artifacts" +bash $SCRIPT_DIR/_print-environment.sh "build-artifacts" ### FUNCTIONS diff --git a/scripts/ci/build-docker-images.sh b/scripts/ci/build-docker-images.sh index 16e924c..c5962ae 100644 --- a/scripts/ci/build-docker-images.sh +++ b/scripts/ci/build-docker-images.sh @@ -53,7 +53,7 @@ if [ -z "$MVN_STAGES" ]; then MVN_STAGES="clean install" fi -sh $SCRIPT_DIR/_print-environment.sh "build-demo-app" +bash $SCRIPT_DIR/_print-environment.sh "build-demo-app" export ISIS_VERSION=$REVISION echo "" @@ -71,10 +71,10 @@ function setRevision() { function revertRevision() { local dir=${1} - + if [ ! -z "$REVISION" ]; then cd $PROJECT_ROOT_PATH/${dir} - mvn versions:revert -DnewVersion=$REVISION -DprocessAllModules=true -Dmodule-all + mvn versions:revert -DnewVersion=$REVISION -DprocessAllModules=true -Dmodule-all fi } @@ -101,7 +101,7 @@ function buildDockerImage() { setRevision -# -- debug the version rewriting -- +# -- debug the version rewriting -- # 1) add an exit statement after the comments below # exit 0 # 2) run this script from project root via: diff --git a/scripts/ci/build-regressiontests.sh b/scripts/ci/build-regressiontests.sh index ef4f875..18a5a02 100644 --- a/scripts/ci/build-regressiontests.sh +++ b/scripts/ci/build-regressiontests.sh @@ -37,7 +37,7 @@ if [ -z "$MVN_STAGES" ]; then MVN_STAGES="clean install" fi -sh $SCRIPT_DIR/_print-environment.sh "build-smoketests" +bash $SCRIPT_DIR/_print-environment.sh "build-smoketests" # # update version (but just for the modules we need to build) diff --git a/tooling/java2adoc/src/main/java/org/apache/isis/tooling/j2adoc/format/UnitFormatterAbstract.java b/tooling/java2adoc/src/main/java/org/apache/isis/tooling/j2adoc/format/UnitFormatterAbstract.java index 1413fbf..b4563b5 100644 --- a/tooling/java2adoc/src/main/java/org/apache/isis/tooling/j2adoc/format/UnitFormatterAbstract.java +++ b/tooling/java2adoc/src/main/java/org/apache/isis/tooling/j2adoc/format/UnitFormatterAbstract.java @@ -19,9 +19,7 @@ package org.apache.isis.tooling.j2adoc.format; import java.io.File; -import java.util.Arrays; -import java.util.Collections; -import java.util.Optional; +import java.util.*; import java.util.function.BiFunction; import java.util.function.Function; import java.util.stream.Collectors; @@ -204,11 +202,13 @@ implements UnitFormatter { final File hooks = file.toPath().getParent().resolve("hooks").toFile(); if (!hooks.exists() || !hooks.isDirectory()) { return Collections.emptyList(); - } else { - return Arrays.stream(hooks.list((dir, name) -> name.startsWith(baseName + "_"))) - .map(hookFileName -> "hooks/" + hookFileName) - .collect(Collectors.toList()); } + return Arrays.stream( + Objects.requireNonNull(hooks.list((dir, name) -> name.startsWith(baseName + "_"))) + ) + .map(hookFileName -> "hooks/" + hookFileName) + .sorted() + .collect(Collectors.toList()); } static String determineBaseName(final String fileName) {
