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

danhaywood pushed a change to branch dev/2.0.0/ISIS-1632-meta-annotations
in repository https://gitbox.apache.org/repos/asf/isis.git.


    from 1c05c0e  ISIS-1632: removes @Meta annotation, since not required.
     add 8db551a  ISIS-1766: adds new resources to allow menuBars and layout to 
be requested as json
     add 241ff41  ISIS-1765, ISIS-1766, ISIS-1770: new object-layout resource 
with links; adds links for menuBars repr also; fix for actions with 
ARE_YOU_SURE semantics.
     add 8c8ef66  ISIS-1766: adds docs on new layout resources
     add 5bad9fa  adds discussion on using view models in REST APIs
     add 3f49af7  adds link to imworld video
     add 8c72924  fixes title for presentation
     add b7b9083  fixes image size in cgcom
     add 724dc03  ISIS-1766: adds new method to LayoutService to download 
menubars.layout.xml.  Also...
     add 42000bb  ISIS-1766: adds MenuBarsLoaderService, support for reading 
menu bars layout from file (overriding facets)
     add c1d590c  ISIS-1766: adds some documentation about MenuBarsSevice and 
MenuBarsLoaderService and the new MenuBars layout classes.  Also...
     add 6c83e36  ISIS-1766: adds the ability to download a fallback 
menubars.layout.xml.
     add 8814a04  ISIS-1766: changes ServiceActionLayoutData#oid to just 
#objectType
     add cd10d06  ISIS-1766: fixes case when there is no menubars.layout.xml to 
load
     add 467e6ed  bumps simpleapp to 1.1.6.0-SNAPSHOT
     add 4396b97  ISIS-1766: adds Menu#unreferencedActions as a flag.
     add 78d48f1  ISIS-1766: renames ActionLayoutDataOwner to 
ServiceActionLoayoutDataOwner
     add da8e039  ISIS-1766: wip, introduce bs3 for menubars
     add a3ac2ba  ISIS-1766: refactors to introduce bs3 for menubars (work in 
progress)
     add 7f04498  ISIS-1766: removes the properties from the MenuBar 
interfaces, messes up JAXB serialization; recreates the .xsd schema files
     add affdba6  ISIS-1766: adds support for 'unreferencedActions' menu, with 
validation to ensure that there is precisely one such.
     add c19fa8f  ISIS-1766: updates docs for menubars
     add 56c0195  ISIS-1766: updates docs for menubars, and fixes an NPE
     add 46a8716  ISIS-1728, ISIS-1776: updates helloworld and simpleapp to use 
typesafe queries; removes lombok from helloworld
     add c7d4292  ISIS-1465: fixes bad link in index.html for archetypes
     add acbcc5c  ISIS-1465: fixes bad appender reference in logging.properties 
of the two archetypes
     new fe425d8  Merge branch 'master' into 
