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 2020/01/10 11:17:54 UTC
[isis] 05/21: ISIS-2259: adds in parent module for shiro-realm-ldap
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit e5214ca7af429c4d5ada9e2de9eabdc737dfcaaf
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 06:43:54 2020 +0000
ISIS-2259: adds in parent module for shiro-realm-ldap
---
antora/components/extensions/{ => adoc}/antora.yml | 0
.../extensions/{ => adoc}/modules/ROOT/nav.adoc | 0
.../{ => adoc}/modules/ROOT/pages/about.adoc | 0
.../modules/ROOT/partials/component-nav.adoc | 0
.../modules/ROOT/partials/module-nav.adoc | 0
examples/smoketests/pom.xml | 2 +-
extensions/pom.xml | 3 ++-
extensions/security/shiro-realm-ldap/impl/pom.xml | 15 ++++--------
.../realm/{ => impl}/IsisLdapContextFactory.java | 2 +-
.../realm/{ => impl}/IsisLdapRealm.java | 2 +-
.../impl/IsisModuleExtShiroRealmLdapImpl.java} | 4 ++--
.../security/shiro-realm-ldap/{impl => }/pom.xml | 28 +++++-----------------
12 files changed, 18 insertions(+), 38 deletions(-)
diff --git a/antora/components/extensions/antora.yml b/antora/components/extensions/adoc/antora.yml
similarity index 100%
rename from antora/components/extensions/antora.yml
rename to antora/components/extensions/adoc/antora.yml
diff --git a/antora/components/extensions/modules/ROOT/nav.adoc b/antora/components/extensions/adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/extensions/modules/ROOT/nav.adoc
rename to antora/components/extensions/adoc/modules/ROOT/nav.adoc
diff --git a/antora/components/extensions/modules/ROOT/pages/about.adoc b/antora/components/extensions/adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/extensions/modules/ROOT/pages/about.adoc
rename to antora/components/extensions/adoc/modules/ROOT/pages/about.adoc
diff --git a/antora/components/extensions/modules/ROOT/partials/component-nav.adoc b/antora/components/extensions/adoc/modules/ROOT/partials/component-nav.adoc
similarity index 100%
rename from antora/components/extensions/modules/ROOT/partials/component-nav.adoc
rename to antora/components/extensions/adoc/modules/ROOT/partials/component-nav.adoc
diff --git a/antora/components/extensions/modules/ROOT/partials/module-nav.adoc b/antora/components/extensions/adoc/modules/ROOT/partials/module-nav.adoc
similarity index 100%
rename from antora/components/extensions/modules/ROOT/partials/module-nav.adoc
rename to antora/components/extensions/adoc/modules/ROOT/partials/module-nav.adoc
diff --git a/examples/smoketests/pom.xml b/examples/smoketests/pom.xml
index 7abef0ab..4b71911 100644
--- a/examples/smoketests/pom.xml
+++ b/examples/smoketests/pom.xml
@@ -100,7 +100,7 @@
</dependency>
<dependency>
<groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-shiro-realm-ldap</artifactId>
+ <artifactId>isis-extensions-shiro-realm-ldap-impl</artifactId>
</dependency>
<!-- TEST DEPENDENCIES -->
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 942df6c..d263c93 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -116,7 +116,7 @@
</dependency>
<dependency>
<groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-shiro-realm-ldap</artifactId>
+ <artifactId>isis-extensions-shiro-realm-ldap-impl</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -139,6 +139,7 @@
<modules>
<module>security/secman</module>
+ <module>security/shiro-realm-ldap</module>
<module>security/shiro-realm-ldap/impl</module>
<module>vro/cors/impl</module>
diff --git a/extensions/security/shiro-realm-ldap/impl/pom.xml b/extensions/security/shiro-realm-ldap/impl/pom.xml
index 0943989..bd1c1fa 100644
--- a/extensions/security/shiro-realm-ldap/impl/pom.xml
+++ b/extensions/security/shiro-realm-ldap/impl/pom.xml
@@ -22,21 +22,16 @@
<parent>
<groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions</artifactId>
+ <artifactId>isis-extensions-shiro-realm-ldap</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
</parent>
- <artifactId>isis-extensions-shiro-realm-ldap</artifactId>
-
- <name>Apache Isis Ext - Shiro LDAP Realm</name>
- <description>
- Implementation of Shiro Realm using LDAP.
- </description>
+ <artifactId>isis-extensions-shiro-realm-ldap-impl</artifactId>
+ <name>Apache Isis Ext - Security - Shiro LDAP Realm (impl)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.extensions.shirorealmldap</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/shirorealmldap</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.extensions.shirorealmldap.impl</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/extensions/shirorealmldap/impl</git-plugin.propertiesDir>
</properties>
diff --git a/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/IsisLdapContextFactory.java b/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisLdapContextFactory.java
similarity index 97%
rename from extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/IsisLdapContextFactory.java
rename to extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisLdapContextFactory.java
index 83d8f9c..226cc52 100644
--- a/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/IsisLdapContextFactory.java
+++ b/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisLdapContextFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.shirorealmldap.realm;
+package org.apache.isis.extensions.shirorealmldap.realm.impl;
import java.util.Hashtable;
diff --git a/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/IsisLdapRealm.java b/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisLdapRealm.java
similarity index 99%
rename from extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/IsisLdapRealm.java
rename to extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisLdapRealm.java
index 4fe5a17..251cf5e 100644
--- a/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/IsisLdapRealm.java
+++ b/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisLdapRealm.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.shirorealmldap.realm;
+package org.apache.isis.extensions.shirorealmldap.realm.impl;
import java.util.Collection;
import java.util.Collections;
diff --git a/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/IsisModuleExtShiroRealmLdap.java b/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisModuleExtShiroRealmLdapImpl.java
similarity index 90%
rename from extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/IsisModuleExtShiroRealmLdap.java
rename to extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisModuleExtShiroRealmLdapImpl.java
index 3d0ea06..6537f27 100644
--- a/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/IsisModuleExtShiroRealmLdap.java
+++ b/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisModuleExtShiroRealmLdapImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions;
+package org.apache.isis.extensions.shirorealmldap.realm.impl;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@@ -30,6 +30,6 @@ import org.apache.isis.security.shiro.IsisModuleSecurityShiro;
IsisModuleSecurityShiro.class
})
-public class IsisModuleExtShiroRealmLdap {
+public class IsisModuleExtShiroRealmLdapImpl {
}
diff --git a/extensions/security/shiro-realm-ldap/impl/pom.xml b/extensions/security/shiro-realm-ldap/pom.xml
similarity index 65%
copy from extensions/security/shiro-realm-ldap/impl/pom.xml
copy to extensions/security/shiro-realm-ldap/pom.xml
index 0943989..b251ed9 100644
--- a/extensions/security/shiro-realm-ldap/impl/pom.xml
+++ b/extensions/security/shiro-realm-ldap/pom.xml
@@ -24,35 +24,19 @@
<groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>isis-extensions-shiro-realm-ldap</artifactId>
- <name>Apache Isis Ext - Shiro LDAP Realm</name>
+ <name>Apache Isis Ext - Security - Shiro LDAP Realm (parent)</name>
<description>
Implementation of Shiro Realm using LDAP.
</description>
+ <packaging>pom</packaging>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.extensions.shirorealmldap</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/shirorealmldap</git-plugin.propertiesDir>
- </properties>
-
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-security-shiro</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
+ <modules>
+ <module>impl</module>
+ </modules>
</project>