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/26 06:14:10 UTC
[isis] 02/10: ISIS-2698: renames o.a.i.extensions.secman.model to
o.a.i.extensions.secman.integration
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2698
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 388e061c30d27fe3c8435e96b5b42e2e8e51345a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed May 26 06:34:41 2021 +0100
ISIS-2698: renames o.a.i.extensions.secman.model to o.a.i.extensions.secman.integration
---
.../java/demoapp/web/DemoAppManifestCommon.java | 2 +-
extensions/security/secman/integration/pom.xml | 2 +-
.../IsisModuleExtSecmanModel.java | 12 ++++++------
.../facets/TenantedAuthorizationFacet.java | 2 +-
.../facets/TenantedAuthorizationFacetDefault.java | 2 +-
.../facets/TenantedAuthorizationPostProcessor.java | 2 +-
.../seed/SeedSecurityModuleService.java | 4 ++--
.../scripts/SeedUsersAndRolesFixtureScript.java | 22 +++++++++++-----------
.../other/IsisAppFeatureRoleAndPermissions.java | 5 +----
.../other/IsisConfigurationRoleAndPermissions.java | 3 +--
.../other/IsisExtH2ConsoleRoleAndPermissions.java | 2 +-
...sPersistenceJdoMetaModelRoleAndPermissions.java | 2 +-
.../IsisSudoImpersonateRoleAndPermissions.java | 2 +-
...werRestfulObjectsSwaggerRoleAndPermissions.java | 3 +--
.../seed/scripts/secman/GlobalTenancy.java | 2 +-
.../IsisExtSecmanAdminRoleAndPermissions.java | 3 +--
.../scripts/secman/IsisExtSecmanAdminUser.java | 2 +-
...IsisExtSecmanRegularUserRoleAndPermissions.java | 10 +++++-----
.../spiimpl/ImpersonateMenuAdvisorForSecman.java | 2 +-
.../TableColumnVisibilityServiceForSecman.java | 2 +-
.../userreg/UserRegistrationServiceForSecman.java | 2 +-
.../jdo/IsisModuleExtSecmanPersistenceJdo.java | 2 +-
.../jpa/IsisModuleExtSecmanPersistenceJpa.java | 2 +-
.../isis/testdomain/shiro/ShiroSecmanLdapTest.java | 2 +-
.../shiro/ShiroSecmanLdap_restfulStressTest.java | 2 +-
.../isis/testdomain/shiro/ShiroSecmanTest.java | 14 +++++++-------
26 files changed, 52 insertions(+), 58 deletions(-)
diff --git a/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestCommon.java b/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestCommon.java
index 90eb9ae..eeff791 100644
--- a/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestCommon.java
+++ b/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestCommon.java
@@ -30,7 +30,7 @@ import org.apache.isis.extensions.commandreplay.primary.IsisModuleExtCommandRepl
import org.apache.isis.extensions.commandreplay.secondary.IsisModuleExtCommandReplaySecondary;
import org.apache.isis.extensions.cors.impl.IsisModuleExtCors;
import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleExtSecmanEncryptionJbcrypt;
-import org.apache.isis.extensions.secman.model.IsisModuleExtSecmanModel;
+import org.apache.isis.extensions.secman.integration.IsisModuleExtSecmanModel;
import org.apache.isis.extensions.secman.shiro.IsisModuleExtSecmanRealmShiro;
import org.apache.isis.extensions.viewer.wicket.exceldownload.ui.IsisModuleExtExcelDownloadUi;
import org.apache.isis.security.shiro.IsisModuleSecurityShiro;
diff --git a/extensions/security/secman/integration/pom.xml b/extensions/security/secman/integration/pom.xml
index 840643e..70e4cf8 100644
--- a/extensions/security/secman/integration/pom.xml
+++ b/extensions/security/secman/integration/pom.xml
@@ -32,7 +32,7 @@
<description></description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.extensions.secman.model</jar-plugin.automaticModuleName>
+ <jar-plugin.automaticModuleName>org.apache.isis.extensions.secman.integration</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/extensions/secman/model</git-plugin.propertiesDir>
</properties>
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/IsisModuleExtSecmanModel.java b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/IsisModuleExtSecmanModel.java
similarity index 73%
rename from extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/IsisModuleExtSecmanModel.java
rename to extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/IsisModuleExtSecmanModel.java
index 197836f..c53806f 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/IsisModuleExtSecmanModel.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/IsisModuleExtSecmanModel.java
@@ -16,17 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.secman.model;
+package org.apache.isis.extensions.secman.integration;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.extensions.secman.api.IsisModuleExtSecmanApi;
-import org.apache.isis.extensions.secman.model.facets.TenantedAuthorizationPostProcessor;
-import org.apache.isis.extensions.secman.model.seed.SeedSecurityModuleService;
-import org.apache.isis.extensions.secman.model.spiimpl.ImpersonateMenuAdvisorForSecman;
-import org.apache.isis.extensions.secman.model.spiimpl.TableColumnVisibilityServiceForSecman;
-import org.apache.isis.extensions.secman.model.userreg.UserRegistrationServiceForSecman;
+import org.apache.isis.extensions.secman.integration.facets.TenantedAuthorizationPostProcessor;
+import org.apache.isis.extensions.secman.integration.seed.SeedSecurityModuleService;
+import org.apache.isis.extensions.secman.integration.spiimpl.ImpersonateMenuAdvisorForSecman;
+import org.apache.isis.extensions.secman.integration.spiimpl.TableColumnVisibilityServiceForSecman;
+import org.apache.isis.extensions.secman.integration.userreg.UserRegistrationServiceForSecman;
/**
* @since 2.0 {@index}
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/facets/TenantedAuthorizationFacet.java b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationFacet.java
similarity index 95%
rename from extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/facets/TenantedAuthorizationFacet.java
rename to extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationFacet.java
index 3f02ede..25e8ee4 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/facets/TenantedAuthorizationFacet.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationFacet.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.secman.model.facets;
+package org.apache.isis.extensions.secman.integration.facets;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.interactions.DisablingInteractionAdvisor;
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/facets/TenantedAuthorizationFacetDefault.java b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationFacetDefault.java
similarity index 98%
rename from extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/facets/TenantedAuthorizationFacetDefault.java
rename to extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationFacetDefault.java
index d2772de..1fb17d1 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/facets/TenantedAuthorizationFacetDefault.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationFacetDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.secman.model.facets;
+package org.apache.isis.extensions.secman.integration.facets;
import java.util.List;
import java.util.concurrent.Callable;
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/facets/TenantedAuthorizationPostProcessor.java b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationPostProcessor.java
similarity index 98%
rename from extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/facets/TenantedAuthorizationPostProcessor.java
rename to extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationPostProcessor.java
index 1039ef1..326a1b4 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/facets/TenantedAuthorizationPostProcessor.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationPostProcessor.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.secman.model.facets;
+package org.apache.isis.extensions.secman.integration.facets;
import java.util.stream.Collectors;
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/SeedSecurityModuleService.java b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/SeedSecurityModuleService.java
similarity index 92%
rename from extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/SeedSecurityModuleService.java
rename to extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/SeedSecurityModuleService.java
index 28fce33..34ff0ec 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/SeedSecurityModuleService.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/SeedSecurityModuleService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.secman.model.seed;
+package org.apache.isis.extensions.secman.integration.seed;
import javax.inject.Inject;
import javax.inject.Named;
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.core.metamodel.events.MetamodelEvent;
-import org.apache.isis.extensions.secman.model.seed.scripts.SeedUsersAndRolesFixtureScript;
+import org.apache.isis.extensions.secman.integration.seed.scripts.SeedUsersAndRolesFixtureScript;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import lombok.extern.log4j.Log4j2;
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/SeedUsersAndRolesFixtureScript.java b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/SeedUsersAndRolesFixtureScript.java
similarity index 68%
rename from extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/SeedUsersAndRolesFixtureScript.java
rename to extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/SeedUsersAndRolesFixtureScript.java
index 2ea4fd3..c7adb7a 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/SeedUsersAndRolesFixtureScript.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/SeedUsersAndRolesFixtureScript.java
@@ -16,21 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.secman.model.seed.scripts;
+package org.apache.isis.extensions.secman.integration.seed.scripts;
import javax.inject.Inject;
import org.apache.isis.extensions.secman.api.SecmanConfiguration;
-import org.apache.isis.extensions.secman.model.seed.SeedSecurityModuleService;
-import org.apache.isis.extensions.secman.model.seed.scripts.other.IsisConfigurationRoleAndPermissions;
-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;
-import org.apache.isis.extensions.secman.model.seed.scripts.other.IsisViewerRestfulObjectsSwaggerRoleAndPermissions;
-import org.apache.isis.extensions.secman.model.seed.scripts.secman.GlobalTenancy;
-import org.apache.isis.extensions.secman.model.seed.scripts.secman.IsisExtSecmanAdminRoleAndPermissions;
-import org.apache.isis.extensions.secman.model.seed.scripts.secman.IsisExtSecmanAdminUser;
-import org.apache.isis.extensions.secman.model.seed.scripts.secman.IsisExtSecmanRegularUserRoleAndPermissions;
+import org.apache.isis.extensions.secman.integration.seed.SeedSecurityModuleService;
+import org.apache.isis.extensions.secman.integration.seed.scripts.other.IsisConfigurationRoleAndPermissions;
+import org.apache.isis.extensions.secman.integration.seed.scripts.other.IsisExtH2ConsoleRoleAndPermissions;
+import org.apache.isis.extensions.secman.integration.seed.scripts.other.IsisPersistenceJdoMetaModelRoleAndPermissions;
+import org.apache.isis.extensions.secman.integration.seed.scripts.other.IsisSudoImpersonateRoleAndPermissions;
+import org.apache.isis.extensions.secman.integration.seed.scripts.other.IsisViewerRestfulObjectsSwaggerRoleAndPermissions;
+import org.apache.isis.extensions.secman.integration.seed.scripts.secman.GlobalTenancy;
+import org.apache.isis.extensions.secman.integration.seed.scripts.secman.IsisExtSecmanAdminRoleAndPermissions;
+import org.apache.isis.extensions.secman.integration.seed.scripts.secman.IsisExtSecmanAdminUser;
+import org.apache.isis.extensions.secman.integration.seed.scripts.secman.IsisExtSecmanRegularUserRoleAndPermissions;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
/**
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/other/IsisAppFeatureRoleAndPermissions.java b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/other/IsisAppFeatureRoleAndPermissions.java
similarity index 91%
rename from extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/other/IsisAppFeatureRoleAndPermissions.java
rename to extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/other/IsisAppFeatureRoleAndPermissions.java
index 8c88c22..eced0ba 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/other/IsisAppFeatureRoleAndPermissions.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/other/IsisAppFeatureRoleAndPermissions.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.secman.model.seed.scripts.other;
+package org.apache.isis.extensions.secman.integration.seed.scripts.other;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
import org.apache.isis.applib.services.appfeatui.ApplicationFeatureMenu;
@@ -27,9 +27,6 @@ import org.apache.isis.applib.services.appfeatui.ApplicationTypeAction;
import org.apache.isis.applib.services.appfeatui.ApplicationTypeCollection;
import org.apache.isis.applib.services.appfeatui.ApplicationTypeMember;
import org.apache.isis.applib.services.appfeatui.ApplicationTypeProperty;
-import org.apache.isis.applib.services.confview.ConfigurationMenu;
-import org.apache.isis.applib.services.confview.ConfigurationProperty;
-import org.apache.isis.applib.services.confview.ConfigurationViewmodel;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.extensions.secman.api.permission.dom.ApplicationPermissionMode;
import org.apache.isis.extensions.secman.api.permission.dom.ApplicationPermissionRule;
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/other/IsisConfigurationRoleAndPermissions.java b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/other/IsisConfigurationRoleAndPermissions.java
similarity index 94%
rename from extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/other/IsisConfigurationRoleAndPermissions.java
rename to extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/other/IsisConfigurationRoleAndPermissions.java
index 17e3fdf..303c830 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/other/IsisConfigurationRoleAndPermissions.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/other/IsisConfigurationRoleAndPermissions.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.secman.model.seed.scripts.other;
+package org.apache.isis.extensions.secman.integration.seed.scripts.other;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
import org.apache.isis.applib.services.confview.ConfigurationMenu;
@@ -26,7 +26,6 @@ import org.apache.isis.commons.collections.Can;
import org.apache.isis.extensions.secman.api.permission.dom.ApplicationPermissionMode;
import org.apache.isis.extensions.secman.api.permission.dom.ApplicationPermissionRule;
import org.apache.isis.extensions.secman.api.role.fixtures.AbstractRoleAndPermissionsFixtureScript;
-import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureResult;
/**
* @since 2.0 {@index}
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/other/IsisExtH2ConsoleRoleAndPermissions.java b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/other/IsisExtH2ConsoleRoleAndPermissions.java
similarity index 96%
rename from extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/other/IsisExtH2ConsoleRoleAndPermissions.java
rename to extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/other/IsisExtH2ConsoleRoleAndPermissions.java
index 430b4f5..e9cca8a 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/other/IsisExtH2ConsoleRoleAndPermissions.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/other/IsisExtH2ConsoleRoleAndPermissions.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.secman.model.seed.scripts.other;
+package org.apache.isis.extensions.secman.integration.seed.scripts.other;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
import org.apache.isis.commons.collections.Can;
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/other/IsisPersistenceJdoMetaModelRoleAndPermissions.java b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/other/IsisPersistenceJdoMetaModelRoleAndPermissions.java
similarity index 96%
rename from extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/other/IsisPersistenceJdoMetaModelRoleAndPermissions.java
rename to extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/other/IsisPersistenceJdoMetaModelRoleAndPermissions.java
index ed91c61..be847a2 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/other/IsisPersistenceJdoMetaModelRoleAndPermissions.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/other/IsisPersistenceJdoMetaModelRoleAndPermissions.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.secman.model.seed.scripts.other;
+package org.apache.isis.extensions.secman.integration.seed.scripts.other;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
import org.apache.isis.commons.collections.Can;
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/other/IsisSudoImpersonateRoleAndPermissions.java b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/other/IsisSudoImpersonateRoleAndPermissions.java
similarity index 96%
rename from extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/other/IsisSudoImpersonateRoleAndPermissions.java
rename to extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/other/IsisSudoImpersonateRoleAndPermissions.java
index 327c235..34348f7 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/other/IsisSudoImpersonateRoleAndPermissions.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/other/IsisSudoImpersonateRoleAndPermissions.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.secman.model.seed.scripts.other;
+package org.apache.isis.extensions.secman.integration.seed.scripts.other;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
import org.apache.isis.applib.services.user.ImpersonateMenu;
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/other/IsisViewerRestfulObjectsSwaggerRoleAndPermissions.java b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/other/IsisViewerRestfulObjectsSwaggerRoleAndPermissions.java
similarity index 93%
rename from extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/other/IsisViewerRestfulObjectsSwaggerRoleAndPermissions.java
rename to extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/other/IsisViewerRestfulObjectsSwaggerRoleAndPermissions.java
index bec71dd..21ca0bf 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/other/IsisViewerRestfulObjectsSwaggerRoleAndPermissions.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/other/IsisViewerRestfulObjectsSwaggerRoleAndPermissions.java
@@ -16,10 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.secman.model.seed.scripts.other;
+package org.apache.isis.extensions.secman.integration.seed.scripts.other;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
-import org.apache.isis.applib.services.metamodel.MetaModelServiceMenu;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.extensions.secman.api.permission.dom.ApplicationPermissionMode;
import org.apache.isis.extensions.secman.api.permission.dom.ApplicationPermissionRule;
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/secman/GlobalTenancy.java b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/secman/GlobalTenancy.java
similarity index 94%
rename from extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/secman/GlobalTenancy.java
rename to extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/secman/GlobalTenancy.java
index 8abea59..347d849 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/secman/GlobalTenancy.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/secman/GlobalTenancy.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.secman.model.seed.scripts.secman;
+package org.apache.isis.extensions.secman.integration.seed.scripts.secman;
import org.apache.isis.extensions.secman.api.tenancy.fixtures.AbstractTenancyFixtureScript;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/secman/IsisExtSecmanAdminRoleAndPermissions.java b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/secman/IsisExtSecmanAdminRoleAndPermissions.java
similarity index 95%
rename from extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/secman/IsisExtSecmanAdminRoleAndPermissions.java
rename to extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/secman/IsisExtSecmanAdminRoleAndPermissions.java
index 691e659..496689d 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/secman/IsisExtSecmanAdminRoleAndPermissions.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/secman/IsisExtSecmanAdminRoleAndPermissions.java
@@ -16,14 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.secman.model.seed.scripts.secman;
+package org.apache.isis.extensions.secman.integration.seed.scripts.secman;
import java.util.List;
import java.util.stream.Collectors;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.collections._Arrays;
import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.permission.dom.ApplicationPermissionMode;
import org.apache.isis.extensions.secman.api.permission.dom.ApplicationPermissionRule;
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/secman/IsisExtSecmanAdminUser.java b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/secman/IsisExtSecmanAdminUser.java
similarity index 95%
rename from extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/secman/IsisExtSecmanAdminUser.java
rename to extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/secman/IsisExtSecmanAdminUser.java
index c40ae15..925980e 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/secman/IsisExtSecmanAdminUser.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/secman/IsisExtSecmanAdminUser.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.secman.model.seed.scripts.secman;
+package org.apache.isis.extensions.secman.integration.seed.scripts.secman;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.extensions.secman.api.SecmanConfiguration;
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/secman/IsisExtSecmanRegularUserRoleAndPermissions.java b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/secman/IsisExtSecmanRegularUserRoleAndPermissions.java
similarity index 91%
rename from extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/secman/IsisExtSecmanRegularUserRoleAndPermissions.java
rename to extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/secman/IsisExtSecmanRegularUserRoleAndPermissions.java
index 383fc97..e14aa5c 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/secman/IsisExtSecmanRegularUserRoleAndPermissions.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/seed/scripts/secman/IsisExtSecmanRegularUserRoleAndPermissions.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.secman.model.seed.scripts.secman;
+package org.apache.isis.extensions.secman.integration.seed.scripts.secman;
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
@@ -29,7 +29,7 @@ import org.apache.isis.extensions.secman.api.role.dom.ApplicationRole;
import org.apache.isis.extensions.secman.api.role.fixtures.AbstractRoleAndPermissionsFixtureScript;
import org.apache.isis.extensions.secman.api.user.dom.ApplicationUser;
import org.apache.isis.extensions.secman.api.user.menu.MeService;
-import org.apache.isis.extensions.secman.model.seed.scripts.other.IsisConfigurationRoleAndPermissions;
+import org.apache.isis.extensions.secman.integration.seed.scripts.other.IsisConfigurationRoleAndPermissions;
import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
import lombok.val;
@@ -47,10 +47,10 @@ import lombok.val;
* <p>
* That said, it does <i>not</i> include the ability to impersonate other users
* (for this, grant the
- * {@link org.apache.isis.extensions.secman.model.seed.scripts.other.IsisSudoImpersonateRoleAndPermissions}
+ * {@link org.apache.isis.extensions.secman.integration.seed.scripts.other.IsisSudoImpersonateRoleAndPermissions}
* role), and also does <i>not</i> include the ability to access the
* configuration properties (for this, grant the
- * {@link org.apache.isis.extensions.secman.model.seed.scripts.other.IsisSudoImpersonateRoleAndPermissions}
+ * {@link org.apache.isis.extensions.secman.integration.seed.scripts.other.IsisSudoImpersonateRoleAndPermissions}
* role).
* </p>
*
@@ -59,7 +59,7 @@ import lombok.val;
* the {@link MeService}, and for viewing and maintaining their user details.
* </p>
*
- * @see org.apache.isis.extensions.secman.model.seed.scripts.other.IsisSudoImpersonateRoleAndPermissions
+ * @see org.apache.isis.extensions.secman.integration.seed.scripts.other.IsisSudoImpersonateRoleAndPermissions
* @see IsisConfigurationRoleAndPermissions
*
* @since 2.0 {@index}
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/spiimpl/ImpersonateMenuAdvisorForSecman.java b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/spiimpl/ImpersonateMenuAdvisorForSecman.java
similarity index 97%
rename from extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/spiimpl/ImpersonateMenuAdvisorForSecman.java
rename to extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/spiimpl/ImpersonateMenuAdvisorForSecman.java
index 2628d2f..d1c19eb 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/spiimpl/ImpersonateMenuAdvisorForSecman.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/spiimpl/ImpersonateMenuAdvisorForSecman.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.secman.model.spiimpl;
+package org.apache.isis.extensions.secman.integration.spiimpl;
import java.util.Collections;
import java.util.List;
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/spiimpl/TableColumnVisibilityServiceForSecman.java b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/spiimpl/TableColumnVisibilityServiceForSecman.java
similarity index 96%
rename from extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/spiimpl/TableColumnVisibilityServiceForSecman.java
rename to extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/spiimpl/TableColumnVisibilityServiceForSecman.java
index d5267e5..ad6670e 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/spiimpl/TableColumnVisibilityServiceForSecman.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/spiimpl/TableColumnVisibilityServiceForSecman.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.secman.model.spiimpl;
+package org.apache.isis.extensions.secman.integration.spiimpl;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/userreg/UserRegistrationServiceForSecman.java b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/userreg/UserRegistrationServiceForSecman.java
similarity index 98%
rename from extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/userreg/UserRegistrationServiceForSecman.java
rename to extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/userreg/UserRegistrationServiceForSecman.java
index a2cd8f0..26bcab4 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/model/userreg/UserRegistrationServiceForSecman.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/userreg/UserRegistrationServiceForSecman.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.secman.model.userreg;
+package org.apache.isis.extensions.secman.integration.userreg;
import java.util.Optional;
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/IsisModuleExtSecmanPersistenceJdo.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/IsisModuleExtSecmanPersistenceJdo.java
index 93d77c9..7120d5e 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/IsisModuleExtSecmanPersistenceJdo.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/IsisModuleExtSecmanPersistenceJdo.java
@@ -30,7 +30,7 @@ import org.apache.isis.extensions.secman.jdo.tenancy.dom.ApplicationTenancyRepos
import org.apache.isis.extensions.secman.jdo.user.dom.ApplicationUser;
import org.apache.isis.extensions.secman.jdo.user.dom.ApplicationUserRepository;
import org.apache.isis.extensions.secman.jdo.util.RegexReplacer;
-import org.apache.isis.extensions.secman.model.IsisModuleExtSecmanModel;
+import org.apache.isis.extensions.secman.integration.IsisModuleExtSecmanModel;
/**
* @since 2.0 {@index}
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/IsisModuleExtSecmanPersistenceJpa.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/IsisModuleExtSecmanPersistenceJpa.java
index 79017f6..8108a6e 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/IsisModuleExtSecmanPersistenceJpa.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/IsisModuleExtSecmanPersistenceJpa.java
@@ -31,7 +31,7 @@ import org.apache.isis.extensions.secman.jpa.tenancy.dom.ApplicationTenancyRepos
import org.apache.isis.extensions.secman.jpa.user.dom.ApplicationUser;
import org.apache.isis.extensions.secman.jpa.user.dom.ApplicationUserRepository;
import org.apache.isis.extensions.secman.jpa.util.RegexReplacer;
-import org.apache.isis.extensions.secman.model.IsisModuleExtSecmanModel;
+import org.apache.isis.extensions.secman.integration.IsisModuleExtSecmanModel;
/**
* @since 2.0 {@index}
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
index c8c9ab7..ef19ad1 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
@@ -45,7 +45,7 @@ import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleExtSecmanE
import org.apache.isis.extensions.secman.jdo.IsisModuleExtSecmanPersistenceJdo;
import org.apache.isis.extensions.secman.jdo.role.dom.ApplicationRoleRepository;
import org.apache.isis.extensions.secman.jdo.user.dom.ApplicationUserRepository;
-import org.apache.isis.extensions.secman.model.IsisModuleExtSecmanModel;
+import org.apache.isis.extensions.secman.integration.IsisModuleExtSecmanModel;
import org.apache.isis.extensions.secman.shiro.IsisModuleExtSecmanRealmShiro;
import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
index 9f802a2..0dfa179 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
@@ -41,7 +41,7 @@ import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.extensions.secman.api.SecmanConfiguration;
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.integration.IsisModuleExtSecmanModel;
import org.apache.isis.extensions.secman.shiro.IsisModuleExtSecmanRealmShiro;
import org.apache.isis.security.shiro.webmodule.WebModuleShiro;
import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
index d3927be..139e964 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
@@ -41,15 +41,15 @@ import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.extensions.secman.api.SecmanConfiguration;
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.integration.IsisModuleExtSecmanModel;
import org.apache.isis.extensions.secman.shiro.IsisModuleExtSecmanRealmShiro;
import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
import lombok.val;
@SpringBootTest(
- classes = {
- Configuration_usingJdoAndShiro.class,
+ classes = {
+ Configuration_usingJdoAndShiro.class,
})
@Import({
// Security Manager Extension (secman)
@@ -68,7 +68,7 @@ class ShiroSecmanTest extends AbstractShiroTest {
void beforeEach() {
setSecurityManager(serviceInjector, "classpath:shiro-secman-ldap.ini");
}
-
+
@AfterEach
void afterEach() {
tearDownShiro();
@@ -80,7 +80,7 @@ class ShiroSecmanTest extends AbstractShiroTest {
val secMan = getSecurityManager();
assertNotNull(secMan);
- val subject = SecurityUtils.getSubject();
+ val subject = SecurityUtils.getSubject();
assertNotNull(subject);
assertFalse(subject.isAuthenticated());
@@ -102,7 +102,7 @@ class ShiroSecmanTest extends AbstractShiroTest {
val secMan = SecurityUtils.getSecurityManager();
assertNotNull(secMan);
- val subject = SecurityUtils.getSubject();
+ val subject = SecurityUtils.getSubject();
assertNotNull(subject);
assertFalse(subject.isAuthenticated());
@@ -124,7 +124,7 @@ class ShiroSecmanTest extends AbstractShiroTest {
val secMan = SecurityUtils.getSecurityManager();
assertNotNull(secMan);
- val subject = SecurityUtils.getSubject();
+ val subject = SecurityUtils.getSubject();
assertNotNull(subject);
assertFalse(subject.isAuthenticated());