dev/2.0.0/ISIS-1632-meta-annotations

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:
 .../asciidoc/applib/layout/component/component.xsd |  59 ++++--
 .../applib/layout/grid/bootstrap3/bootstrap3.xsd   |  19 +-
 .../main/asciidoc/applib/layout/links/links.xsd    |  16 ++
 .../applib/layout/menubars/bootstrap3/menubars.xsd |  50 +++++
 .../guides/cgcom/_cgcom_cutting-a-release.adoc     |   2 +-
 .../main/asciidoc/guides/rgcms/_rgcms_classes.adoc |   1 +
 .../guides/rgcms/_rgcms_classes_layout.adoc        |  53 +++--
 .../guides/rgcms/_rgcms_classes_menubars.adoc      |  90 ++++++++
 .../rgsvc/_rgsvc_presentation-layer-spi.adoc       |   2 +
 ...esentation-layer-spi_MenuBarsLoaderService.adoc |  32 +++
 ...svc_presentation-layer-spi_MenuBarsService.adoc |  30 ++-
 ...blocks_types-of-domain-objects_view-models.adoc |  44 +++-
 .../guides/ugvro/_ugvro_hints-and-tips.adoc        |   2 +
 ...vro_hints-and-tips_view-model-as-parameter.adoc |  70 ++++++
 .../guides/ugvro/_ugvro_layout-resources.adoc      | 235 +++++++++++++++++++++
 .../src/main/asciidoc/guides/ugvro/ugvro.adoc      |   1 +
 .../main/asciidoc/guides/ugvw/_ugvw_layout.adoc    |   6 +-
 .../guides/ugvw/_ugvw_layout_application-menu.adoc | 165 ---------------
 .../guides/ugvw/_ugvw_layout_file-based.adoc       |  62 +++---
 .../guides/ugvw/_ugvw_menubars-layout.adoc         |  39 ++++
 .../_ugvw_menubars-layout_annotation-based.adoc    | 126 +++++++++++
 .../ugvw/_ugvw_menubars-layout_file-based.adoc     | 105 +++++++++
 .../guides/ugvw/images/menubars/010-download.png   | Bin 0 -> 21017 bytes
 .../guides/ugvw/images/menubars/020-download.png   | Bin 0 -> 15727 bytes
 .../src/main/asciidoc/guides/ugvw/ugvw.adoc        |   1 +
 .../articles-and-presentations.adoc                |   3 +-
 .../applib/layout/component/ActionLayoutData.java  |  22 ++
 .../layout/component/CollectionLayoutData.java     |  20 ++
 .../layout/component/DomainObjectLayoutData.java   |  22 ++
 .../layout/component/PropertyLayoutData.java       |  22 ++
 .../ServiceActionLayoutData.java}                  |  64 ++++--
 .../ServiceActionLayoutDataOwner.java}             |  10 +-
 .../applib/layout/{component => grid}/Grid.java    |   7 +-
 .../layout/{component => grid}/GridAbstract.java   |  10 +-
 .../applib/layout/grid/bootstrap3/BS3Grid.java     |   4 +-
 .../org/apache/isis/applib/layout/links/Link.java  |  93 ++++++++
 .../layout/{menus => links}/package-info.java      |   6 +-
 .../Menu.java}                                     |  12 +-
 .../MenuBar.java}                                  |  11 +-
 .../isis/applib/layout/menubars/MenuBars.java      |  36 ++--
 .../applib/layout/menubars/MenuBarsAbstract.java   |  42 ++++
 .../MenuSection.java}                              |  12 +-
 .../Menu.java => menubars/bootstrap3/BS3Menu.java} |  36 +++-
 .../bootstrap3/BS3MenuBar.java}                    |  15 +-
 .../layout/menubars/bootstrap3/BS3MenuBars.java    | 201 ++++++++++++++++++
 .../bootstrap3/BS3MenuSection.java}                |  25 ++-
 .../bootstrap3}/package-info.java                  |   6 +-
 .../apache/isis/applib/layout/menus/MenuBars.java  | 111 ----------
 .../applib/services/grid/GridLoaderService.java    |   2 +-
 .../isis/applib/services/grid/GridService.java     |   4 +-
 .../applib/services/grid/GridSystemService.java    |   4 +-
 .../isis/applib/services/layout/LayoutService.java |   1 -
 .../applib/services/layout/LayoutService2.java}    |  28 +--
 .../applib/services/layout/LayoutServiceMenu.java  |  38 +++-
 .../menu/MenuBarsLoaderService.java}               |  22 +-
 .../isis/applib/services/menu/MenuBarsService.java |  40 +++-
 .../bootstrap3/BS3MenuBars_roundtrip_Test.java}    |  27 +--
 .../core/integtestsupport/IsisSystemForTest.java   |   2 +-
 .../core/commons/authentication/MessageBroker.java |   4 +
 .../metamodel/facets/object/grid/GridFacet.java    |   2 +-
 .../facets/object/grid/GridFacetDefault.java       |   2 +-
 .../services/grid/GridLoaderServiceDefault.java    |   2 +-
 .../services/grid/GridServiceDefault.java          |  37 ++--
 .../services/grid/GridSystemServiceAbstract.java   |   4 +-
 .../grid/bootstrap3/GridSystemServiceBS3.java      |   2 +-
 .../services/layout/LayoutServiceDefault.java      |  21 +-
 .../services/menubars/BS3MenuBarsTest.java         |  60 ++++++
 .../services/menubars/menubars.layout.xml          |  91 ++++++++
 core/pom.xml                                       |   5 +
 .../isis/core/runtime/runner/IsisInjectModule.java |   4 +-
 .../menubars/MenuBarsLoaderServiceDefault.java     |  66 ++++++
 .../bootstrap3/MenuBarsServiceBS3.java}            | 203 +++++++++++++++---
 .../bootstrap3}/ServiceAndAction.java              |   2 +-
 .../system/persistence/PersistenceSession.java     |   5 +-
 .../runtime/system/session/IsisSessionFactory.java |  11 +-
 .../system/session/IsisSessionFactoryBuilder.java  |  21 +-
 .../jmocking/JMockActionsTest_returnArgument.java  |   8 +-
 ...ockery2Test_mockAnnotatedWithNever_sadCase.java |   3 +-
 core/viewer-restfulobjects-applib/pom.xml          |   6 +-
 .../isis/viewer/restfulobjects/applib/Rel.java     |   1 +
 .../restfulobjects/applib/RepresentationType.java  |   8 +-
 .../restfulobjects/applib/RestfulMediaType.java    |   5 +
 .../applib/domainobjects/DomainObjectResource.java |  18 ++
 .../applib/domaintypes/DomainTypeResource.java     |   6 +-
 .../applib/menubars/MenuBarsResource.java          |   5 +-
 .../restfulobjects/applib/Rel_getName_Test.java    |  28 +++
 .../domainobjects/DomainObjectReprRenderer.java    |  16 +-
 .../rendering/domainobjects/InvokeKeys.java        |   4 +
 .../domaintypes/DomainTypeReprRenderer.java        |   7 +-
 .../resources/DomainObjectResourceServerside.java  | 115 ++++++++++
 .../resources/DomainTypeResourceServerside.java    |  14 +-
 .../resources/MenuBarsResourceServerside.java      |  38 +++-
 .../serialization/SerializationStrategy.java       |  82 +++++++
 .../serviceactions/ServiceActionUtil.java          |  23 +-
 .../serviceactions/ServiceActionsPanelFactory.java |   2 +-
 .../serviceactions/TertiaryMenuPanelFactory.java   |   2 +-
 .../CollectionContentsAsAjaxTablePanel.java        |   5 +-
 .../links/EntityLinksSelectorPanelFactory.java     |   2 +-
 .../viewer/wicket/ui/pages/entity/EntityPage.java  |   2 +-
 example/application/helloworld/pom.xml             |   8 -
 .../java/domainapp/application/menubars.layout.xml |  91 ++++++++
 .../java/domainapp/dom/impl/HelloWorldObject.java  |  43 ++--
 .../java/domainapp/dom/impl/HelloWorldObjects.java |  23 +-
 .../src/main/webapp/WEB-INF/logging.properties     |   2 +-
 .../helloworld/src/main/webapp/about/index.html    |   2 +-
 .../dom/impl/HelloWorldObjectTest_delete.java      |   2 +-
 .../dom/impl/HelloWorldObjectTest_updateName.java  |   2 +-
 .../application/manifest/menubars.layout.xml       |  91 ++++++++
 .../modules/simple/dom/impl/SimpleObject.java      |  57 ++---
 .../modules/simple/dom/impl/SimpleObjectMenu.java  |   3 +
 .../simple/dom/impl/SimpleObjectRepository.java    |  20 +-
 .../dom/impl/SimpleObjectRepository_Test.java      |   5 -
 .../src/main/webapp/WEB-INF/logging.properties     |   2 +-
 .../webapp/src/main/webapp/about/index.html        |   2 +-
 114 files changed, 2769 insertions(+), 694 deletions(-)
 create mode 100644 
