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 2019/09/18 06:32:29 UTC
[isis] 09/13: ISIS-2062: moves plugins/security-shiro to
core/security/plugins/shiro
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2-antora
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 792eacab05fa4ba20b57edadef99ef34c5440ab8
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 18 08:23:05 2019 +0200
ISIS-2062: moves plugins/security-shiro to core/security/plugins/shiro
so can move docs closer.
---
core/pom.xml | 2 +-
core/{plugins/security-shiro => security/plugins/shiro}/NOTICE | 0
core/{plugins/security-shiro => security/plugins/shiro}/pom.xml | 0
.../plugins/shiro}/src/main/appended-resources/supplemental-models.xml | 0
.../main/java/org/apache/isis/security/shiro/IsisBootSecurityShiro.java | 0
.../java/org/apache/isis/security/shiro/IsisLdapContextFactory.java | 0
.../src/main/java/org/apache/isis/security/shiro/IsisLdapRealm.java | 0
.../main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java | 0
.../src/main/java/org/apache/isis/security/shiro/WebModuleShiro.java | 0
.../apache/isis/security/shiro/authentication/ShiroAuthenticator.java | 0
.../org/apache/isis/security/shiro/authorization/IsisPermission.java | 0
.../isis/security/shiro/authorization/IsisPermissionResolver.java | 0
.../org/apache/isis/security/shiro/authorization/ShiroAuthorizor.java | 0
.../isis/security/shiro/permrolemapper/PermissionToRoleMapper.java | 0
.../security/shiro/permrolemapper/PermissionToRoleMapperFromIni.java | 0
.../security/shiro/permrolemapper/PermissionToRoleMapperFromString.java | 0
.../main/java/org/apache/isis/security/shiro/permrolemapper/Util.java | 0
.../org/apache/isis/security/shiro/IsisPermissionTest_setParts.java | 0
.../org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java | 0
.../security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java | 0
.../shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java | 0
.../isis/security/shiro/authorization/IsisPermissionTest_equals.java | 0
.../shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java | 0
.../shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java | 0
.../org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java | 0
.../test/resources/org/apache/isis/security/shiro/permrolemapper/my.ini | 0
.../plugins/shiro}/src/test/resources/shiro.ini | 0
27 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/pom.xml b/core/pom.xml
index 6efcd02..80cd6f2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -2482,7 +2482,7 @@
<module>plugins/jaxrs-resteasy-4</module>
<module>plugins/jdo/common</module>
<module>plugins/jdo/datanucleus-5</module>
- <module>plugins/security-shiro</module>
+ <module>security/plugins/shiro</module>
<!-- to break cyclic dependencies some tests needed to be moved to their
own modules -->
diff --git a/core/plugins/security-shiro/NOTICE b/core/security/plugins/shiro/NOTICE
similarity index 100%
rename from core/plugins/security-shiro/NOTICE
rename to core/security/plugins/shiro/NOTICE
diff --git a/core/plugins/security-shiro/pom.xml b/core/security/plugins/shiro/pom.xml
similarity index 100%
rename from core/plugins/security-shiro/pom.xml
rename to core/security/plugins/shiro/pom.xml
diff --git a/core/plugins/security-shiro/src/main/appended-resources/supplemental-models.xml b/core/security/plugins/shiro/src/main/appended-resources/supplemental-models.xml
similarity index 100%
rename from core/plugins/security-shiro/src/main/appended-resources/supplemental-models.xml
rename to core/security/plugins/shiro/src/main/appended-resources/supplemental-models.xml
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/IsisBootSecurityShiro.java b/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/IsisBootSecurityShiro.java
similarity index 100%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/IsisBootSecurityShiro.java
rename to core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/IsisBootSecurityShiro.java
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapContextFactory.java b/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapContextFactory.java
similarity index 100%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapContextFactory.java
rename to core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapContextFactory.java
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapRealm.java b/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapRealm.java
similarity index 100%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapRealm.java
rename to core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapRealm.java
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java b/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java
similarity index 100%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java
rename to core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/WebModuleShiro.java b/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/WebModuleShiro.java
similarity index 100%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/WebModuleShiro.java
rename to core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/WebModuleShiro.java
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticator.java b/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticator.java
similarity index 100%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticator.java
rename to core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticator.java
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermission.java b/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermission.java
similarity index 100%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermission.java
rename to core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermission.java
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermissionResolver.java b/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermissionResolver.java
similarity index 100%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermissionResolver.java
rename to core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermissionResolver.java
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizor.java b/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizor.java
similarity index 100%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizor.java
rename to core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizor.java
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapper.java b/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapper.java
similarity index 100%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapper.java
rename to core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapper.java
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIni.java b/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIni.java
similarity index 100%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIni.java
rename to core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIni.java
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromString.java b/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromString.java
similarity index 100%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromString.java
rename to core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromString.java
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/Util.java b/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/Util.java
similarity index 100%
rename from core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/Util.java
rename to core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/Util.java
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java b/core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java
similarity index 100%
rename from core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java
rename to core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java b/core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java
similarity index 100%
rename from core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java
rename to core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java b/core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
similarity index 100%
rename from core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
rename to core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java b/core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
similarity index 100%
rename from core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
rename to core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/authorization/IsisPermissionTest_equals.java b/core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/authorization/IsisPermissionTest_equals.java
similarity index 100%
rename from core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/authorization/IsisPermissionTest_equals.java
rename to core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/authorization/IsisPermissionTest_equals.java
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java b/core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java
similarity index 100%
rename from core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java
rename to core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java b/core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java
similarity index 100%
rename from core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java
rename to core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java b/core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java
similarity index 100%
rename from core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java
rename to core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java
diff --git a/core/plugins/security-shiro/src/test/resources/org/apache/isis/security/shiro/permrolemapper/my.ini b/core/security/plugins/shiro/src/test/resources/org/apache/isis/security/shiro/permrolemapper/my.ini
similarity index 100%
rename from core/plugins/security-shiro/src/test/resources/org/apache/isis/security/shiro/permrolemapper/my.ini
rename to core/security/plugins/shiro/src/test/resources/org/apache/isis/security/shiro/permrolemapper/my.ini
diff --git a/core/plugins/security-shiro/src/test/resources/shiro.ini b/core/security/plugins/shiro/src/test/resources/shiro.ini
similarity index 100%
rename from core/plugins/security-shiro/src/test/resources/shiro.ini
rename to core/security/plugins/shiro/src/test/resources/shiro.ini