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 2022/09/01 12:16:30 UTC
[isis] branch master updated (4703b30012 -> 3df3eb7415)
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 4703b30012 ISIS-3167: remove ManagedObject.titleString()
add e44e411a5a ISIS-3197: adds support for datatables.net
add 488e9f5943 ISIS-3197: regen docs
add 658c7e7771 ISIS-3197: fixes js compile issue (?)
add 512f739be6 ISIS-3197: adds support for loading tableDecoration from .layout.xml
add 85c58d8f17 ISIS-3197: updates regression test
add dc735313d5 ISIS-3197: reimplements regression test using approvaltests library
add c664721891 ISIS-3197: regen docs once more
new 3df3eb7415 Merge pull request #1077 from apache/ISIS-3197
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:
.../pages/index/annotation/CollectionLayout.adoc | 11 +
.../pages/index/annotation/DomainObjectLayout.adoc | 11 +
.../pages/index/annotation/TableDecoration.adoc | 64 +
.../layout/component/CollectionLayoutData.adoc | 2 +
.../layout/component/DomainObjectLayoutData.adoc | 2 +
.../index/layout/component/TableDecoration.adoc | 14 +
.../pages/index/services/metamodel/BeanSort.adoc | 2 +-
.../index/services/registry/ServiceRegistry.adoc | 16 +-
.../index/metamodel/object/ManagedObject.adoc | 51 +-
.../applib/layout/component/component.xsd | 9 +
.../isis/applib/annotation/ActionLayout.java | 1 +
.../isis/applib/annotation/CollectionLayout.java | 9 +
.../isis/applib/annotation/DomainObjectLayout.java | 8 +
.../isis/applib/annotation/TableDecoration.java | 60 +
.../layout/component/CollectionLayoutData.java | 20 +
.../layout/component/DomainObjectLayoutData.java | 18 +
.../applib/layout/component/TableDecoration.java | 15 +-
bom/pom.xml | 2 +
core/adoc/modules/_overview/pages/about.adoc | 4 +-
.../apache/isis/core/config/IsisConfiguration.java | 157 +-
...shingPolicies.java => ActionConfigOptions.java} | 57 +-
...ies.java => CollectionLayoutConfigOptions.java} | 41 +-
...uration.java => DomainObjectConfigOptions.java} | 22 +-
...s.java => DomainObjectLayoutConfigOptions.java} | 30 +-
...erPolicies.java => ParameterConfigOptions.java} | 4 +-
...nfiguration.java => PropertyConfigOptions.java} | 21 +-
.../actions/layout/ActionLayoutFacetFactory.java | 1 +
.../layout/CollectionLayoutFacetFactory.java | 8 +
.../PagedFacetForCollectionLayoutAnnotation.java | 11 +-
...agedFacetOverriddenByDataTablesDecoration.java} | 17 +-
.../CollectionLayoutTableDecorationFacet.java | 75 +
...lectionLayoutTableDecorationFacetAbstract.java} | 16 +-
...orationFacetForCollectionLayoutAnnotation.java} | 12 +-
...ForCollectionLayoutAnnotationAsConfigured.java} | 12 +-
...TableDecorationFacetForCollectionLayoutXml.java | 53 +
...youtTableDecorationFacetFromConfiguration.java} | 12 +-
.../CommandPublishingFacetForActionAnnotation.java | 4 +-
...ommandPublishingFacetForPropertyAnnotation.java | 4 +-
...onPublishingActionFacetForActionAnnotation.java | 4 +-
...blishingPropertyFacetForPropertyAnnotation.java | 4 +-
.../ImmutableFacetForDomainObjectAnnotation.java | 4 +-
...gePublishingFacetForDomainObjectAnnotation.java | 4 +-
.../DomainObjectLayoutFacetFactory.java | 5 +
.../PagedFacetForDomainObjectLayoutAnnotation.java | 12 +-
...agedFacetOverriddenByDataTablesDecoration.java} | 13 +-
.../DomainObjectLayoutTableDecorationFacet.java | 74 +
...nObjectLayoutTableDecorationFacetAbstract.java} | 16 +-
...ationFacetForDomainObjectLayoutAnnotation.java} | 12 +-
...rDomainObjectLayoutAnnotationAsConfigured.java} | 12 +-
...bleDecorationFacetForDomainObjectLayoutXml.java | 61 +
...youtTableDecorationFacetFromConfiguration.java} | 12 +-
.../metamodel/facets/object/paged/PagedFacet.java | 14 -
...ActionFacetForActionAnnotationAsConfigured.java | 4 +-
.../depdef/ParameterDependentDefaultsFacet.java | 13 +-
.../ParameterDependentDefaultsFacetAbstract.java | 6 +-
...pendentDefaultsFacetForParameterAnnotation.java | 4 +-
...terDependentDefaultsFacetFromConfiguration.java | 4 +-
.../services/grid/GridSystemServiceAbstract.java | 13 +
.../apache/isis/core/metamodel/util/Facets.java | 6 +-
.../action/ActionAnnotationFacetFactoryTest.java | 4 +-
...tationFacetFactoryTest_executionPublishing.java | 26 +-
.../DomainObjectAnnotationFacetFactoryTest.java | 29 +-
core/pom.xml | 6 +
regressiontests/stable-domainmodel/pom.xml | 16 +
.../apache/isis/testdomain/domainmodel/.gitignore | 2 +
.../domainmodel/MetaModelRegressionTest.java | 63 +-
.../MetaModelRegressionTest.verify.approved.xml | 26727 +++++++++++++++++++
.../src/test/resources/metamodel.xml.zip | Bin 102627 -> 0 bytes
viewers/wicket/ui/pom.xml | 37 +-
.../entity/collection/EntityCollectionPanel.java | 7 +
.../StandaloneCollectionPanel.java | 6 +
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 11 +
.../bootstrap/css/bootstrap-overrides-all-v2.css | 18 +-
.../DatatablesCssBootstrap5ReferenceWkt.java | 48 +
.../datatables/DatatablesCssReferenceWkt.java | 48 +
...DatatablesJavaScriptBootstrap5ReferenceWkt.java | 49 +
.../DatatablesJavaScriptReferenceWkt.java | 49 +
.../DatatablesJavaScriptResourceReferenceInit.java | 75 +
.../common/datatables/dataTables.init.js.template | 14 +-
.../common/viewer/js/jquery.isis.wicket.viewer.js | 7 +-
.../config/WicketViewerCssBundleInit.java | 2 +
81 files changed, 28010 insertions(+), 407 deletions(-)
create mode 100644 antora/components/refguide-index/modules/applib/pages/index/annotation/TableDecoration.adoc
create mode 100644 antora/components/refguide-index/modules/applib/pages/index/layout/component/TableDecoration.adoc
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/annotation/TableDecoration.java
copy core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/EditingObjectsConfiguration.java => api/applib/src/main/java/org/apache/isis/applib/layout/component/TableDecoration.java (75%)
rename core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/{PublishingPolicies.java => ActionConfigOptions.java} (54%)
copy core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/{ParameterPolicies.java => CollectionLayoutConfigOptions.java} (51%)
copy core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/{DefaultViewConfiguration.java => DomainObjectConfigOptions.java} (66%)
copy core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/{ParameterPolicies.java => DomainObjectLayoutConfigOptions.java} (56%)
rename core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/{ParameterPolicies.java => ParameterConfigOptions.java} (97%)
rename core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/{DefaultViewConfiguration.java => PropertyConfigOptions.java} (61%)
copy core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/{PagedFacetForCollectionLayoutAnnotation.java => PagedFacetOverriddenByDataTablesDecoration.java} (64%)
create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacet.java
copy core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/{param/parameter/depdef/ParameterDependentDefaultsFacetAbstract.java => collections/layout/tabledec/CollectionLayoutTableDecorationFacetAbstract.java} (66%)
copy core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/{param/parameter/depdef/ParameterDependentDefaultsFacetFromConfiguration.java => collections/layout/tabledec/CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation.java} (66%)
copy core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/{param/parameter/depdef/ParameterDependentDefaultsFacetFromConfiguration.java => collections/layout/tabledec/CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotationAsConfigured.java} (64%)
create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/tabledec/CollectionLayoutTableDecorationFacetForCollectionLayoutXml.java
copy core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/{param/parameter/depdef/ParameterDependentDefaultsFacetForParameterAnnotation.java => collections/layout/tabledec/CollectionLayoutTableDecorationFacetFromConfiguration.java} (68%)
copy core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/{param/parameter/depdef/ParameterDependentDefaultsFacetFromConfiguration.java => object/domainobjectlayout/PagedFacetOverriddenByDataTablesDecoration.java} (67%)
create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacet.java
copy core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/{param/parameter/depdef/ParameterDependentDefaultsFacetAbstract.java => object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetAbstract.java} (65%)
copy core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/{param/parameter/depdef/ParameterDependentDefaultsFacetFromConfiguration.java => object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutAnnotation.java} (65%)
copy core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/{param/parameter/depdef/ParameterDependentDefaultsFacetFromConfiguration.java => object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutAnnotationAsConfigured.java} (63%)
create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutXml.java
copy core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/{param/parameter/depdef/ParameterDependentDefaultsFacetFromConfiguration.java => object/domainobjectlayout/tabledec/DomainObjectLayoutTableDecorationFacetFromConfiguration.java} (67%)
create mode 100644 regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/.gitignore
create mode 100644 regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/MetaModelRegressionTest.verify.approved.xml
delete mode 100644 regressiontests/stable-domainmodel/src/test/resources/metamodel.xml.zip
create mode 100644 viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesCssBootstrap5ReferenceWkt.java
create mode 100644 viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesCssReferenceWkt.java
create mode 100644 viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptBootstrap5ReferenceWkt.java
create mode 100644 viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptReferenceWkt.java
create mode 100644 viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptResourceReferenceInit.java
rename core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/EditingObjectsConfiguration.java => viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/dataTables.init.js.template (83%)
[isis] 01/01: Merge pull request #1077 from apache/ISIS-3197
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 3df3eb74150088afdafeb362a6c393a2df369cb8
Merge: 4703b30012 c664721891
Author: Dan Haywood <da...@apache.org>
AuthorDate: Thu Sep 1 13:16:25 2022 +0100
Merge pull request #1077 from apache/ISIS-3197
Isis 3197
.../pages/index/annotation/CollectionLayout.adoc | 11 +
.../pages/index/annotation/DomainObjectLayout.adoc | 11 +
.../pages/index/annotation/TableDecoration.adoc | 64 +
.../layout/component/CollectionLayoutData.adoc | 2 +
.../layout/component/DomainObjectLayoutData.adoc | 2 +
.../index/layout/component/TableDecoration.adoc | 14 +
.../pages/index/services/metamodel/BeanSort.adoc | 2 +-
.../index/services/registry/ServiceRegistry.adoc | 16 +-
.../index/metamodel/object/ManagedObject.adoc | 51 +-
.../applib/layout/component/component.xsd | 9 +
.../isis/applib/annotation/ActionLayout.java | 1 +
.../isis/applib/annotation/CollectionLayout.java | 9 +
.../isis/applib/annotation/DomainObjectLayout.java | 8 +
.../isis/applib/annotation/TableDecoration.java | 60 +
.../layout/component/CollectionLayoutData.java | 20 +
.../layout/component/DomainObjectLayoutData.java | 18 +
.../applib/layout/component/TableDecoration.java | 15 +-
bom/pom.xml | 2 +
core/adoc/modules/_overview/pages/about.adoc | 4 +-
.../apache/isis/core/config/IsisConfiguration.java | 157 +-
...shingPolicies.java => ActionConfigOptions.java} | 57 +-
...ies.java => CollectionLayoutConfigOptions.java} | 41 +-
...uration.java => DomainObjectConfigOptions.java} | 22 +-
...s.java => DomainObjectLayoutConfigOptions.java} | 30 +-
...erPolicies.java => ParameterConfigOptions.java} | 4 +-
...nfiguration.java => PropertyConfigOptions.java} | 21 +-
.../actions/layout/ActionLayoutFacetFactory.java | 1 +
.../layout/CollectionLayoutFacetFactory.java | 8 +
.../PagedFacetForCollectionLayoutAnnotation.java | 11 +-
...agedFacetOverriddenByDataTablesDecoration.java} | 17 +-
.../CollectionLayoutTableDecorationFacet.java | 75 +
...lectionLayoutTableDecorationFacetAbstract.java} | 16 +-
...orationFacetForCollectionLayoutAnnotation.java} | 12 +-
...ForCollectionLayoutAnnotationAsConfigured.java} | 12 +-
...TableDecorationFacetForCollectionLayoutXml.java | 53 +
...youtTableDecorationFacetFromConfiguration.java} | 12 +-
.../CommandPublishingFacetForActionAnnotation.java | 4 +-
...ommandPublishingFacetForPropertyAnnotation.java | 4 +-
...onPublishingActionFacetForActionAnnotation.java | 4 +-
...blishingPropertyFacetForPropertyAnnotation.java | 4 +-
.../ImmutableFacetForDomainObjectAnnotation.java | 4 +-
...gePublishingFacetForDomainObjectAnnotation.java | 4 +-
.../DomainObjectLayoutFacetFactory.java | 5 +
.../PagedFacetForDomainObjectLayoutAnnotation.java | 12 +-
...agedFacetOverriddenByDataTablesDecoration.java} | 13 +-
.../DomainObjectLayoutTableDecorationFacet.java | 74 +
...nObjectLayoutTableDecorationFacetAbstract.java} | 16 +-
...ationFacetForDomainObjectLayoutAnnotation.java} | 12 +-
...rDomainObjectLayoutAnnotationAsConfigured.java} | 12 +-
...bleDecorationFacetForDomainObjectLayoutXml.java | 61 +
...youtTableDecorationFacetFromConfiguration.java} | 12 +-
.../metamodel/facets/object/paged/PagedFacet.java | 14 -
...ActionFacetForActionAnnotationAsConfigured.java | 4 +-
.../depdef/ParameterDependentDefaultsFacet.java | 13 +-
.../ParameterDependentDefaultsFacetAbstract.java | 6 +-
...pendentDefaultsFacetForParameterAnnotation.java | 4 +-
...terDependentDefaultsFacetFromConfiguration.java | 4 +-
.../services/grid/GridSystemServiceAbstract.java | 13 +
.../apache/isis/core/metamodel/util/Facets.java | 6 +-
.../action/ActionAnnotationFacetFactoryTest.java | 4 +-
...tationFacetFactoryTest_executionPublishing.java | 26 +-
.../DomainObjectAnnotationFacetFactoryTest.java | 29 +-
core/pom.xml | 6 +
regressiontests/stable-domainmodel/pom.xml | 16 +
.../apache/isis/testdomain/domainmodel/.gitignore | 2 +
.../domainmodel/MetaModelRegressionTest.java | 63 +-
.../MetaModelRegressionTest.verify.approved.xml | 26727 +++++++++++++++++++
.../src/test/resources/metamodel.xml.zip | Bin 102627 -> 0 bytes
viewers/wicket/ui/pom.xml | 37 +-
.../entity/collection/EntityCollectionPanel.java | 7 +
.../StandaloneCollectionPanel.java | 6 +
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 11 +
.../bootstrap/css/bootstrap-overrides-all-v2.css | 18 +-
.../DatatablesCssBootstrap5ReferenceWkt.java | 48 +
.../datatables/DatatablesCssReferenceWkt.java | 48 +
...DatatablesJavaScriptBootstrap5ReferenceWkt.java | 49 +
.../DatatablesJavaScriptReferenceWkt.java | 49 +
.../DatatablesJavaScriptResourceReferenceInit.java | 75 +
.../common/datatables/dataTables.init.js.template | 14 +-
.../common/viewer/js/jquery.isis.wicket.viewer.js | 7 +-
.../config/WicketViewerCssBundleInit.java | 2 +
81 files changed, 28010 insertions(+), 407 deletions(-)