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 3a908d64c7 ISIS-3064: schema rename fixes ("isisExtSecman")
3a908d64c7 is described below
commit 3a908d64c7f9e4d1827ab6033c134ada94433cd9
Author: Andi Huber <[email protected]>
AuthorDate: Wed Aug 3 10:47:14 2022 +0200
ISIS-3064: schema rename fixes ("isisExtSecman")
---
examples/demo/domain/src/main/resources/application.yml | 2 +-
.../security/secman/adoc/modules/secman/pages/setting-up.adoc | 2 +-
.../src/main/resources/META-INF/orm-secman.template | 10 +++++-----
persistence/jdo/adoc/modules/ROOT/pages/db-schemas.adoc | 4 ++--
persistence/jpa/adoc/modules/ROOT/pages/db-schemas.adoc | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/examples/demo/domain/src/main/resources/application.yml
b/examples/demo/domain/src/main/resources/application.yml
index 70cae50ae9..a64074828d 100644
--- a/examples/demo/domain/src/main/resources/application.yml
+++ b/examples/demo/domain/src/main/resources/application.yml
@@ -107,7 +107,7 @@ isis:
# schema auto creation etc. ...
persistence:
schema:
- autoCreateSchemas:
isisExtensionsSecman,isisExtCommandLog,isisExtExecutionLog,demo
+ autoCreateSchemas:
isisExtSecman,isisExtCommandLog,isisExtExecutionLog,demo
extensions:
secman:
diff --git
a/extensions/security/secman/adoc/modules/secman/pages/setting-up.adoc
b/extensions/security/secman/adoc/modules/secman/pages/setting-up.adoc
index 9b2a4f3912..9a5125690e 100644
--- a/extensions/security/secman/adoc/modules/secman/pages/setting-up.adoc
+++ b/extensions/security/secman/adoc/modules/secman/pages/setting-up.adoc
@@ -100,7 +100,7 @@ Add the database schema used by the SecMan entities to the
configuration file:
isis:
persistence:
schema:
- auto-create-schemas: isisExtensionsSecman
+ auto-create-schemas: isisExtSecman
----
Optionally, modify the configuration properties for Secman itself:
diff --git
a/extensions/security/secman/persistence-jpa/src/main/resources/META-INF/orm-secman.template
b/extensions/security/secman/persistence-jpa/src/main/resources/META-INF/orm-secman.template
index 418ac8aeb9..5f1f2e7fa0 100644
---
a/extensions/security/secman/persistence-jpa/src/main/resources/META-INF/orm-secman.template
+++
b/extensions/security/secman/persistence-jpa/src/main/resources/META-INF/orm-secman.template
@@ -26,22 +26,22 @@
<!-- rename file to .xml then customize-->
<entity
class="org.apache.isis.extensions.secman.jpa.permission.dom.ApplicationPermission">
- <table schema="isisExtensionsSecman"
name="ApplicationPermission"/>
+ <table schema="isisExtSecman" name="ApplicationPermission"/>
</entity>
<entity
class="org.apache.isis.extensions.secman.jpa.role.dom.ApplicationRole">
- <table schema="isisExtensionsSecman" name="ApplicationRole"/>
+ <table schema="isisExtSecman" name="ApplicationRole"/>
</entity>
<entity
class="org.apache.isis.extensions.secman.jpa.tenancy.dom.ApplicationTenancy">
- <table schema="isisExtensionsSecman" name="ApplicationTenancy"/>
+ <table schema="isisExtSecman" name="ApplicationTenancy"/>
</entity>
<entity
class="org.apache.isis.extensions.secman.jpa.user.dom.ApplicationUser">
- <table schema="isisExtensionsSecman" name="ApplicationUser"/>
+ <table schema="isisExtSecman" name="ApplicationUser"/>
<attributes>
<many-to-many name="roles">
- <join-table schema="isisExtensionsSecman"
name="ApplicationUserRoles">
+ <join-table schema="isisExtSecman"
name="ApplicationUserRoles">
<join-column name="userId" />
<inverse-join-column name="roleId" />
</join-table>
diff --git a/persistence/jdo/adoc/modules/ROOT/pages/db-schemas.adoc
b/persistence/jdo/adoc/modules/ROOT/pages/db-schemas.adoc
index 8edb4304f3..18e9ad8840 100644
--- a/persistence/jdo/adoc/modules/ROOT/pages/db-schemas.adoc
+++ b/persistence/jdo/adoc/modules/ROOT/pages/db-schemas.adoc
@@ -18,7 +18,7 @@ Its `ApplicationUser` entity is defined as:
import javax.jdo.annotations.PersistenceCapable;
@PersistenceCapable(
- schema = "isisExtensionsSecman",
+ schema = "isisExtSecman",
table = "ApplicationUser",
...
)
@@ -29,7 +29,7 @@ which results in a `CREATE TABLE` statement of:
[source,sql]
----
-CREATE TABLE isisExtensionsSecman."ApplicationUser" (
+CREATE TABLE isisExtSecman."ApplicationUser" (
...
)
----
diff --git a/persistence/jpa/adoc/modules/ROOT/pages/db-schemas.adoc
b/persistence/jpa/adoc/modules/ROOT/pages/db-schemas.adoc
index 1716312b52..f632cc35a8 100644
--- a/persistence/jpa/adoc/modules/ROOT/pages/db-schemas.adoc
+++ b/persistence/jpa/adoc/modules/ROOT/pages/db-schemas.adoc
@@ -17,7 +17,7 @@ Its `ApplicationUser` entity is defined as:
----
@Entity
@Table(
- schema = "isisExtensionsSecman",
+ schema = "isisExtSecman",
name = "ApplicationUser",
...
)
@@ -28,7 +28,7 @@ which results in a `CREATE TABLE` statement of:
[source,sql]
----
-CREATE TABLE isisExtensionsSecman."ApplicationUser" (
+CREATE TABLE isisExtSecman."ApplicationUser" (
...
)
----