adocs/documentation/src/main/asciidoc/applib/layout/links/links.xsd
 create mode 100644 
adocs/documentation/src/main/asciidoc/applib/layout/menubars/bootstrap3/menubars.xsd
 create mode 100644 
adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_menubars.adoc
 create mode 100644 
adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_MenuBarsLoaderService.adoc
 create mode 100644 
adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_hints-and-tips_view-model-as-parameter.adoc
 create mode 100644 
adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_layout-resources.adoc
 delete mode 100644 
adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_application-menu.adoc
 create mode 100644 
adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_menubars-layout.adoc
 create mode 100644 
adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_menubars-layout_annotation-based.adoc
 create mode 100644 
adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_menubars-layout_file-based.adoc
 create mode 100644 
adocs/documentation/src/main/asciidoc/guides/ugvw/images/menubars/010-download.png
 create mode 100644 
adocs/documentation/src/main/asciidoc/guides/ugvw/images/menubars/020-download.png
 rename 
core/applib/src/main/java/org/apache/isis/applib/layout/{menus/ActionLayoutData.java
 => component/ServiceActionLayoutData.java} (75%)
 copy 
core/applib/src/main/java/org/apache/isis/applib/layout/{menus/ActionLayoutDataOwner.java
 => component/ServiceActionLayoutDataOwner.java} (77%)
 rename core/applib/src/main/java/org/apache/isis/applib/layout/{component => 
grid}/Grid.java (88%)
 rename core/applib/src/main/java/org/apache/isis/applib/layout/{component => 
grid}/GridAbstract.java (92%)
 create mode 100644 
