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/04/15 08:11:14 UTC
[isis-app-helloworld] 02/04: fixes up imports
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jpa-secman
in repository https://gitbox.apache.org/repos/asf/isis-app-helloworld.git
commit 32c120248aef8981bd08ff91dac74922bccd7746
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Apr 15 08:51:35 2021 +0100
fixes up imports
---
pom.xml | 2 +-
.../java/domainapp/security/scripts/RoleAndPerms__NoDelete.java | 2 +-
src/main/java/domainapp/security/scripts/RoleAndPerms__UserRo.java | 2 +-
src/main/java/domainapp/security/scripts/RoleAndPerms__UserRw.java | 6 +++---
src/main/java/domainapp/security/scripts/SecmanConstants.java | 2 +-
.../java/domainapp/security/scripts/UserToRole__bob_UserRw.java | 2 +-
.../java/domainapp/security/scripts/UserToRole__dick_UserRo.java | 2 +-
.../security/scripts/UserToRole__joe_UserRw_but_NoDelete.java | 2 +-
src/main/java/domainapp/webapp/AppManifest.java | 4 ++--
9 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6f46f10..b923017 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
</dependency>
<dependency>
<groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman-persistence-jdo</artifactId>
+ <artifactId>isis-extensions-secman-persistence-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.extensions</groupId>
diff --git a/src/main/java/domainapp/security/scripts/RoleAndPerms__NoDelete.java b/src/main/java/domainapp/security/scripts/RoleAndPerms__NoDelete.java
index 32d65ea..11580dc 100644
--- a/src/main/java/domainapp/security/scripts/RoleAndPerms__NoDelete.java
+++ b/src/main/java/domainapp/security/scripts/RoleAndPerms__NoDelete.java
@@ -5,7 +5,7 @@ import org.apache.isis.applib.services.appfeat.ApplicationFeatureSort;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionMode;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRule;
-import org.apache.isis.extensions.secman.jdo.seed.scripts.AbstractRoleAndPermissionsFixtureScript;
+import org.apache.isis.extensions.secman.jpa.seed.scripts.AbstractRoleAndPermissionsFixtureScript;
public class RoleAndPerms__NoDelete extends AbstractRoleAndPermissionsFixtureScript {
diff --git a/src/main/java/domainapp/security/scripts/RoleAndPerms__UserRo.java b/src/main/java/domainapp/security/scripts/RoleAndPerms__UserRo.java
index 6bd585f..2e97519 100644
--- a/src/main/java/domainapp/security/scripts/RoleAndPerms__UserRo.java
+++ b/src/main/java/domainapp/security/scripts/RoleAndPerms__UserRo.java
@@ -5,7 +5,7 @@ import org.apache.isis.applib.services.appfeat.ApplicationFeatureSort;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionMode;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRule;
-import org.apache.isis.extensions.secman.jdo.seed.scripts.AbstractRoleAndPermissionsFixtureScript;
+import org.apache.isis.extensions.secman.jpa.seed.scripts.AbstractRoleAndPermissionsFixtureScript;
public class RoleAndPerms__UserRo extends AbstractRoleAndPermissionsFixtureScript {
diff --git a/src/main/java/domainapp/security/scripts/RoleAndPerms__UserRw.java b/src/main/java/domainapp/security/scripts/RoleAndPerms__UserRw.java
index 50870af..4859b97 100644
--- a/src/main/java/domainapp/security/scripts/RoleAndPerms__UserRw.java
+++ b/src/main/java/domainapp/security/scripts/RoleAndPerms__UserRw.java
@@ -9,9 +9,9 @@ import org.apache.isis.applib.value.Password;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionMode;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRule;
-import org.apache.isis.extensions.secman.jdo.dom.role.ApplicationRole;
-import org.apache.isis.extensions.secman.jdo.dom.role.ApplicationRoleRepository;
-import org.apache.isis.extensions.secman.jdo.seed.scripts.AbstractRoleAndPermissionsFixtureScript;
+import org.apache.isis.extensions.secman.jpa.dom.role.ApplicationRole;
+import org.apache.isis.extensions.secman.jpa.dom.role.ApplicationRoleRepository;
+import org.apache.isis.extensions.secman.jpa.seed.scripts.AbstractRoleAndPermissionsFixtureScript;
import org.apache.isis.extensions.secman.model.dom.user.ApplicationUserMenu;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
diff --git a/src/main/java/domainapp/security/scripts/SecmanConstants.java b/src/main/java/domainapp/security/scripts/SecmanConstants.java
index 0c8df8d..1811749 100644
--- a/src/main/java/domainapp/security/scripts/SecmanConstants.java
+++ b/src/main/java/domainapp/security/scripts/SecmanConstants.java
@@ -2,7 +2,7 @@ package domainapp.security.scripts;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.extensions.secman.api.user.AccountType;
-import org.apache.isis.extensions.secman.jdo.seed.scripts.AbstractUserAndRolesFixtureScript;
+import org.apache.isis.extensions.secman.jpa.seed.scripts.AbstractUserAndRolesFixtureScript;
public class SecmanConstants {
private SecmanConstants(){}
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 a44b92b..8ecb9df 100644
--- a/src/main/java/domainapp/security/scripts/UserToRole__bob_UserRw.java
+++ b/src/main/java/domainapp/security/scripts/UserToRole__bob_UserRw.java
@@ -2,7 +2,7 @@ package domainapp.security.scripts;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.extensions.secman.api.user.AccountType;
-import org.apache.isis.extensions.secman.jdo.seed.scripts.AbstractUserAndRolesFixtureScript;
+import org.apache.isis.extensions.secman.jpa.seed.scripts.AbstractUserAndRolesFixtureScript;
public class UserToRole__bob_UserRw extends AbstractUserAndRolesFixtureScript {
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 2245fdb..d059383 100644
--- a/src/main/java/domainapp/security/scripts/UserToRole__dick_UserRo.java
+++ b/src/main/java/domainapp/security/scripts/UserToRole__dick_UserRo.java
@@ -2,7 +2,7 @@ package domainapp.security.scripts;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.extensions.secman.api.user.AccountType;
-import org.apache.isis.extensions.secman.jdo.seed.scripts.AbstractUserAndRolesFixtureScript;
+import org.apache.isis.extensions.secman.jpa.seed.scripts.AbstractUserAndRolesFixtureScript;
public class UserToRole__dick_UserRo extends AbstractUserAndRolesFixtureScript {
diff --git a/src/main/java/domainapp/security/scripts/UserToRole__joe_UserRw_but_NoDelete.java b/src/main/java/domainapp/security/scripts/UserToRole__joe_UserRw_but_NoDelete.java
index 9f98c23..5eafe7c 100644
--- a/src/main/java/domainapp/security/scripts/UserToRole__joe_UserRw_but_NoDelete.java
+++ b/src/main/java/domainapp/security/scripts/UserToRole__joe_UserRw_but_NoDelete.java
@@ -2,7 +2,7 @@ package domainapp.security.scripts;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.extensions.secman.api.user.AccountType;
-import org.apache.isis.extensions.secman.jdo.seed.scripts.AbstractUserAndRolesFixtureScript;
+import org.apache.isis.extensions.secman.jpa.seed.scripts.AbstractUserAndRolesFixtureScript;
public class UserToRole__joe_UserRw_but_NoDelete extends AbstractUserAndRolesFixtureScript {
diff --git a/src/main/java/domainapp/webapp/AppManifest.java b/src/main/java/domainapp/webapp/AppManifest.java
index 84cebb0..1d90f9e 100644
--- a/src/main/java/domainapp/webapp/AppManifest.java
+++ b/src/main/java/domainapp/webapp/AppManifest.java
@@ -18,7 +18,7 @@ import org.apache.isis.extensions.secman.api.SecurityRealmService;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationServiceAllowBeatsVeto;
import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleExtSecmanEncryptionJbcrypt;
-import org.apache.isis.extensions.secman.jdo.IsisModuleExtSecmanPersistenceJdo;
+import org.apache.isis.extensions.secman.jpa.IsisModuleExtSecmanPersistenceJpa;
import org.apache.isis.extensions.secman.model.IsisModuleExtSecmanModel;
import org.apache.isis.extensions.secman.shiro.IsisModuleExtSecmanRealmShiro;
import org.apache.isis.persistence.jpa.eclipselink.IsisModuleJpaEclipselink;
@@ -42,7 +42,7 @@ import domainapp.security.scripts.SecmanConstants;
IsisModuleExtSecmanApi.class,
IsisModuleExtSecmanModel.class,
- IsisModuleExtSecmanPersistenceJdo.class,
+ IsisModuleExtSecmanPersistenceJpa.class,
IsisModuleExtSecmanRealmShiro.class,
IsisModuleExtSecmanEncryptionJbcrypt.class,