You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2023/10/19 11:06:31 UTC
[causeway] branch CAUSEWAY-3636 updated (7860965cb6 -> e09b265926)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch CAUSEWAY-3636
in repository https://gitbox.apache.org/repos/asf/causeway.git
from 7860965cb6 CAUSEWAY-3636: updates docs
add c6ecbdabc7 Merge pull request #1958 from apache/CAUSEWAY-3636
add 0d13f46017 CAUSEWAY-3636: refactors LayoutResourceLoader#tryLoadLayoutResource to return a Try
add 38da5621f2 Bump com.google.errorprone:error_prone_annotations from 2.22.0 to 2.23.0
add 02587740a7 Merge pull request #1959 from apache/dependabot/maven/master/com.google.errorprone-error_prone_annotations-2.23.0
add 9b48f30405 bumps antora attributes to next rel
new e09b265926 CAUSEWAY-3636: renames module and namespace, improves docs
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:
.../ROOT/partials/module-nav/extensions.adoc | 1 +
antora/playbooks/site-comguide.yml | 4 +-
antora/playbooks/site-conguide.yml | 4 +-
antora/playbooks/site-core.yml | 4 +-
antora/playbooks/site-docs.yml | 4 +-
antora/playbooks/site-extensions.yml | 6 +-
antora/playbooks/site-incubator.yml | 4 +-
antora/playbooks/site-persistence.yml | 4 +-
antora/playbooks/site-refguide.yml | 4 +-
antora/playbooks/site-regressiontests.yml | 4 +-
antora/playbooks/site-relnotes.yml | 4 +-
antora/playbooks/site-security.yml | 4 +-
antora/playbooks/site-setupguide.yml | 4 +-
antora/playbooks/site-testing.yml | 4 +-
antora/playbooks/site-tooling.yml | 4 +-
antora/playbooks/site-tutorials.yml | 4 +-
antora/playbooks/site-userguide.yml | 4 +-
antora/playbooks/site-valuetypes.yml | 4 +-
antora/playbooks/site-vro.yml | 4 +-
antora/playbooks/site-vw.yml | 4 +-
antora/playbooks/site.ALL.yml | 2 +-
antora/playbooks/site.NEXT.yml | 2 +-
antora/playbooks/site.yml | 6 +-
bom/pom.xml | 8 +-
.../core/config/CausewayConfiguration.java | 29 ++++---
.../services/grid/GridLoaderServiceDefault.java | 40 +++++----
.../services/grid/spi/LayoutResourceLoader.java | 28 ++++++-
.../grid/spi/LayoutResourceLoaderDefault.java | 44 ++++------
.../GridLoaderServiceDefault_resourceNameTest.java | 8 +-
.../metamodel/services/grid/GridLoadingTest.java | 2 -
.../docgen/adoc/modules/docgen/pages/about.adoc | 1 -
.../adoc/modules/executionoutbox/pages/about.adoc | 2 +-
.../modules/layoutgithub/partials/module-nav.adoc | 4 -
.../adoc/antora.yml | 0
.../adoc/modules/layoutloaders}/nav.adoc | 0
.../adoc/modules/layoutloaders}/pages/about.adoc | 52 +++++++++---
.../modules/layoutloaders/partials/module-nav.adoc | 4 +
.../loader => layoutloaders/github}/pom.xml | 10 +--
.../CausewayModuleExtLayoutLoadersGithub.java} | 20 ++---
.../github/menu/LayoutLoadersGitHubMenu.java} | 26 +++---
.../layoutloaders/github/spiimpl}/GitHubItem.java | 2 +-
.../github/spiimpl}/GitHubResponse.java | 2 +-
.../spiimpl}/LayoutResourceLoaderFromGithub.java | 94 ++++++++++++----------
...oaderFromGithub_tryLoadLayoutResource_Test.java | 26 +++---
.../layoutloaders/github/spiimpl}/.gitignore | 0
.../core/{layoutgithub => layoutloaders}/pom.xml | 8 +-
extensions/pom.xml | 2 +-
...ausewayExtLayoutLoadersRoleAndPermissions.java} | 8 +-
...ewayExtSecmanRegularUserRoleAndPermissions.java | 4 +-
.../scripts/SeedUsersAndRolesFixtureScript.java | 4 +-
50 files changed, 279 insertions(+), 238 deletions(-)
delete mode 100644 extensions/core/layoutgithub/adoc/modules/layoutgithub/partials/module-nav.adoc
rename extensions/core/{layoutgithub => layoutloaders}/adoc/antora.yml (100%)
rename extensions/core/{layoutgithub/adoc/modules/layoutgithub => layoutloaders/adoc/modules/layoutloaders}/nav.adoc (100%)
rename extensions/core/{layoutgithub/adoc/modules/layoutgithub => layoutloaders/adoc/modules/layoutloaders}/pages/about.adoc (61%)
create mode 100644 extensions/core/layoutloaders/adoc/modules/layoutloaders/partials/module-nav.adoc
rename extensions/core/{layoutgithub/loader => layoutloaders/github}/pom.xml (88%)
rename extensions/core/{layoutgithub/loader/src/main/java/org/apache/causeway/extensions/layoutgithub/loader/CausewayModuleExtLayoutGithubLoader.java => layoutloaders/github/src/main/java/org/apache/causeway/extensions/layoutloaders/github/CausewayModuleExtLayoutLoadersGithub.java} (88%)
rename extensions/core/{layoutgithub/loader/src/main/java/org/apache/causeway/extensions/layoutgithub/loader/menu/LayoutLoaderMenu.java => layoutloaders/github/src/main/java/org/apache/causeway/extensions/layoutloaders/github/menu/LayoutLoadersGitHubMenu.java} (77%)
rename extensions/core/{layoutgithub/loader/src/main/java/org/apache/causeway/extensions/layoutgithub/loader/spi => layoutloaders/github/src/main/java/org/apache/causeway/extensions/layoutloaders/github/spiimpl}/GitHubItem.java (93%)
rename extensions/core/{layoutgithub/loader/src/main/java/org/apache/causeway/extensions/layoutgithub/loader/spi => layoutloaders/github/src/main/java/org/apache/causeway/extensions/layoutloaders/github/spiimpl}/GitHubResponse.java (93%)
rename extensions/core/{layoutgithub/loader/src/main/java/org/apache/causeway/extensions/layoutgithub/loader/spi => layoutloaders/github/src/main/java/org/apache/causeway/extensions/layoutloaders/github/spiimpl}/LayoutResourceLoaderFromGithub.java (59%)
rename extensions/core/{layoutgithub/loader/src/test/java/org/apache/causeway/extensions/layoutgithub/loader/spi => layoutloaders/github/src/test/java/org/apache/causeway/extensions/layoutloaders/github/spiimpl}/LayoutResourceLoaderFromGithub_tryLoadLayoutResource_Test.java (66%)
rename extensions/core/{layoutgithub/loader/src/test/resources/org/apache/causeway/extensions/layoutgithub/loader/spi => layoutloaders/github/src/test/resources/org/apache/causeway/extensions/layoutloaders/github/spiimpl}/.gitignore (100%)
rename extensions/core/{layoutgithub => layoutloaders}/pom.xml (86%)
rename extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/{CausewayExtLayoutGithubRoleAndPermissions.java => CausewayExtLayoutLoadersRoleAndPermissions.java} (87%)
[causeway] 01/01: CAUSEWAY-3636: renames module and namespace, improves docs
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch CAUSEWAY-3636
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit e09b265926d6e2e70fbef7f63ef8754c162760a5
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Oct 19 12:06:24 2023 +0100
CAUSEWAY-3636: renames module and namespace, improves docs
---
.../ROOT/partials/module-nav/extensions.adoc | 1 +
antora/playbooks/site-extensions.yml | 2 +-
antora/playbooks/site.ALL.yml | 2 +-
antora/playbooks/site.NEXT.yml | 2 +-
antora/playbooks/site.yml | 2 +-
bom/pom.xml | 6 +--
.../core/config/CausewayConfiguration.java | 29 +++++++-----
.../docgen/adoc/modules/docgen/pages/about.adoc | 1 -
.../adoc/modules/executionoutbox/pages/about.adoc | 2 +-
.../modules/layoutgithub/partials/module-nav.adoc | 4 --
.../adoc/antora.yml | 0
.../adoc/modules/layoutloaders}/nav.adoc | 0
.../adoc/modules/layoutloaders}/pages/about.adoc | 52 +++++++++++++++++-----
.../modules/layoutloaders/partials/module-nav.adoc | 4 ++
.../loader => layoutloaders/github}/pom.xml | 10 ++---
.../CausewayModuleExtLayoutLoadersGithub.java} | 20 ++++-----
.../github/menu/LayoutLoadersGitHubMenu.java} | 26 +++++------
.../layoutloaders/github/spiimpl}/GitHubItem.java | 2 +-
.../github/spiimpl}/GitHubResponse.java | 2 +-
.../spiimpl}/LayoutResourceLoaderFromGithub.java | 19 ++++----
...oaderFromGithub_tryLoadLayoutResource_Test.java | 14 +++---
.../layoutloaders/github/spiimpl}/.gitignore | 0
.../core/{layoutgithub => layoutloaders}/pom.xml | 8 ++--
extensions/pom.xml | 2 +-
...ausewayExtLayoutLoadersRoleAndPermissions.java} | 8 ++--
...ewayExtSecmanRegularUserRoleAndPermissions.java | 4 +-
.../scripts/SeedUsersAndRolesFixtureScript.java | 4 +-
27 files changed, 131 insertions(+), 95 deletions(-)
diff --git a/antora/components/docs/modules/ROOT/partials/module-nav/extensions.adoc b/antora/components/docs/modules/ROOT/partials/module-nav/extensions.adoc
index a88da7528e..79e0945902 100644
--- a/antora/components/docs/modules/ROOT/partials/module-nav/extensions.adoc
+++ b/antora/components/docs/modules/ROOT/partials/module-nav/extensions.adoc
@@ -13,6 +13,7 @@
*** xref:userguide:executionrepublisher:about.adoc[]
*** xref:userguide:excel:about.adoc[]
*** xref:userguide:flyway:about.adoc[]
+*** xref:userguide:layoutloaders:about.adoc[]
** Security
diff --git a/antora/playbooks/site-extensions.yml b/antora/playbooks/site-extensions.yml
index 9a2f378727..4f39498973 100644
--- a/antora/playbooks/site-extensions.yml
+++ b/antora/playbooks/site-extensions.yml
@@ -57,7 +57,7 @@ content:
start_path: extensions/core/flyway/adoc # userguide
branches: HEAD
- url: .
- start_path: extensions/core/layoutgithub/adoc # userguide
+ start_path: extensions/core/layoutloaders/adoc # userguide
branches: HEAD
- url: .
diff --git a/antora/playbooks/site.ALL.yml b/antora/playbooks/site.ALL.yml
index 79f50f74ee..71f7b2bdce 100644
--- a/antora/playbooks/site.ALL.yml
+++ b/antora/playbooks/site.ALL.yml
@@ -127,7 +127,7 @@ content:
start_path: extensions/core/flyway/adoc # userguide
branches: [2.0.0-M5, 2.0.0-M6, 2.0.0-M7, 2.0.0-M8, 2.0.0-M9, 2.0.0-RC1, 2.0.0-RC2, 2.0.0-RC3]
- url: .
- start_path: extensions/core/layoutgithub/adoc # userguide
+ start_path: extensions/core/layoutloaders/adoc # userguide
branches: [2.0.0-RC3]
- url: .
diff --git a/antora/playbooks/site.NEXT.yml b/antora/playbooks/site.NEXT.yml
index 9f40b2e249..f8eaef7066 100644
--- a/antora/playbooks/site.NEXT.yml
+++ b/antora/playbooks/site.NEXT.yml
@@ -127,7 +127,7 @@ content:
start_path: extensions/core/flyway/adoc # userguide
branches: [2.0.0-RC3]
- url: .
- start_path: extensions/core/layoutgithub/adoc # userguide
+ start_path: extensions/core/layoutloaders/adoc # userguide
branches: [2.0.0-RC3]
- url: .
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index e4fb431e35..9af4f71cb8 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -127,7 +127,7 @@ content:
start_path: extensions/core/flyway/adoc # userguide
branches: HEAD
- url: .
- start_path: extensions/core/layoutgithub/adoc # userguide
+ start_path: extensions/core/layoutloaders/adoc # userguide
branches: HEAD
- url: .
diff --git a/bom/pom.xml b/bom/pom.xml
index f74f45d911..cf63288a0f 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -934,17 +934,17 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif
<scope>compile</scope>
</dependency>
- <!-- org.apache.causeway.extensions (layoutgithub) -->
+ <!-- org.apache.causeway.extensions (layoutloaders) -->
<dependency>
<groupId>org.apache.causeway.extensions</groupId>
- <artifactId>causeway-extensions-layoutgithub</artifactId>
+ <artifactId>causeway-extensions-layoutloaders</artifactId>
<version>2.0.0-SNAPSHOT</version>
<type>pom</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.causeway.extensions</groupId>
- <artifactId>causeway-extensions-layoutgithub-loader</artifactId>
+ <artifactId>causeway-extensions-layoutloaders-github</artifactId>
<version>2.0.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java b/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
index f625fc63b9..e157fdeec0 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
@@ -3442,19 +3442,26 @@ public class CausewayConfiguration {
}
- private final LayoutGithub layoutGithub = new LayoutGithub();
+ private final LayoutLoaders layoutLoaders = new LayoutLoaders();
@Data
- public static class LayoutGithub {
+ public static class LayoutLoaders {
- /**
- * eg <code>apache/causeway-app-simpleapp</code>
- */
- private String repository;
+ private final GitHub gitHub = new GitHub();
+ @Data
+ public static class GitHub {
- /**
- * As per <a href="https://github.com/settings/tokens">https://github.com/settings/tokens</a>
- */
- private String apiKey;
+ /**
+ * eg <code>apache/causeway-app-simpleapp</code>
+ */
+ private String repository;
+
+ /**
+ * As per <a href="https://github.com/settings/tokens">https://github.com/settings/tokens</a>,
+ * must have permissions to the <code>/search</code> and <code>/contents</code> APIs for the specified
+ * {@link #getRepository() repository}.
+ */
+ private String apiKey;
+ }
}
private final Secman secman = new Secman();
@@ -3476,7 +3483,7 @@ public class CausewayConfiguration {
"causeway.security",
"causeway.ext.h2Console",
"causeway.ext.secman",
- "causeway.ext.layoutGithub"
+ "causeway.ext.layoutLoaders"
));
public static final List<String> ADMIN_ADDITIONAL_NAMESPACE_PERMISSIONS =
Collections.unmodifiableList(listOf());
diff --git a/extensions/core/docgen/adoc/modules/docgen/pages/about.adoc b/extensions/core/docgen/adoc/modules/docgen/pages/about.adoc
index 0148250d99..335d328163 100644
--- a/extensions/core/docgen/adoc/modules/docgen/pages/about.adoc
+++ b/extensions/core/docgen/adoc/modules/docgen/pages/about.adoc
@@ -36,7 +36,6 @@ In the webapp module of your application, add the following dependency:
<dependency>
<groupId>org.apache.causeway.extensions</groupId>
<artifactId>causeway-extensions-docgen-help</artifactId>
- <version>{page-causewayprev}</version>
</dependency>
</dependencies>
----
diff --git a/extensions/core/executionoutbox/adoc/modules/executionoutbox/pages/about.adoc b/extensions/core/executionoutbox/adoc/modules/executionoutbox/pages/about.adoc
index 5098f0dc40..0018390835 100644
--- a/extensions/core/executionoutbox/adoc/modules/executionoutbox/pages/about.adoc
+++ b/extensions/core/executionoutbox/adoc/modules/executionoutbox/pages/about.adoc
@@ -222,7 +222,7 @@ To setup the message processor:
* in `dependencyManagement` section, add an entry for _Execution Outbox_'s own BOM:
+
-[source,xml]
+[source,xml,subs="attributes+"]
.pom.xml
----
<dependencyManagement>
diff --git a/extensions/core/layoutgithub/adoc/modules/layoutgithub/partials/module-nav.adoc b/extensions/core/layoutgithub/adoc/modules/layoutgithub/partials/module-nav.adoc
deleted file mode 100644
index 1453ff70bf..0000000000
--- a/extensions/core/layoutgithub/adoc/modules/layoutgithub/partials/module-nav.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-
-** xref:userguide:layoutgithub:about.adoc[]
-
-
diff --git a/extensions/core/layoutgithub/adoc/antora.yml b/extensions/core/layoutloaders/adoc/antora.yml
similarity index 100%
rename from extensions/core/layoutgithub/adoc/antora.yml
rename to extensions/core/layoutloaders/adoc/antora.yml
diff --git a/extensions/core/layoutgithub/adoc/modules/layoutgithub/nav.adoc b/extensions/core/layoutloaders/adoc/modules/layoutloaders/nav.adoc
similarity index 100%
rename from extensions/core/layoutgithub/adoc/modules/layoutgithub/nav.adoc
rename to extensions/core/layoutloaders/adoc/modules/layoutloaders/nav.adoc
diff --git a/extensions/core/layoutgithub/adoc/modules/layoutgithub/pages/about.adoc b/extensions/core/layoutloaders/adoc/modules/layoutloaders/pages/about.adoc
similarity index 61%
rename from extensions/core/layoutgithub/adoc/modules/layoutgithub/pages/about.adoc
rename to extensions/core/layoutloaders/adoc/modules/layoutloaders/pages/about.adoc
index cdadee54e6..64ca0d6334 100644
--- a/extensions/core/layoutgithub/adoc/modules/layoutgithub/pages/about.adoc
+++ b/extensions/core/layoutloaders/adoc/modules/layoutloaders/pages/about.adoc
@@ -1,15 +1,15 @@
-= Layout from GitHub
+= Layout Loaders
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-The _LayoutGitHub_ module allows layouts to be read dynamically from a github source repository.
+The _LayoutLoaders_ module allows layouts to be read dynamically from an external repository, such as a source code repository.
It is intended as a development tool to allow layouts to be updated dynamically in an application running on an app server or in a container.
+Currently only github is supported.
-== Setup
-=== Dependency Management
+== Dependency Management
[source,xml,subs="attributes+"]
.pom.xml
@@ -18,7 +18,7 @@ It is intended as a development tool to allow layouts to be updated dynamically
<dependencies>
<dependency>
<groupId>org.apache.causeway.extensions</groupId>
- <artifactId>causeway-extensions-layoutgithub</artifactId>
+ <artifactId>causeway-extensions-layoutloaders</artifactId>
<scope>import</scope>
<type>pom</type>
<version>{page-causewayprev}</version>
@@ -27,19 +27,31 @@ It is intended as a development tool to allow layouts to be updated dynamically
</dependencyManagement>
----
+== GitHub
+
+The GitHub implementation allows `.layout.xml` files to be loaded from github code repository.
+The implementation searches for the file across the specified repository, and if found then returns it.
+
+There are a couple of restrictions:
+
+* the file name must be unique across the entire repository; the package structure is _not_ taken into account
+* the file must reside on the default branch of the repository.
+
+One workaround for the second restriction is to set up your own fork of your project repo, and make changes there.
+
+
[#dependencies]
=== Dependencies
In the webapp module of your application, add the following dependency:
-[source,xml]
+[source,xml,subs="attributes+"]
.pom.xml
----
<dependencies>
<dependency>
<groupId>org.apache.causeway.extensions</groupId>
- <artifactId>causeway-extensions-layoutgithub-loader</artifactId>
- <version>{page-causewayprev}</version>
+ <artifactId>causeway-extensions-layoutloaders-github</artifactId>
</dependency>
</dependencies>
----
@@ -48,7 +60,7 @@ In the webapp module of your application, add the following dependency:
[#appmanifest]
=== AppManifest
-In your application's `AppManifest` (top-level Spring `@Configuration` used to bootstrap the app), import the `CausewayModuleExtLayoutGitHubLoader` module.
+In your application's `AppManifest` (top-level Spring `@Configuration` used to bootstrap the app), import the `CausewayModuleExtLayoutLoadersGitHub` module.
[source,java]
.AppManifest.java
@@ -56,13 +68,29 @@ In your application's `AppManifest` (top-level Spring `@Configuration` used to b
@Configuration
@Import({
...
- CausewayModuleExtLayoutGitHubLoader.class,
+ CausewayModuleExtLayoutLoadersGitHub.class,
...
})
public class AppManifest {
}
----
+[#configuration]
+=== Configuration
+
+Two configuration properties are required:
+
+[source,yaml]
+.application.yml
+----
+causeway:
+ extensions:
+ layout-github.api-key=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
+causeway.extensions.layout-github.repository=apache/causeway-app-simpleapp
+
+----
+
+
[#menubar-layout-xml]
=== menubar.layout.xml
@@ -77,8 +105,8 @@ You can use `menubars.layout.xml` to arrange as you see fit, for example in the
<mb:named/>
<mb:section>
<mb:named>Layouts</mb:named>
- <mb:serviceAction objectType="causeway.ext.layoutGithub.LayoutLoaderMenu" id="enableDynamicLayoutLoading"/>
- <mb:serviceAction objectType="causeway.ext.layoutGithub.LayoutLoaderMenu" id="disableDynamicLayoutLoading"/>
+ <mb:serviceAction objectType="causeway.ext.layoutLoaders.LayoutLoadersGitHubMenu" id="enableDynamicLayoutLoading"/>
+ <mb:serviceAction objectType="causeway.ext.layoutLoaders.LayoutLoadersGitHubMenu" id="disableDynamicLayoutLoading"/>
</mb:section>
</mb:menu>
...
diff --git a/extensions/core/layoutloaders/adoc/modules/layoutloaders/partials/module-nav.adoc b/extensions/core/layoutloaders/adoc/modules/layoutloaders/partials/module-nav.adoc
new file mode 100644
index 0000000000..a12072cf67
--- /dev/null
+++ b/extensions/core/layoutloaders/adoc/modules/layoutloaders/partials/module-nav.adoc
@@ -0,0 +1,4 @@
+
+** xref:userguide:layoutloaders:about.adoc[]
+
+
diff --git a/extensions/core/layoutgithub/loader/pom.xml b/extensions/core/layoutloaders/github/pom.xml
similarity index 88%
rename from extensions/core/layoutgithub/loader/pom.xml
rename to extensions/core/layoutloaders/github/pom.xml
index 56c9f75b48..7c1820480d 100644
--- a/extensions/core/layoutgithub/loader/pom.xml
+++ b/extensions/core/layoutloaders/github/pom.xml
@@ -22,21 +22,21 @@
<parent>
<groupId>org.apache.causeway.extensions</groupId>
- <artifactId>causeway-extensions-layoutgithub</artifactId>
+ <artifactId>causeway-extensions-layoutloaders</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
- <artifactId>causeway-extensions-layoutgithub-loader</artifactId>
- <name>Apache Causeway Ext - LayoutGitHub Loader</name>
+ <artifactId>causeway-extensions-layoutloaders-github</artifactId>
+ <name>Apache Causeway Ext - LayoutLoaders GitHub</name>
<description>
Allows layout.xml files to be dynamically loaded from a github repo.
</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.causeway.extensions.layoutgithub.loader</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/causeway/extensions/layoutgithub/loader</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.causeway.extensions.layoutloaders.github</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/causeway/extensions/layoutloaders/github</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/extensions/core/layoutgithub/loader/src/main/java/org/apache/causeway/extensions/layoutgithub/loader/CausewayModuleExtLayoutGithubLoader.java b/extensions/core/layoutloaders/github/src/main/java/org/apache/causeway/extensions/layoutloaders/github/CausewayModuleExtLayoutLoadersGithub.java
similarity index 88%
rename from extensions/core/layoutgithub/loader/src/main/java/org/apache/causeway/extensions/layoutgithub/loader/CausewayModuleExtLayoutGithubLoader.java
rename to extensions/core/layoutloaders/github/src/main/java/org/apache/causeway/extensions/layoutloaders/github/CausewayModuleExtLayoutLoadersGithub.java
index cb959b1715..80583026c1 100644
--- a/extensions/core/layoutgithub/loader/src/main/java/org/apache/causeway/extensions/layoutgithub/loader/CausewayModuleExtLayoutGithubLoader.java
+++ b/extensions/core/layoutloaders/github/src/main/java/org/apache/causeway/extensions/layoutloaders/github/CausewayModuleExtLayoutLoadersGithub.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.layoutgithub.loader;
+package org.apache.causeway.extensions.layoutloaders.github;
import lombok.val;
import org.apache.causeway.core.config.CausewayConfiguration;
-import org.apache.causeway.extensions.layoutgithub.loader.menu.LayoutLoaderMenu;
-import org.apache.causeway.extensions.layoutgithub.loader.spi.LayoutResourceLoaderFromGithub;
+import org.apache.causeway.extensions.layoutloaders.github.menu.LayoutLoadersGitHubMenu;
+import org.apache.causeway.extensions.layoutloaders.github.spiimpl.LayoutResourceLoaderFromGithub;
import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.context.annotation.Bean;
@@ -41,17 +41,17 @@ import org.springframework.web.client.RestTemplate;
@Configuration
@Import({
// menu providers
- LayoutLoaderMenu.class,
+ LayoutLoadersGitHubMenu.class,
// services
LayoutResourceLoaderFromGithub.class,
})
// keep class-name in sync with CausewayExtSecmanRegularUserRoleAndPermissions
-public class CausewayModuleExtLayoutGithubLoader {
+public class CausewayModuleExtLayoutLoadersGithub {
- // keep in sync with CausewayExtLayoutGithubRoleAndPermissions.NAMESPACE
- public static final String NAMESPACE = "causeway.ext.layoutGithub";
+ // keep in sync with CausewayExtLayoutLoadersRoleAndPermissions.NAMESPACE
+ public static final String NAMESPACE = "causeway.ext.layoutLoaders";
/**
* Returns a template configured to search for a file in the git repo.
@@ -85,7 +85,7 @@ public class CausewayModuleExtLayoutGithubLoader {
@Bean(name = "GithubSearch")
public RestTemplate restTemplateForGithubSearch(final CausewayConfiguration causewayConfiguration) {
- val apiKey = causewayConfiguration.getExtensions().getLayoutGithub().getApiKey();
+ val apiKey = causewayConfiguration.getExtensions().getLayoutLoaders().getApiKey();
return new RestTemplateBuilder()
.rootUri("https://api.github.com")
@@ -113,8 +113,8 @@ public class CausewayModuleExtLayoutGithubLoader {
@Bean(name = "GithubContent")
public RestTemplate restTemplateForGithubContent(final CausewayConfiguration causewayConfiguration) {
- val apiKey = causewayConfiguration.getExtensions().getLayoutGithub().getApiKey();
- val repo = causewayConfiguration.getExtensions().getLayoutGithub().getRepository();
+ val apiKey = causewayConfiguration.getExtensions().getLayoutLoaders().getApiKey();
+ val repo = causewayConfiguration.getExtensions().getLayoutLoaders().getRepository();
return new RestTemplateBuilder()
.rootUri(String.format("https://api.github.com/repos/%s", repo))
diff --git a/extensions/core/layoutgithub/loader/src/main/java/org/apache/causeway/extensions/layoutgithub/loader/menu/LayoutLoaderMenu.java b/extensions/core/layoutloaders/github/src/main/java/org/apache/causeway/extensions/layoutloaders/github/menu/LayoutLoadersGitHubMenu.java
similarity index 77%
rename from extensions/core/layoutgithub/loader/src/main/java/org/apache/causeway/extensions/layoutgithub/loader/menu/LayoutLoaderMenu.java
rename to extensions/core/layoutloaders/github/src/main/java/org/apache/causeway/extensions/layoutloaders/github/menu/LayoutLoadersGitHubMenu.java
index 940cb838c9..bf7ca8fcea 100644
--- a/extensions/core/layoutgithub/loader/src/main/java/org/apache/causeway/extensions/layoutgithub/loader/menu/LayoutLoaderMenu.java
+++ b/extensions/core/layoutloaders/github/src/main/java/org/apache/causeway/extensions/layoutloaders/github/menu/LayoutLoadersGitHubMenu.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.layoutgithub.loader.menu;
+package org.apache.causeway.extensions.layoutloaders.github.menu;
import javax.inject.Inject;
import javax.inject.Named;
@@ -32,7 +32,7 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.core.config.CausewayConfiguration;
-import org.apache.causeway.extensions.layoutgithub.loader.CausewayModuleExtLayoutGithubLoader;
+import org.apache.causeway.extensions.layoutloaders.github.CausewayModuleExtLayoutLoadersGithub;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -44,14 +44,14 @@ import lombok.val;
*
* @since 2.x {@index}
*/
-@Named(CausewayModuleExtLayoutGithubLoader.NAMESPACE + ".LayoutLoaderMenu")
+@Named(CausewayModuleExtLayoutLoadersGithub.NAMESPACE + ".LayoutLoadersGitHubMenu")
@DomainService(nature = NatureOfService.VIEW)
@DomainServiceLayout(
menuBar = DomainServiceLayout.MenuBar.TERTIARY
)
@javax.annotation.Priority(PriorityPrecedence.EARLY)
@RequiredArgsConstructor(onConstructor_ = {@Inject})
-public class LayoutLoaderMenu {
+public class LayoutLoadersGitHubMenu {
public static abstract class ActionDomainEvent<T> extends CausewayModuleApplib.ActionDomainEvent<T> {}
@@ -73,16 +73,16 @@ public class LayoutLoaderMenu {
)
public class enableDynamicLayoutLoading {
- public class ActionDomainEvent extends LayoutLoaderMenu.ActionDomainEvent<enableDynamicLayoutLoading> {}
+ public class ActionDomainEvent extends LayoutLoadersGitHubMenu.ActionDomainEvent<enableDynamicLayoutLoading> {}
@MemberSupport public void act() {
- LayoutLoaderMenu.this.enabled = true;
+ LayoutLoadersGitHubMenu.this.enabled = true;
}
@MemberSupport public boolean hideAct() {
return !isConfigured();
}
@MemberSupport public String disableAct() {
- return LayoutLoaderMenu.this.enabled ? "Already enabled" : null;
+ return LayoutLoadersGitHubMenu.this.enabled ? "Already enabled" : null;
}
}
@@ -100,23 +100,23 @@ public class LayoutLoaderMenu {
)
public class disableDynamicLayoutLoading {
- public class ActionDomainEvent extends LayoutLoaderMenu.ActionDomainEvent<enableDynamicLayoutLoading> {}
+ public class ActionDomainEvent extends LayoutLoadersGitHubMenu.ActionDomainEvent<enableDynamicLayoutLoading> {}
@MemberSupport public void act() {
- LayoutLoaderMenu.this.enabled = false;
+ LayoutLoadersGitHubMenu.this.enabled = false;
}
@MemberSupport public boolean hideAct() {
return !isConfigured();
}
@MemberSupport public String disableAct() {
- return LayoutLoaderMenu.this.enabled ? null : "Already disabled";
+ return LayoutLoadersGitHubMenu.this.enabled ? null : "Already disabled";
}
}
boolean isConfigured() {
- val layoutGithub = causewayConfiguration.getExtensions().getLayoutGithub();
- return layoutGithub.getRepository() != null &&
- layoutGithub.getApiKey() != null;
+ val layoutLoadersGitHub = causewayConfiguration.getExtensions().getLayoutLoaders().getGitHub();
+ return layoutLoadersGitHub.getRepository() != null &&
+ layoutLoadersGitHub.getApiKey() != null;
}
}
diff --git a/extensions/core/layoutgithub/loader/src/main/java/org/apache/causeway/extensions/layoutgithub/loader/spi/GitHubItem.java b/extensions/core/layoutloaders/github/src/main/java/org/apache/causeway/extensions/layoutloaders/github/spiimpl/GitHubItem.java
similarity index 93%
rename from extensions/core/layoutgithub/loader/src/main/java/org/apache/causeway/extensions/layoutgithub/loader/spi/GitHubItem.java
rename to extensions/core/layoutloaders/github/src/main/java/org/apache/causeway/extensions/layoutloaders/github/spiimpl/GitHubItem.java
index 34c0135704..1dd8402ecd 100644
--- a/extensions/core/layoutgithub/loader/src/main/java/org/apache/causeway/extensions/layoutgithub/loader/spi/GitHubItem.java
+++ b/extensions/core/layoutloaders/github/src/main/java/org/apache/causeway/extensions/layoutloaders/github/spiimpl/GitHubItem.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.layoutgithub.loader.spi;
+package org.apache.causeway.extensions.layoutloaders.github.spiimpl;
import lombok.Data;
diff --git a/extensions/core/layoutgithub/loader/src/main/java/org/apache/causeway/extensions/layoutgithub/loader/spi/GitHubResponse.java b/extensions/core/layoutloaders/github/src/main/java/org/apache/causeway/extensions/layoutloaders/github/spiimpl/GitHubResponse.java
similarity index 93%
rename from extensions/core/layoutgithub/loader/src/main/java/org/apache/causeway/extensions/layoutgithub/loader/spi/GitHubResponse.java
rename to extensions/core/layoutloaders/github/src/main/java/org/apache/causeway/extensions/layoutloaders/github/spiimpl/GitHubResponse.java
index 856c107ac8..3c101f1a79 100644
--- a/extensions/core/layoutgithub/loader/src/main/java/org/apache/causeway/extensions/layoutgithub/loader/spi/GitHubResponse.java
+++ b/extensions/core/layoutloaders/github/src/main/java/org/apache/causeway/extensions/layoutloaders/github/spiimpl/GitHubResponse.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.layoutgithub.loader.spi;
+package org.apache.causeway.extensions.layoutloaders.github.spiimpl;
import lombok.Data;
diff --git a/extensions/core/layoutgithub/loader/src/main/java/org/apache/causeway/extensions/layoutgithub/loader/spi/LayoutResourceLoaderFromGithub.java b/extensions/core/layoutloaders/github/src/main/java/org/apache/causeway/extensions/layoutloaders/github/spiimpl/LayoutResourceLoaderFromGithub.java
similarity index 89%
rename from extensions/core/layoutgithub/loader/src/main/java/org/apache/causeway/extensions/layoutgithub/loader/spi/LayoutResourceLoaderFromGithub.java
rename to extensions/core/layoutloaders/github/src/main/java/org/apache/causeway/extensions/layoutloaders/github/spiimpl/LayoutResourceLoaderFromGithub.java
index cc6adbea1b..15bc77341b 100644
--- a/extensions/core/layoutgithub/loader/src/main/java/org/apache/causeway/extensions/layoutgithub/loader/spi/LayoutResourceLoaderFromGithub.java
+++ b/extensions/core/layoutloaders/github/src/main/java/org/apache/causeway/extensions/layoutloaders/github/spiimpl/LayoutResourceLoaderFromGithub.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.layoutgithub.loader.spi;
+package org.apache.causeway.extensions.layoutloaders.github.spiimpl;
import java.util.HashMap;
@@ -24,6 +24,8 @@ import javax.annotation.Priority;
import javax.inject.Inject;
import javax.inject.Named;
+import org.apache.causeway.extensions.layoutloaders.github.menu.LayoutLoadersGitHubMenu;
+
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpMethod;
@@ -39,14 +41,13 @@ import org.apache.causeway.commons.functional.Try;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.services.grid.spi.LayoutResource;
import org.apache.causeway.core.metamodel.services.grid.spi.LayoutResourceLoader;
-import org.apache.causeway.extensions.layoutgithub.loader.CausewayModuleExtLayoutGithubLoader;
-import org.apache.causeway.extensions.layoutgithub.loader.menu.LayoutLoaderMenu;
+import org.apache.causeway.extensions.layoutloaders.github.CausewayModuleExtLayoutLoadersGithub;
import lombok.NonNull;
import lombok.val;
@Service
-@Named(CausewayModuleExtLayoutGithubLoader.NAMESPACE + ".LayoutResourceLoaderFromGithub")
+@Named(CausewayModuleExtLayoutLoadersGithub.NAMESPACE + ".LayoutResourceLoaderFromGithub")
@Priority(PriorityPrecedence.MIDPOINT - 100)
@Qualifier("Github")
//@Log4j2
@@ -55,7 +56,7 @@ public class LayoutResourceLoaderFromGithub implements LayoutResourceLoader {
final RestTemplate restTemplateForSearch;
final RestTemplate restTemplateForContent;
final CausewayConfiguration causewayConfiguration;
- final LayoutLoaderMenu layoutLoaderMenu;
+ final LayoutLoadersGitHubMenu layoutLoadersGitHubMenu;
final QueryResultsCache queryResultsCache;
@Inject
@@ -63,12 +64,12 @@ public class LayoutResourceLoaderFromGithub implements LayoutResourceLoader {
final @Qualifier("GithubSearch") RestTemplate restTemplateForSearch,
final @Qualifier("GithubContent") RestTemplate restTemplateForContent,
final CausewayConfiguration causewayConfiguration,
- final LayoutLoaderMenu layoutLoaderMenu,
+ final LayoutLoadersGitHubMenu layoutLoadersGitHubMenu,
final QueryResultsCache queryResultsCache) {
this.restTemplateForSearch = restTemplateForSearch;
this.restTemplateForContent = restTemplateForContent;
this.causewayConfiguration = causewayConfiguration;
- this.layoutLoaderMenu = layoutLoaderMenu;
+ this.layoutLoadersGitHubMenu = layoutLoadersGitHubMenu;
this.queryResultsCache = queryResultsCache;
}
@@ -76,7 +77,7 @@ public class LayoutResourceLoaderFromGithub implements LayoutResourceLoader {
public Try<LayoutResource> tryLoadLayoutResource(
final @NonNull Class<?> type,
final @NonNull String candidateResourceName) {
- return layoutLoaderMenu.isEnabled()
+ return layoutLoadersGitHubMenu.isEnabled()
? queryResultsCache.execute(() -> tryLoadLayoutResource(candidateResourceName),
getClass(), "tryLoadLayoutResource", candidateResourceName)
: Try.empty();
@@ -97,7 +98,7 @@ public class LayoutResourceLoaderFromGithub implements LayoutResourceLoader {
private Try<String> search(final @NonNull String candidateResourceName) {
try {
- val repo = causewayConfiguration.getExtensions().getLayoutGithub().getRepository();
+ val repo = causewayConfiguration.getExtensions().getLayoutLoaders().getRepository();
val searchParams = new HashMap<String, String>();
searchParams.put("q", String.format("%s+in:path+repo:%s", candidateResourceName, repo));
diff --git a/extensions/core/layoutgithub/loader/src/test/java/org/apache/causeway/extensions/layoutgithub/loader/spi/LayoutResourceLoaderFromGithub_tryLoadLayoutResource_Test.java b/extensions/core/layoutloaders/github/src/test/java/org/apache/causeway/extensions/layoutloaders/github/spiimpl/LayoutResourceLoaderFromGithub_tryLoadLayoutResource_Test.java
similarity index 77%
rename from extensions/core/layoutgithub/loader/src/test/java/org/apache/causeway/extensions/layoutgithub/loader/spi/LayoutResourceLoaderFromGithub_tryLoadLayoutResource_Test.java
rename to extensions/core/layoutloaders/github/src/test/java/org/apache/causeway/extensions/layoutloaders/github/spiimpl/LayoutResourceLoaderFromGithub_tryLoadLayoutResource_Test.java
index 3e43379631..2b23c7cde2 100644
--- a/extensions/core/layoutgithub/loader/src/test/java/org/apache/causeway/extensions/layoutgithub/loader/spi/LayoutResourceLoaderFromGithub_tryLoadLayoutResource_Test.java
+++ b/extensions/core/layoutloaders/github/src/test/java/org/apache/causeway/extensions/layoutloaders/github/spiimpl/LayoutResourceLoaderFromGithub_tryLoadLayoutResource_Test.java
@@ -1,4 +1,4 @@
-package org.apache.causeway.extensions.layoutgithub.loader.spi;
+package org.apache.causeway.extensions.layoutloaders.github.spiimpl;
import java.nio.charset.StandardCharsets;
@@ -12,8 +12,8 @@ import static org.assertj.core.api.Assumptions.assumeThat;
import org.apache.causeway.applib.services.queryresultscache.QueryResultsCache;
import org.apache.causeway.commons.internal.resources._Resources;
import org.apache.causeway.core.config.CausewayConfiguration;
-import org.apache.causeway.extensions.layoutgithub.loader.CausewayModuleExtLayoutGithubLoader;
-import org.apache.causeway.extensions.layoutgithub.loader.menu.LayoutLoaderMenu;
+import org.apache.causeway.extensions.layoutloaders.github.CausewayModuleExtLayoutLoadersGithub;
+import org.apache.causeway.extensions.layoutloaders.github.menu.LayoutLoadersGitHubMenu;
import lombok.SneakyThrows;
import lombok.val;
@@ -34,13 +34,13 @@ class LayoutResourceLoaderFromGithub_tryLoadLayoutResource_Test {
void setup() {
val causewayConfiguration = new CausewayConfiguration(null);
- causewayConfiguration.getExtensions().getLayoutGithub().setApiKey(getApiKey());
- causewayConfiguration.getExtensions().getLayoutGithub().setRepository("apache/causeway-app-simpleapp");
+ causewayConfiguration.getExtensions().getLayoutLoaders().setApiKey(getApiKey());
+ causewayConfiguration.getExtensions().getLayoutLoaders().setRepository("apache/causeway-app-simpleapp");
- val module = new CausewayModuleExtLayoutGithubLoader();
+ val module = new CausewayModuleExtLayoutLoadersGithub();
val restTemplateForSearch = module.restTemplateForGithubSearch(causewayConfiguration);
val restTemplateForContent = module.restTemplateForGithubContent(causewayConfiguration);
- val layoutLoaderMenu = new LayoutLoaderMenu(causewayConfiguration);
+ val layoutLoaderMenu = new LayoutLoadersGitHubMenu(causewayConfiguration);
val queryResultsCache = new QueryResultsCache();
layoutLoaderMenu.new enableDynamicLayoutLoading().act();
diff --git a/extensions/core/layoutgithub/loader/src/test/resources/org/apache/causeway/extensions/layoutgithub/loader/spi/.gitignore b/extensions/core/layoutloaders/github/src/test/resources/org/apache/causeway/extensions/layoutloaders/github/spiimpl/.gitignore
similarity index 100%
rename from extensions/core/layoutgithub/loader/src/test/resources/org/apache/causeway/extensions/layoutgithub/loader/spi/.gitignore
rename to extensions/core/layoutloaders/github/src/test/resources/org/apache/causeway/extensions/layoutloaders/github/spiimpl/.gitignore
diff --git a/extensions/core/layoutgithub/pom.xml b/extensions/core/layoutloaders/pom.xml
similarity index 86%
rename from extensions/core/layoutgithub/pom.xml
rename to extensions/core/layoutloaders/pom.xml
index f9f9279209..ee59e29504 100644
--- a/extensions/core/layoutgithub/pom.xml
+++ b/extensions/core/layoutloaders/pom.xml
@@ -29,17 +29,17 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>causeway-extensions-layoutgithub</artifactId>
- <name>Apache Causeway Ext - LayoutGitHub</name>
+ <artifactId>causeway-extensions-layoutloaders</artifactId>
+ <name>Apache Causeway Ext - LayoutLoadersHub</name>
<description>
- Allows layouts to be dynamically loaded from a github repo.
+ Allows layouts to be dynamically loaded from an external source.
</description>
<packaging>pom</packaging>
<modules>
- <module>loader</module>
+ <module>github</module>
</modules>
</project>
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 9c966bdf19..c33458900a 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -105,7 +105,7 @@
<module>core/executionoutbox</module>
<module>core/executionrepublisher</module>
<module>core/flyway</module>
- <module>core/layoutgithub</module>
+ <module>core/layoutloaders</module>
<module>security/audittrail</module>
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtLayoutGithubRoleAndPermissions.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtLayoutLoadersRoleAndPermissions.java
similarity index 87%
rename from extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtLayoutGithubRoleAndPermissions.java
rename to extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtLayoutLoadersRoleAndPermissions.java
index cdbbc9c3d3..33eef63de8 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtLayoutGithubRoleAndPermissions.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtLayoutLoadersRoleAndPermissions.java
@@ -25,17 +25,17 @@ import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPe
import org.apache.causeway.extensions.secman.applib.role.fixtures.AbstractRoleAndPermissionsFixtureScript;
/**
- * Sets up a role with access to the menu actions contributed by the <i>LayoutGithub</i> extension.
+ * Sets up a role with access to the menu actions contributed by the <i>LayoutLoaders</i> extension.
*
* @since 2.0 {@index}
*/
-public class CausewayExtLayoutGithubRoleAndPermissions extends AbstractRoleAndPermissionsFixtureScript {
+public class CausewayExtLayoutLoadersRoleAndPermissions extends AbstractRoleAndPermissionsFixtureScript {
- public static final String NAMESPACE = "causeway.ext.layoutGithub";
+ public static final String NAMESPACE = "causeway.ext.layoutLoaders";
public static final String ROLE_NAME = NAMESPACE.replace(".","-");
- public CausewayExtLayoutGithubRoleAndPermissions() {
+ public CausewayExtLayoutLoadersRoleAndPermissions() {
super(ROLE_NAME, "Access to dynamic layout loading");
}
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtSecmanRegularUserRoleAndPermissions.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtSecmanRegularUserRoleAndPermissions.java
index 25b5e69b81..b0b985be7a 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtSecmanRegularUserRoleAndPermissions.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayExtSecmanRegularUserRoleAndPermissions.java
@@ -106,8 +106,8 @@ public class CausewayExtSecmanRegularUserRoleAndPermissions extends AbstractRole
: null,
// optionally allow access to layout menu and pages, based on module presence
- env.getIocContainer().containsBean("org.apache.causeway.extensions.layoutgithub.loader.CausewayModuleExtLayoutGithubLoader")
- ? ApplicationFeatureId.newNamespace(CausewayExtLayoutGithubRoleAndPermissions.NAMESPACE)
+ env.getIocContainer().containsBean("org.apache.causeway.extensions.layoutloaders.github.CausewayModuleExtLayoutLoadersGithub")
+ ? ApplicationFeatureId.newNamespace(CausewayExtLayoutLoadersRoleAndPermissions.NAMESPACE)
: null
);
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/seed/scripts/SeedUsersAndRolesFixtureScript.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/seed/scripts/SeedUsersAndRolesFixtureScript.java
index cf2909b02b..f5aae48533 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/seed/scripts/SeedUsersAndRolesFixtureScript.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/seed/scripts/SeedUsersAndRolesFixtureScript.java
@@ -23,7 +23,7 @@ import java.util.function.Supplier;
import javax.inject.Inject;
-import org.apache.causeway.extensions.secman.applib.role.seed.CausewayExtLayoutGithubRoleAndPermissions;
+import org.apache.causeway.extensions.secman.applib.role.seed.CausewayExtLayoutLoadersRoleAndPermissions;
import org.springframework.lang.Nullable;
@@ -125,7 +125,7 @@ public class SeedUsersAndRolesFixtureScript extends FixtureScript {
new CausewayExtDocgenRoleAndPermissions(),
new CausewayExtExecutionLogRoleAndPermissions(),
new CausewayExtExecutionOutboxRoleAndPermissions(),
- new CausewayExtLayoutGithubRoleAndPermissions(),
+ new CausewayExtLayoutLoadersRoleAndPermissions(),
new CausewayExtSessionLogRoleAndPermissions(),
new CausewayExtH2ConsoleRoleAndPermissions(),
new CausewayViewerRestfulObjectsSwaggerRoleAndPermissions(),