core/applib/src/main/java/org/apache/isis/applib/layout/links/Link.java
 copy core/applib/src/main/java/org/apache/isis/applib/layout/{menus => 
links}/package-info.java (91%)
 copy 
core/applib/src/main/java/org/apache/isis/applib/layout/{menus/ActionLayoutDataOwner.java
 => menubars/Menu.java} (75%)
 copy 
core/applib/src/main/java/org/apache/isis/applib/layout/{menus/ActionLayoutDataOwner.java
 => menubars/MenuBar.java} (75%)
 copy 
example/application/helloworld/src/test/java/domainapp/dom/impl/HelloWorldObjectTest_updateName.java
 => 
core/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBars.java 
(51%)
 create mode 100644 
core/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBarsAbstract.java
 copy 
core/applib/src/main/java/org/apache/isis/applib/layout/{menus/ActionLayoutDataOwner.java
 => menubars/MenuSection.java} (75%)
 rename 
core/applib/src/main/java/org/apache/isis/applib/layout/{menus/Menu.java => 
menubars/bootstrap3/BS3Menu.java} (68%)
 rename 
core/applib/src/main/java/org/apache/isis/applib/layout/{menus/MenuBar.java => 
menubars/bootstrap3/BS3MenuBar.java} (80%)
 create mode 100644 
core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars.java
 rename 
core/applib/src/main/java/org/apache/isis/applib/layout/{menus/MenuSection.java 
=> menubars/bootstrap3/BS3MenuSection.java} (57%)
 rename core/applib/src/main/java/org/apache/isis/applib/layout/{menus => 
menubars/bootstrap3}/package-info.java (88%)
 delete mode 100644 
core/applib/src/main/java/org/apache/isis/applib/layout/menus/MenuBars.java
 rename 
core/{metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridNormalizerUtil.java
 => 
applib/src/main/java/org/apache/isis/applib/services/layout/LayoutService2.java}
 (58%)
 rename 
core/applib/src/main/java/org/apache/isis/applib/{layout/menus/ActionLayoutDataOwner.java
 => services/menu/MenuBarsLoaderService.java} (63%)
 rename 
core/applib/src/test/java/org/apache/isis/applib/layout/{menus/MenuBars_roundtrip_Test.java
 => menubars/bootstrap3/BS3MenuBars_roundtrip_Test.java} (62%)
 create mode 100644 
core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/menubars/BS3MenuBarsTest.java
 create mode 100644 
core/metamodel/src/test/resources/org/apache/isis/core/metamodel/services/menubars/menubars.layout.xml
 create mode 100644 
core/runtime/src/main/java/org/apache/isis/core/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
 rename 
core/runtime/src/main/java/org/apache/isis/core/runtime/services/{menu/MenuBarsServiceDefault.java
 => menubars/bootstrap3/MenuBarsServiceBS3.java} (54%)
 rename core/runtime/src/main/java/org/apache/isis/core/runtime/services/{menu 
=> menubars/bootstrap3}/ServiceAndAction.java (91%)
 create mode 100644 
core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/Rel_getName_Test.java
 create mode 100644 
core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/serialization/SerializationStrategy.java
 create mode 100644 
example/application/helloworld/src/main/java/domainapp/application/menubars.layout.xml
 create mode 100644 
example/application/simpleapp/application/src/main/java/domainapp/application/manifest/menubars.layout.xml

-- 
To stop receiving notification emails like this one, please contact
['"commits@isis.apache.org" <commits@isis.apache.org>'].

Reply via email to