You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/01/26 19:33:49 UTC
[isis] branch master updated: ISIS-2431: SecMan align namespaces
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 f547bdb ISIS-2431: SecMan align namespaces
f547bdb is described below
commit f547bdbaec3288f6b71e69f0d37852b56cf649ac
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Jan 26 20:33:34 2021 +0100
ISIS-2431: SecMan align namespaces
---
.../jbcrypt/services/PasswordEncryptionServiceUsingJBcrypt.java | 2 +-
.../extensions/secman/jdo/dom/permission/ApplicationPermission.java | 2 +-
.../secman/jdo/dom/permission/ApplicationPermissionRepository.java | 2 +-
.../org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.java | 2 +-
.../isis/extensions/secman/jdo/dom/role/ApplicationRoleRepository.java | 2 +-
.../isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.java | 2 +-
.../extensions/secman/jdo/dom/tenancy/ApplicationTenancyRepository.java | 2 +-
.../org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java | 2 +-
.../isis/extensions/secman/jdo/dom/user/ApplicationUserRepository.java | 2 +-
.../isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java | 2 +-
.../secman/jpa/dom/permission/ApplicationPermissionRepository.java | 2 +-
.../isis/extensions/secman/jpa/dom/role/ApplicationRoleRepository.java | 2 +-
.../extensions/secman/jpa/dom/tenancy/ApplicationTenancyRepository.java | 2 +-
.../isis/extensions/secman/jpa/dom/user/ApplicationUserRepository.java | 2 +-
.../isis/extensions/secman/jpa/seed/SeedSecurityModuleService.java | 2 +-
.../secman/shiro/services/SecurityRealmServiceUsingShiro.java | 2 +-
.../rendering/service/swagger/internal/TaggerDefault.java | 2 +-
17 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/isis/extensions/secman/encryption/jbcrypt/services/PasswordEncryptionServiceUsingJBcrypt.java b/extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/isis/extensions/secman/encryption/jbcrypt/services/PasswordEncryptionServiceUsingJBcrypt.java
index d99a18a..2b3b55f 100644
--- a/extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/isis/extensions/secman/encryption/jbcrypt/services/PasswordEncryptionServiceUsingJBcrypt.java
+++ b/extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/isis/extensions/secman/encryption/jbcrypt/services/PasswordEncryptionServiceUsingJBcrypt.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.extensions.secman.api.encryption.PasswordEncryptionService;
@Service
-@Named("isisExtSecman.PasswordEncryptionServiceUsingJBcrypt")
+@Named("secman.PasswordEncryptionServiceUsingJBcrypt")
@Order(OrderPrecedence.MIDPOINT)
@Qualifier("JBCrypt")
public class PasswordEncryptionServiceUsingJBcrypt implements PasswordEncryptionService {
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.java
index 0c690da..31ef44a 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.java
@@ -58,7 +58,7 @@ import lombok.experimental.UtilityClass;
@javax.jdo.annotations.PersistenceCapable(
identityType = IdentityType.DATASTORE,
- schema = "isisExtensionsSecman",
+ schema = "secman",
table = "ApplicationPermission")
@javax.jdo.annotations.Inheritance(
strategy = InheritanceStrategy.NEW_TABLE)
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionRepository.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionRepository.java
index 4dc51d6..6992147 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionRepository.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionRepository.java
@@ -56,7 +56,7 @@ import lombok.NonNull;
import lombok.val;
@Repository
-@Named("isisExtSecman.applicationPermissionRepository")
+@Named("secman.applicationPermissionRepository")
public class ApplicationPermissionRepository
implements org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRepository<ApplicationPermission> {
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.java
index 011d142..ad06953 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.java
@@ -55,7 +55,7 @@ import lombok.Setter;
@javax.jdo.annotations.PersistenceCapable(
identityType = IdentityType.DATASTORE,
- schema = "isisExtensionsSecman",
+ schema = "secman",
table = "ApplicationRole")
@javax.jdo.annotations.Inheritance(
strategy = InheritanceStrategy.NEW_TABLE)
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRoleRepository.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRoleRepository.java
index 4cbbcd0..ead61f5 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRoleRepository.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRoleRepository.java
@@ -41,7 +41,7 @@ import org.apache.isis.extensions.secman.model.dom.permission.ApplicationPermiss
import lombok.val;
@Repository
-@Named("isisExtSecman.applicationRoleRepository")
+@Named("secman.applicationRoleRepository")
public class ApplicationRoleRepository
implements org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository<ApplicationRole> {
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.java
index f0900b5..635b317 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.java
@@ -47,7 +47,7 @@ import lombok.Setter;
@javax.jdo.annotations.PersistenceCapable(
identityType = IdentityType.APPLICATION,
- schema = "isisExtensionsSecman",
+ schema = "secman",
table = "ApplicationTenancy")
@javax.jdo.annotations.Inheritance(
strategy = InheritanceStrategy.NEW_TABLE)
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancyRepository.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancyRepository.java
index c768843..82f06c1 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancyRepository.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancyRepository.java
@@ -39,7 +39,7 @@ import lombok.NonNull;
import lombok.val;
@Repository
-@Named("isisExtSecman.applicationTenancyRepository")
+@Named("secman.applicationTenancyRepository")
public class ApplicationTenancyRepository
implements org.apache.isis.extensions.secman.api.tenancy.ApplicationTenancyRepository<ApplicationTenancy> {
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java
index 42f12ec..79ef3ff 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java
@@ -64,7 +64,7 @@ import lombok.val;
@javax.jdo.annotations.PersistenceCapable(
identityType = IdentityType.DATASTORE,
- schema = "isisExtensionsSecman",
+ schema = "secman",
table = "ApplicationUser")
@javax.jdo.annotations.Inheritance(
strategy = InheritanceStrategy.NEW_TABLE)
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserRepository.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserRepository.java
index c44acf3..a1a4740 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserRepository.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserRepository.java
@@ -52,7 +52,7 @@ import lombok.NonNull;
import lombok.val;
@Repository
-@Named("isisExtSecman.applicationUserRepository")
+@Named("secman.applicationUserRepository")
public class ApplicationUserRepository
implements org.apache.isis.extensions.secman.api.user.ApplicationUserRepository<ApplicationUser> {
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
index e1c93b3..271852c 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
@@ -33,7 +33,7 @@ import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import lombok.extern.log4j.Log4j2;
@Service
-@Named("isisExtSecman.SeedSecurityModuleService")
+@Named("secman.SeedSecurityModuleService")
@Order(OrderPrecedence.MIDPOINT)
@Qualifier("Default")
@Log4j2
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermissionRepository.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermissionRepository.java
index acf8903..173233c 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermissionRepository.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermissionRepository.java
@@ -59,7 +59,7 @@ import lombok.NonNull;
import lombok.val;
@Service
-@Named("isisExtSecman.applicationPermissionRepository")
+@Named("secman.applicationPermissionRepository")
public class ApplicationPermissionRepository
implements org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRepository<ApplicationPermission> {
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/role/ApplicationRoleRepository.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/role/ApplicationRoleRepository.java
index 5643248..1cb73f4 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/role/ApplicationRoleRepository.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/role/ApplicationRoleRepository.java
@@ -42,7 +42,7 @@ import org.apache.isis.extensions.secman.model.dom.permission.ApplicationPermiss
import lombok.val;
@Service
-@Named("isisExtSecman.applicationRoleRepository")
+@Named("secman.applicationRoleRepository")
public class ApplicationRoleRepository
implements org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository<ApplicationRole> {
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/tenancy/ApplicationTenancyRepository.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/tenancy/ApplicationTenancyRepository.java
index 6d6faa0..152b6ec 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/tenancy/ApplicationTenancyRepository.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/tenancy/ApplicationTenancyRepository.java
@@ -40,7 +40,7 @@ import lombok.NonNull;
import lombok.val;
@Service
-@Named("isisExtSecman.applicationTenancyRepository")
+@Named("secman.applicationTenancyRepository")
public class ApplicationTenancyRepository
implements org.apache.isis.extensions.secman.api.tenancy.ApplicationTenancyRepository<ApplicationTenancy> {
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUserRepository.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUserRepository.java
index d653ac8..9b6f59c 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUserRepository.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUserRepository.java
@@ -53,7 +53,7 @@ import lombok.NonNull;
import lombok.val;
@Service
-@Named("isisExtSecman.applicationUserRepository")
+@Named("secman.applicationUserRepository")
public class ApplicationUserRepository
implements org.apache.isis.extensions.secman.api.user.ApplicationUserRepository<ApplicationUser> {
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/SeedSecurityModuleService.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/SeedSecurityModuleService.java
index 66325e0..b839c38 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/SeedSecurityModuleService.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/SeedSecurityModuleService.java
@@ -33,7 +33,7 @@ import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import lombok.extern.log4j.Log4j2;
@Service
-@Named("isisExtSecman.SeedSecurityModuleService")
+@Named("secman.SeedSecurityModuleService")
@Order(OrderPrecedence.MIDPOINT)
@Qualifier("Default")
@Log4j2
diff --git a/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/services/SecurityRealmServiceUsingShiro.java b/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/services/SecurityRealmServiceUsingShiro.java
index fb28b3d..05eae5d 100644
--- a/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/services/SecurityRealmServiceUsingShiro.java
+++ b/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/services/SecurityRealmServiceUsingShiro.java
@@ -34,7 +34,7 @@ import org.apache.isis.extensions.secman.shiro.util.ShiroUtils;
import lombok.val;
@Service
-@Named("isisExtSecman.SecurityRealmServiceUsingShiro")
+@Named("secman.SecurityRealmServiceUsingShiro")
@Order(OrderPrecedence.MIDPOINT)
@Qualifier("Shiro")
public class SecurityRealmServiceUsingShiro implements SecurityRealmService {
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
index 262e9a5..aadf083 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
@@ -65,7 +65,7 @@ public class TaggerDefault implements Tagger {
}
matcher = tagPatternForTwoParts.matcher(objType);
if (matcher.matches()) {
- if (objType.startsWith("isisApplib")) {
+ if (objType.startsWith("isis.applib.")) {
return ". apache isis applib";
}