You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/01/26 20:48:47 UTC
[isis] branch master updated: ISIS-2431: fixing menubar layouts
(new namespaces)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new ddd9d92 ISIS-2431: fixing menubar layouts (new namespaces)
ddd9d92 is described below
commit ddd9d92e9a6373adf092a99c1b4d079bb3fd5a07
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Jan 26 21:48:30 2021 +0100
ISIS-2431: fixing menubar layouts (new namespaces)
---
.../services/menubars/menubars.layout.xml | 32 ++++----
.../src/main/java/demoapp/dom/menubars.layout.xml | 92 +++++++++++-----------
2 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/core/metamodel/src/test/resources/org/apache/isis/core/metamodel/services/menubars/menubars.layout.xml b/core/metamodel/src/test/resources/org/apache/isis/core/metamodel/services/menubars/menubars.layout.xml
index 988e14c..577372f 100644
--- a/core/metamodel/src/test/resources/org/apache/isis/core/metamodel/services/menubars/menubars.layout.xml
+++ b/core/metamodel/src/test/resources/org/apache/isis/core/metamodel/services/menubars/menubars.layout.xml
@@ -45,59 +45,59 @@
<mb3:menu>
<mb3:named>Prototyping</mb3:named>
<mb3:section>
- <mb3:serviceAction objectType="isisApplib.FixtureScriptsDefault" id="runFixtureScript">
+ <mb3:serviceAction objectType="isis.applib.FixtureScriptsDefault" id="runFixtureScript">
<cpt:named>Run Fixture Script</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="isisApplib.FixtureScriptsDefault" id="runFixtureScriptWithAutoComplete">
+ <mb3:serviceAction objectType="isis.applib.FixtureScriptsDefault" id="runFixtureScriptWithAutoComplete">
<cpt:named>Run Fixture Script</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="isisApplib.FixtureScriptsDefault" id="recreateObjectsAndReturnFirst">
+ <mb3:serviceAction objectType="isis.applib.FixtureScriptsDefault" id="recreateObjectsAndReturnFirst">
<cpt:named>Recreate Objects And Return First</cpt:named>
</mb3:serviceAction>
</mb3:section>
<mb3:section>
- <mb3:serviceAction objectType="isisApplib.LayoutServiceMenu" id="downloadLayouts">
+ <mb3:serviceAction objectType="isis.applib.LayoutServiceMenu" id="downloadLayouts">
<cpt:named>Download Object Layouts (ZIP)</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="isisApplib.LayoutServiceMenu" id="downloadMenuBarsLayout">
+ <mb3:serviceAction objectType="isis.applib.LayoutServiceMenu" id="downloadMenuBarsLayout">
<cpt:named>Download Menu Bars Layout (XML)</cpt:named>
</mb3:serviceAction>
</mb3:section>
<mb3:section>
- <mb3:serviceAction objectType="isisApplib.MetaModelServicesMenu" id="downloadMetaModelXml">
+ <mb3:serviceAction objectType="isis.applib.MetaModelServicesMenu" id="downloadMetaModelXml">
<cpt:named>Download Meta Model (XML)</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="isisApplib.MetaModelServicesMenu" id="downloadMetaModelCsv">
+ <mb3:serviceAction objectType="isis.applib.MetaModelServicesMenu" id="downloadMetaModelCsv">
<cpt:named>Download Meta Model (CSV)</cpt:named>
</mb3:serviceAction>
</mb3:section>
<mb3:section>
- <mb3:serviceAction objectType="isisApplib.SwaggerServiceMenu" id="openSwaggerUi">
+ <mb3:serviceAction objectType="isis.applib.SwaggerServiceMenu" id="openSwaggerUi">
<cpt:named>Open Swagger Ui</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="isisApplib.SwaggerServiceMenu" id="openRestApi">
+ <mb3:serviceAction objectType="isis.applib.SwaggerServiceMenu" id="openRestApi">
<cpt:named>Open Rest Api</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="isisApplib.SwaggerServiceMenu" id="downloadSwaggerSchemaDefinition">
+ <mb3:serviceAction objectType="isis.applib.SwaggerServiceMenu" id="downloadSwaggerSchemaDefinition">
<cpt:named>Download Swagger Schema Definition</cpt:named>
</mb3:serviceAction>
</mb3:section>
<mb3:section>
- <mb3:serviceAction objectType="isisApplib.TranslationServicePoMenu" id="downloadTranslations">
+ <mb3:serviceAction objectType="isis.applib.TranslationServicePoMenu" id="downloadTranslations">
<cpt:named>Download Translations</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="isisApplib.TranslationServicePoMenu" id="resetTranslationCache">
+ <mb3:serviceAction objectType="isis.applib.TranslationServicePoMenu" id="resetTranslationCache">
<cpt:named>Clear translation cache</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="isisApplib.TranslationServicePoMenu" id="switchToReadingTranslations">
+ <mb3:serviceAction objectType="isis.applib.TranslationServicePoMenu" id="switchToReadingTranslations">
<cpt:named>Switch To Reading Translations</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="isisApplib.TranslationServicePoMenu" id="switchToWritingTranslations">
+ <mb3:serviceAction objectType="isis.applib.TranslationServicePoMenu" id="switchToWritingTranslations">
<cpt:named>Switch To Writing Translations</cpt:named>
</mb3:serviceAction>
</mb3:section>
<mb3:section>
- <mb3:serviceAction objectType="isisApplib.HsqlDbManagerMenu" id="hsqlDbManager">
+ <mb3:serviceAction objectType="isis.applib.HsqlDbManagerMenu" id="hsqlDbManager">
<cpt:named>HSQL DB Manager</cpt:named>
</mb3:serviceAction>
</mb3:section>
@@ -107,7 +107,7 @@
<mb3:menu>
<mb3:named>Configuration Service Menu</mb3:named>
<mb3:section>
- <mb3:serviceAction objectType="isisApplib.ConfigurationServiceMenu" id="configuration">
+ <mb3:serviceAction objectType="isis.applib.ConfigurationServiceMenu" id="configuration">
<cpt:named>Configuration</cpt:named>
</mb3:serviceAction>
</mb3:section>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml
index a4472cc..27dcd23 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml
@@ -274,56 +274,56 @@ For latest we use: https://raw.githubusercontent.com/apache/isis/master/antora/s
<mb3:menu>
<mb3:named>Prototyping</mb3:named>
<mb3:section>
- <mb3:serviceAction objectType="isisExtFixtures.FixtureScripts" id="runFixtureScript">
+ <mb3:serviceAction objectType="isis.ext.fixtures.FixtureScripts" id="runFixtureScript">
<cpt:named>Run Fixture Script</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="isisExtFixtures.FixtureScripts" id="recreateObjectsAndReturnFirst">
+ <mb3:serviceAction objectType="isis.ext.fixtures.FixtureScripts" id="recreateObjectsAndReturnFirst">
<cpt:named>Recreate Objects And Return First</cpt:named>
</mb3:serviceAction>
</mb3:section>
<mb3:section>
- <mb3:serviceAction objectType="isisApplib.LayoutServiceMenu" id="downloadLayouts">
+ <mb3:serviceAction objectType="isis.applib.LayoutServiceMenu" id="downloadLayouts">
<cpt:named>Download Object Layouts (ZIP)</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="isisApplib.LayoutServiceMenu" id="downloadMenuBarsLayout">
+ <mb3:serviceAction objectType="isis.applib.LayoutServiceMenu" id="downloadMenuBarsLayout">
<cpt:named>Download Menu Bars Layout (XML)</cpt:named>
</mb3:serviceAction>
</mb3:section>
<mb3:section>
- <mb3:serviceAction objectType="isisApplib.MetaModelServiceMenu" id="downloadMetaModelXml">
+ <mb3:serviceAction objectType="isis.applib.MetaModelServiceMenu" id="downloadMetaModelXml">
<cpt:named>Download Meta Model (XML)</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="isisApplib.MetaModelServiceMenu" id="downloadMetaModelCsv">
+ <mb3:serviceAction objectType="isis.applib.MetaModelServiceMenu" id="downloadMetaModelCsv">
<cpt:named>Download Meta Model (CSV)</cpt:named>
</mb3:serviceAction>
</mb3:section>
<mb3:section>
- <mb3:serviceAction objectType="isisJdoDn5.JdoMetamodelMenu" id="downloadMetamodels">
+ <mb3:serviceAction objectType="isis.persistence.jdo.JdoMetamodelMenu" id="downloadMetamodels">
<cpt:named>Download JDO Metamodels (ZIP)</cpt:named>
</mb3:serviceAction>
</mb3:section>
<mb3:section>
- <mb3:serviceAction objectType="isisApplib.SwaggerServiceMenu" id="openSwaggerUi">
+ <mb3:serviceAction objectType="isis.applib.SwaggerServiceMenu" id="openSwaggerUi">
<cpt:named>Open Swagger Ui</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="isisApplib.SwaggerServiceMenu" id="openRestApi">
+ <mb3:serviceAction objectType="isis.applib.SwaggerServiceMenu" id="openRestApi">
<cpt:named>Open Rest Api</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="isisApplib.SwaggerServiceMenu" id="downloadSwaggerSchemaDefinition">
+ <mb3:serviceAction objectType="isis.applib.SwaggerServiceMenu" id="downloadSwaggerSchemaDefinition">
<cpt:named>Download Swagger Schema Definition</cpt:named>
</mb3:serviceAction>
</mb3:section>
<mb3:section>
- <mb3:serviceAction objectType="isisApplib.TranslationServicePoMenu" id="downloadTranslations">
+ <mb3:serviceAction objectType="isis.applib.TranslationServicePoMenu" id="downloadTranslations">
<cpt:named>Download Translations</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="isisApplib.TranslationServicePoMenu" id="resetTranslationCache">
+ <mb3:serviceAction objectType="isis.applib.TranslationServicePoMenu" id="resetTranslationCache">
<cpt:named>Clear translation cache</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="isisApplib.TranslationServicePoMenu" id="switchToReadingTranslations">
+ <mb3:serviceAction objectType="isis.applib.TranslationServicePoMenu" id="switchToReadingTranslations">
<cpt:named>Switch To Reading Translations</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="isisApplib.TranslationServicePoMenu" id="switchToWritingTranslations">
+ <mb3:serviceAction objectType="isis.applib.TranslationServicePoMenu" id="switchToWritingTranslations">
<cpt:named>Switch To Writing Translations</cpt:named>
</mb3:serviceAction>
</mb3:section>
@@ -337,7 +337,7 @@ For latest we use: https://raw.githubusercontent.com/apache/isis/master/antora/s
</mb3:serviceAction>
</mb3:section>
<mb3:section>
- <mb3:serviceAction objectType="isisExtH2Console.H2ManagerMenu" id="openH2Console">
+ <mb3:serviceAction objectType="isis.ext.h2Console.H2ManagerMenu" id="openH2Console">
<cpt:named>H2 Console</cpt:named>
</mb3:serviceAction>
</mb3:section>
@@ -347,89 +347,89 @@ For latest we use: https://raw.githubusercontent.com/apache/isis/master/antora/s
<mb3:named>Activity</mb3:named>
<mb3:section>
<mb3:named>Command Log</mb3:named>
- <mb3:serviceAction objectType="isisExtensionsCommandLog.CommandServiceMenu" id="activeCommands"/>
- <mb3:serviceAction objectType="isisExtensionsCommandLog.CommandServiceMenu" id="findCommands"/>
- <mb3:serviceAction objectType="isisExtensionsCommandLog.CommandServiceMenu" id="findCommandById"/>
- <mb3:serviceAction objectType="isisExtensionsCommandLog.CommandServiceMenu" id="truncateLog"/>
+ <mb3:serviceAction objectType="isis.ext.commandLog.CommandServiceMenu" id="activeCommands"/>
+ <mb3:serviceAction objectType="isis.ext.commandLog.CommandServiceMenu" id="findCommands"/>
+ <mb3:serviceAction objectType="isis.ext.commandLog.CommandServiceMenu" id="findCommandById"/>
+ <mb3:serviceAction objectType="isis.ext.commandLog.CommandServiceMenu" id="truncateLog"/>
</mb3:section>
<mb3:section>
<mb3:named>Command Replay - Primary</mb3:named>
- <mb3:serviceAction objectType="isisExtensionsCommandReplayPrimary.CommandReplayOnPrimaryService" id="findCommands"/>
- <mb3:serviceAction objectType="isisExtensionsCommandReplayPrimary.CommandReplayOnPrimaryService" id="downloadCommands"/>
- <mb3:serviceAction objectType="isisExtensionsCommandReplayPrimary.CommandReplayOnPrimaryService" id="downloadCommandById"/>
+ <mb3:serviceAction objectType="isis.ext.commandReplayPrimary.CommandReplayOnPrimaryService" id="findCommands"/>
+ <mb3:serviceAction objectType="isis.ext.commandReplayPrimary.CommandReplayOnPrimaryService" id="downloadCommands"/>
+ <mb3:serviceAction objectType="isis.ext.commandReplayPrimary.CommandReplayOnPrimaryService" id="downloadCommandById"/>
</mb3:section>
<mb3:section>
<mb3:named>Command Replay - Secondary</mb3:named>
- <mb3:serviceAction objectType="isisExtensionsCommandReplaySecondary.CommandReplayOnSecondaryService" id="findMostRecentReplayed"/>
- <mb3:serviceAction objectType="isisExtensionsCommandReplaySecondary.CommandReplayOnSecondaryService" id="uploadCommands"/>
+ <mb3:serviceAction objectType="isis.ext.commandReplaySecondary.CommandReplayOnSecondaryService" id="findMostRecentReplayed"/>
+ <mb3:serviceAction objectType="isis.ext.commandReplaySecondary.CommandReplayOnSecondaryService" id="uploadCommands"/>
</mb3:section>
<mb3:section>
<mb3:named>Demo Replay Controller</mb3:named>
- <mb3:serviceAction objectType="demoapp.web.DemoReplayController" id="pauseReplay"/>
- <mb3:serviceAction objectType="demoapp.web.DemoReplayController" id="resumeReplay"/>
+ <mb3:serviceAction objectType="demo.web.DemoReplayController" id="pauseReplay"/>
+ <mb3:serviceAction objectType="demo.web.DemoReplayController" id="resumeReplay"/>
</mb3:section>
</mb3:menu>
<mb3:menu>
<mb3:named>Security</mb3:named>
<mb3:section>
- <mb3:serviceAction objectType="secman.ApplicationRoleMenu" id="allRoles">
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationRoleMenu" id="allRoles">
<cpt:named>All Roles</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="secman.ApplicationRoleMenu" id="newRole">
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationRoleMenu" id="newRole">
<cpt:named>New Role</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="secman.ApplicationRoleMenu" id="findRoles">
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationRoleMenu" id="findRoles">
<cpt:named>Find Roles</cpt:named>
</mb3:serviceAction>
</mb3:section>
<mb3:section>
- <mb3:serviceAction objectType="secman.ApplicationTenancyMenu" id="newTenancy">
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationTenancyMenu" id="newTenancy">
<cpt:named>New Tenancy</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="secman.ApplicationTenancyMenu" id="findTenancies">
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationTenancyMenu" id="findTenancies">
<cpt:named>Find Tenancies</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="secman.ApplicationTenancyMenu" id="allTenancies">
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationTenancyMenu" id="allTenancies">
<cpt:named>All Tenancies</cpt:named>
</mb3:serviceAction>
</mb3:section>
<mb3:section>
- <mb3:serviceAction objectType="secman.ApplicationPermissionMenu" id="findOrphanedPermissions">
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationPermissionMenu" id="findOrphanedPermissions">
<cpt:named>Find Orphaned Permissions</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="secman.ApplicationPermissionMenu" id="allPermissions">
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationPermissionMenu" id="allPermissions">
<cpt:named>All Permissions</cpt:named>
</mb3:serviceAction>
</mb3:section>
<mb3:section>
- <mb3:serviceAction objectType="secman.ApplicationFeatureViewModels" id="allProperties">
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationFeatureViewModels" id="allProperties">
<cpt:named>All Properties</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="secman.ApplicationFeatureViewModels" id="allClasses">
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationFeatureViewModels" id="allClasses">
<cpt:named>All Classes</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="secman.ApplicationFeatureViewModels" id="allPackages">
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationFeatureViewModels" id="allPackages">
<cpt:named>All Packages</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="secman.ApplicationFeatureViewModels" id="allActions">
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationFeatureViewModels" id="allActions">
<cpt:named>All Actions</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="secman.ApplicationFeatureViewModels" id="allCollections">
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationFeatureViewModels" id="allCollections">
<cpt:named>All Collections</cpt:named>
</mb3:serviceAction>
</mb3:section>
<mb3:section>
- <mb3:serviceAction objectType="secman.ApplicationUserMenu" id="findUsers">
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationUserMenu" id="findUsers">
<cpt:named>Find Users</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="secman.ApplicationUserMenu" id="newLocalUser">
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationUserMenu" id="newLocalUser">
<cpt:named>New Local User</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="secman.ApplicationUserMenu" id="allUsers">
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationUserMenu" id="allUsers">
<cpt:named>All Users</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="secman.ApplicationUserMenu" id="newDelegateUser">
+ <mb3:serviceAction objectType="isis.ext.secman.ApplicationUserMenu" id="newDelegateUser">
<cpt:named>New Delegate User</cpt:named>
</mb3:serviceAction>
</mb3:section>
@@ -439,10 +439,10 @@ For latest we use: https://raw.githubusercontent.com/apache/isis/master/antora/s
<mb3:menu>
<mb3:named/>
<mb3:section>
- <mb3:serviceAction objectType="secman.MeService" id="me"/>
- <mb3:serviceAction objectType="isisApplib.ConfigurationMenu" id="configuration"/>
+ <mb3:serviceAction objectType="isis.ext.secman.MeService" id="me"/>
+ <mb3:serviceAction objectType="isis.applib.ConfigurationMenu" id="configuration"/>
</mb3:section><mb3:section>
- <mb3:serviceAction objectType="isisSecurityApi.LogoutMenu" id="logout">
+ <mb3:serviceAction objectType="isis.security.LogoutMenu" id="logout">
<cpt:named>Logout</cpt:named>
</mb3:serviceAction>
</mb3:section>