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 2018/12/15 13:52:53 UTC

[isis] branch v2 updated: ISIS-2040: make module 'security' no longer depend on 'runtime' by ...

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/v2 by this push:
     new 203c8fd  ISIS-2040: make module 'security' no longer depend on 'runtime' by ...
203c8fd is described below

commit 203c8fdfc700558fc60a7ac4dacc251c6f27a3be
Author: andi-huber <ah...@apache.org>
AuthorDate: Sat Dec 15 14:52:42 2018 +0100

    ISIS-2040: make module 'security' no longer depend on 'runtime' by ...
    
    moving security relevant classes from 'runtime' to 'security'
    
    Task-Url: https://issues.apache.org/jira/browse/ISIS-2040
---
 core/plugins/security-shiro/pom.xml                                | 2 +-
 core/security/pom.xml                                              | 4 ++--
 ...thenticationManagerStandardInstallerAbstractForDfltRuntime.java | 7 ++++---
 .../authentication/singleuser/AuthenticationRequestSingleUser.java | 0
 .../core/runtime/authentication/singleuser/SingleUserSession.java  | 0
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/core/plugins/security-shiro/pom.xml b/core/plugins/security-shiro/pom.xml
index 793ea92..1696c01 100644
--- a/core/plugins/security-shiro/pom.xml
+++ b/core/plugins/security-shiro/pom.xml
@@ -81,7 +81,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-runtime</artifactId>
+            <artifactId>isis-core-security</artifactId>
         </dependency>
 	
         <dependency>
diff --git a/core/security/pom.xml b/core/security/pom.xml
index 80ee7ff..e874cfc 100644
--- a/core/security/pom.xml
+++ b/core/security/pom.xml
@@ -37,11 +37,11 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-runtime</artifactId>
+            <artifactId>isis-core-metamodel</artifactId>
         </dependency>
     	<dependency>
             <groupId>org.apache.isis.core</groupId>
-            <artifactId>isis-core-runtime</artifactId>
+            <artifactId>isis-core-metamodel</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>    
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardInstallerAbstractForDfltRuntime.java b/core/security/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardInstallerAbstractForDfltRuntime.java
similarity index 93%
rename from core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardInstallerAbstractForDfltRuntime.java
rename to core/security/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardInstallerAbstractForDfltRuntime.java
index 1a14c12..bc835b2 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardInstallerAbstractForDfltRuntime.java
+++ b/core/security/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardInstallerAbstractForDfltRuntime.java
@@ -24,7 +24,8 @@ import org.apache.isis.core.runtime.authentication.fixture.LogonFixtureAuthentic
 import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandard;
 import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandardInstallerAbstract;
 
-public abstract class AuthenticationManagerStandardInstallerAbstractForDfltRuntime extends AuthenticationManagerStandardInstallerAbstract {
+public abstract class AuthenticationManagerStandardInstallerAbstractForDfltRuntime 
+extends AuthenticationManagerStandardInstallerAbstract {
 
 
     public AuthenticationManagerStandardInstallerAbstractForDfltRuntime(final String name) {
@@ -32,8 +33,8 @@ public abstract class AuthenticationManagerStandardInstallerAbstractForDfltRunti
     }
 
     /**
-     * Returns an instance of {@link AuthenticationManagerStandard} that has no need to log in when running in
-     * prototyping mode.
+     * Returns an instance of {@link AuthenticationManagerStandard} that has no need to log in when 
+     * running in prototyping mode.
      *
      * <p>
      * Specifically:
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/singleuser/AuthenticationRequestSingleUser.java b/core/security/src/main/java/org/apache/isis/core/runtime/authentication/singleuser/AuthenticationRequestSingleUser.java
similarity index 100%
rename from core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/singleuser/AuthenticationRequestSingleUser.java
rename to core/security/src/main/java/org/apache/isis/core/runtime/authentication/singleuser/AuthenticationRequestSingleUser.java
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/singleuser/SingleUserSession.java b/core/security/src/main/java/org/apache/isis/core/runtime/authentication/singleuser/SingleUserSession.java
similarity index 100%
rename from core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/singleuser/SingleUserSession.java
rename to core/security/src/main/java/org/apache/isis/core/runtime/authentication/singleuser/SingleUserSession.java