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 2021/05/24 07:48:52 UTC
[isis-app-helloworld] branch jdo-secman updated (9c89315 -> 3580ca7)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch jdo-secman
in repository https://gitbox.apache.org/repos/asf/isis-app-helloworld.git.
from 9c89315 ISIS-2619: rationalises fixtures etc.
new 9c7234d fixes fixtures
add b0390d2 updates to latest snapshot
add 7bb635f rationalizing with latest snapshot and jpa-SNAPSHOT
add fc4d22d updates parent pom to 2.0.0-M5.20210516-0435-8f068035
add 56cb03c updates parent pom to 2.0.0-M5.20210522-0434-fb17f373
add d7ad27a ISIS-2660: removes persistence.xml, as is not required by default
add 7836cf6 Merge branch 'jdo' into jdo-SNAPSHOT
new 188e914 Merge branch 'jdo-SNAPSHOT' into jdo-secman
new 3580ca7 removes SecmanRoleNames (uses secman's own constant)
The 3 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:
pom.xml | 4 ++--
src/main/java/META-INF/persistence.xml | 8 --------
.../domainapp/modules/hello/dom/hwo/HelloWorldObject.java | 14 ++++++++++++--
.../modules/hello/dom/hwo/HelloWorldObject.layout.xml | 4 ++--
.../java/domainapp/security/isisroles/SecmanRoleNames.java | 7 -------
.../domainapp/security/scripts/UserToRole__bob_UserRw.java | 9 +++------
.../security/scripts/UserToRole__dick_UserRo.java | 5 ++---
...serToRole__joe_UserRw_but_NoDelete_or_isis2619Prop.java | 6 ++----
src/main/java/domainapp/webapp/AppManifest.java | 7 -------
src/main/resources/menubars.layout.xml | 1 +
10 files changed, 24 insertions(+), 41 deletions(-)
delete mode 100644 src/main/java/META-INF/persistence.xml
delete mode 100644 src/main/java/domainapp/security/isisroles/SecmanRoleNames.java
[isis-app-helloworld] 01/03: fixes fixtures
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jdo-secman
in repository https://gitbox.apache.org/repos/asf/isis-app-helloworld.git
commit 9c7234d6a55448bc91734326e41e9e70ba57bfaf
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri May 14 09:07:01 2021 +0100
fixes fixtures
---
src/main/java/domainapp/security/scripts/UserToRole__bob_UserRw.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/main/java/domainapp/security/scripts/UserToRole__bob_UserRw.java b/src/main/java/domainapp/security/scripts/UserToRole__bob_UserRw.java
index d2bc56b..59db2ef 100644
--- a/src/main/java/domainapp/security/scripts/UserToRole__bob_UserRw.java
+++ b/src/main/java/domainapp/security/scripts/UserToRole__bob_UserRw.java
@@ -4,7 +4,6 @@ import org.apache.isis.commons.collections.Can;
import org.apache.isis.extensions.secman.api.user.dom.AccountType;
import org.apache.isis.extensions.secman.api.user.fixtures.AbstractUserAndRolesFixtureScript;
import org.apache.isis.extensions.secman.model.seed.scripts.other.IsisConfigurationRoleAndPermissions;
-import org.apache.isis.extensions.secman.model.seed.scripts.other.IsisExtFixturesRoleAndPermissions;
import org.apache.isis.extensions.secman.model.seed.scripts.other.IsisExtH2ConsoleRoleAndPermissions;
import org.apache.isis.extensions.secman.model.seed.scripts.other.IsisPersistenceJdoMetaModelRoleAndPermissions;
import org.apache.isis.extensions.secman.model.seed.scripts.other.IsisSudoImpersonateRoleAndPermissions;
@@ -21,10 +20,9 @@ public class UserToRole__bob_UserRw extends AbstractUserAndRolesFixtureScript {
RoleAndPerms__UserRw.ROLE_NAME
, SecmanRoleNames.USER
, IsisConfigurationRoleAndPermissions.ROLE_NAME
- , IsisExtFixturesRoleAndPermissions.ROLE_NAME
+ , IsisSudoImpersonateRoleAndPermissions.ROLE_NAME
, IsisExtH2ConsoleRoleAndPermissions.ROLE_NAME
, IsisPersistenceJdoMetaModelRoleAndPermissions.ROLE_NAME
- , IsisSudoImpersonateRoleAndPermissions.ROLE_NAME
));
}
[isis-app-helloworld] 02/03: Merge branch 'jdo-SNAPSHOT' into
jdo-secman
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jdo-secman
in repository https://gitbox.apache.org/repos/asf/isis-app-helloworld.git
commit 188e914e097dce1cb342beeb5bb75314bed92b09
Merge: 9c7234d 7836cf6
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun May 23 16:13:03 2021 +0100
Merge branch 'jdo-SNAPSHOT' into jdo-secman
pom.xml | 4 ++--
src/main/java/META-INF/persistence.xml | 8 --------
.../domainapp/modules/hello/dom/hwo/HelloWorldObject.java | 14 ++++++++++++--
.../modules/hello/dom/hwo/HelloWorldObject.layout.xml | 4 ++--
src/main/resources/menubars.layout.xml | 1 +
5 files changed, 17 insertions(+), 14 deletions(-)
diff --cc pom.xml
index f06356c,f3e7448..47d3d47
--- a/pom.xml
+++ b/pom.xml
@@@ -7,10 -7,7 +7,10 @@@
<parent>
<groupId>org.apache.isis.app</groupId>
<artifactId>isis-app-starter-parent</artifactId>
++ <version>2.0.0-SNAPSHOT</version>
+<!--
- <version>2.0.0-M5.20210413-1443-108a3a48</version>
+ <version>2.0.0-M5.20210522-0434-fb17f373</version>
+-->
- <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
[isis-app-helloworld] 03/03: removes SecmanRoleNames (uses secman's
own constant)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jdo-secman
in repository https://gitbox.apache.org/repos/asf/isis-app-helloworld.git
commit 3580ca7a13246b490b1ea39f8502a93aa2865551
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon May 24 08:48:05 2021 +0100
removes SecmanRoleNames (uses secman's own constant)
---
src/main/java/domainapp/security/isisroles/SecmanRoleNames.java | 7 -------
.../java/domainapp/security/scripts/UserToRole__bob_UserRw.java | 5 ++---
.../java/domainapp/security/scripts/UserToRole__dick_UserRo.java | 5 ++---
.../UserToRole__joe_UserRw_but_NoDelete_or_isis2619Prop.java | 6 ++----
src/main/java/domainapp/webapp/AppManifest.java | 7 -------
5 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/src/main/java/domainapp/security/isisroles/SecmanRoleNames.java b/src/main/java/domainapp/security/isisroles/SecmanRoleNames.java
deleted file mode 100644
index 1d8f29b..0000000
--- a/src/main/java/domainapp/security/isisroles/SecmanRoleNames.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package domainapp.security.isisroles;
-
-public class SecmanRoleNames {
- private SecmanRoleNames(){}
- public static final String ADMIN = "isis-ext-secman-admin";
- public static final String USER = "isis-ext-secman-user";
-}
diff --git a/src/main/java/domainapp/security/scripts/UserToRole__bob_UserRw.java b/src/main/java/domainapp/security/scripts/UserToRole__bob_UserRw.java
index 59db2ef..0196b1e 100644
--- a/src/main/java/domainapp/security/scripts/UserToRole__bob_UserRw.java
+++ b/src/main/java/domainapp/security/scripts/UserToRole__bob_UserRw.java
@@ -1,6 +1,7 @@
package domainapp.security.scripts;
import org.apache.isis.commons.collections.Can;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.user.dom.AccountType;
import org.apache.isis.extensions.secman.api.user.fixtures.AbstractUserAndRolesFixtureScript;
import org.apache.isis.extensions.secman.model.seed.scripts.other.IsisConfigurationRoleAndPermissions;
@@ -8,8 +9,6 @@ import org.apache.isis.extensions.secman.model.seed.scripts.other.IsisExtH2Conso
import org.apache.isis.extensions.secman.model.seed.scripts.other.IsisPersistenceJdoMetaModelRoleAndPermissions;
import org.apache.isis.extensions.secman.model.seed.scripts.other.IsisSudoImpersonateRoleAndPermissions;
-import domainapp.security.isisroles.SecmanRoleNames;
-
public class UserToRole__bob_UserRw extends AbstractUserAndRolesFixtureScript {
public UserToRole__bob_UserRw() {
@@ -18,7 +17,7 @@ public class UserToRole__bob_UserRw extends AbstractUserAndRolesFixtureScript {
AccountType.LOCAL,
Can.of(
RoleAndPerms__UserRw.ROLE_NAME
- , SecmanRoleNames.USER
+ , SecmanConfiguration.DEFAULT_REGULAR_USER_ROLE_NAME
, IsisConfigurationRoleAndPermissions.ROLE_NAME
, IsisSudoImpersonateRoleAndPermissions.ROLE_NAME
, IsisExtH2ConsoleRoleAndPermissions.ROLE_NAME
diff --git a/src/main/java/domainapp/security/scripts/UserToRole__dick_UserRo.java b/src/main/java/domainapp/security/scripts/UserToRole__dick_UserRo.java
index 9ee34b1..ab808f7 100644
--- a/src/main/java/domainapp/security/scripts/UserToRole__dick_UserRo.java
+++ b/src/main/java/domainapp/security/scripts/UserToRole__dick_UserRo.java
@@ -1,11 +1,10 @@
package domainapp.security.scripts;
import org.apache.isis.commons.collections.Can;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.user.dom.AccountType;
import org.apache.isis.extensions.secman.api.user.fixtures.AbstractUserAndRolesFixtureScript;
-import domainapp.security.isisroles.SecmanRoleNames;
-
public class UserToRole__dick_UserRo extends AbstractUserAndRolesFixtureScript {
public UserToRole__dick_UserRo() {
@@ -14,7 +13,7 @@ public class UserToRole__dick_UserRo extends AbstractUserAndRolesFixtureScript {
AccountType.LOCAL,
Can.of(
RoleAndPerms__UserRo.ROLE_NAME
- , SecmanRoleNames.USER
+ , SecmanConfiguration.DEFAULT_REGULAR_USER_ROLE_NAME
));
}
diff --git a/src/main/java/domainapp/security/scripts/UserToRole__joe_UserRw_but_NoDelete_or_isis2619Prop.java b/src/main/java/domainapp/security/scripts/UserToRole__joe_UserRw_but_NoDelete_or_isis2619Prop.java
index 2e87d69..c68e4e5 100644
--- a/src/main/java/domainapp/security/scripts/UserToRole__joe_UserRw_but_NoDelete_or_isis2619Prop.java
+++ b/src/main/java/domainapp/security/scripts/UserToRole__joe_UserRw_but_NoDelete_or_isis2619Prop.java
@@ -1,13 +1,12 @@
package domainapp.security.scripts;
import org.apache.isis.commons.collections.Can;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.user.dom.AccountType;
import org.apache.isis.extensions.secman.api.user.fixtures.AbstractUserAndRolesFixtureScript;
import org.apache.isis.extensions.secman.model.seed.scripts.other.IsisExtH2ConsoleRoleAndPermissions;
import org.apache.isis.extensions.secman.model.seed.scripts.other.IsisPersistenceJdoMetaModelRoleAndPermissions;
-import domainapp.security.isisroles.SecmanRoleNames;
-
public class UserToRole__joe_UserRw_but_NoDelete_or_isis2619Prop extends AbstractUserAndRolesFixtureScript {
public UserToRole__joe_UserRw_but_NoDelete_or_isis2619Prop() {
@@ -18,10 +17,9 @@ public class UserToRole__joe_UserRw_but_NoDelete_or_isis2619Prop extends Abstrac
RoleAndPerms__UserRw.ROLE_NAME
, RoleAndPerms__NoDelete.ROLE_NAME // <<< veto application behaviour
, RoleAndPerms__NoIsis2619Prop.ROLE_NAME // <<< veto application behaviour
+ , SecmanConfiguration.DEFAULT_REGULAR_USER_ROLE_NAME
, IsisExtH2ConsoleRoleAndPermissions.ROLE_NAME
, IsisPersistenceJdoMetaModelRoleAndPermissions.ROLE_NAME
- , SecmanRoleNames.USER
));
}
-
}
diff --git a/src/main/java/domainapp/webapp/AppManifest.java b/src/main/java/domainapp/webapp/AppManifest.java
index 312c0f3..0625975 100644
--- a/src/main/java/domainapp/webapp/AppManifest.java
+++ b/src/main/java/domainapp/webapp/AppManifest.java
@@ -10,7 +10,6 @@ import org.springframework.context.annotation.PropertySources;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
-import org.apache.isis.extensions.secman.api.IsisModuleExtSecmanApi;
import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.SecurityRealm;
import org.apache.isis.extensions.secman.api.SecurityRealmCharacteristic;
@@ -19,7 +18,6 @@ import org.apache.isis.extensions.secman.api.permission.spi.PermissionsEvaluatio
import org.apache.isis.extensions.secman.api.permission.spi.PermissionsEvaluationServiceAllowBeatsVeto;
import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleExtSecmanEncryptionJbcrypt;
import org.apache.isis.extensions.secman.jdo.IsisModuleExtSecmanPersistenceJdo;
-import org.apache.isis.extensions.secman.model.IsisModuleExtSecmanModel;
import org.apache.isis.extensions.secman.shiro.IsisModuleExtSecmanRealmShiro;
import org.apache.isis.persistence.jdo.datanucleus.IsisModuleJdoDatanucleus;
import org.apache.isis.security.shiro.IsisModuleSecurityShiro;
@@ -31,7 +29,6 @@ import org.apache.isis.viewer.wicket.viewer.IsisModuleViewerWicketViewer;
import domainapp.modules.hello.HelloWorldModule;
import domainapp.security.SeedUsersAndRoles;
import domainapp.security.fixturescripts.FixtureScriptSpecProvider;
-import domainapp.security.isisroles.SecmanRoleNames;
import domainapp.security.multitenancy.ApplicationTenancyEvaluatorUsingAtPath;
@Configuration
@@ -42,8 +39,6 @@ import domainapp.security.multitenancy.ApplicationTenancyEvaluatorUsingAtPath;
IsisModuleViewerRestfulObjectsJaxrsResteasy4.class,
IsisModuleViewerWicketViewer.class,
- IsisModuleExtSecmanApi.class,
- IsisModuleExtSecmanModel.class,
IsisModuleExtSecmanPersistenceJdo.class,
IsisModuleExtSecmanRealmShiro.class,
IsisModuleExtSecmanEncryptionJbcrypt.class,
@@ -66,8 +61,6 @@ public class AppManifest {
public SecmanConfiguration secmanConfiguration() {
return SecmanConfiguration.builder()
.adminUserName("sven").adminPassword("pass")
- .adminRoleName(SecmanRoleNames.ADMIN)
- .regularUserRoleName(SecmanRoleNames.USER)
.build();
}