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/12/04 12:12:41 UTC

[isis] 03/09: ISIS-2205: converts IsisXxxModule into Spring @Configurations

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

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

commit cd26af96bae79f6bcb5906c23700c6efadf863fe
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 09:14:16 2019 +0000

    ISIS-2205: converts IsisXxxModule into Spring @Configurations
    
    same as the IsisBootXxx classes
---
 .../isis-configurations-and-modules.pptx            | Bin 48673 -> 47861 bytes
 .../org/apache/isis/applib/IsisApplibModule.java    |   7 ++++---
 .../apache/isis/metamodel/IsisMetamodelModule.java  |  18 ++++++++++++++----
 .../runtime/services/IsisRuntimeServicesModule.java |  14 +++++++++++++-
 .../org/apache/isis/runtime/spring/IsisBoot.java    |   9 +--------
 core/runtime/pom.xml                                |   1 -
 .../org/apache/isis/runtime/IsisRuntimeModule.java  |  12 +++++++++++-
 7 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx b/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx
index 99f1af7..b448bcd 100644
Binary files a/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx and b/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx differ
diff --git a/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java b/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
index a4a7f85..45533c7 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
@@ -18,9 +18,11 @@
  */
 package org.apache.isis.applib;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
 
-@XmlRootElement(name = "module")
+@Configuration
+@ComponentScan
 public class IsisApplibModule {
 
     // -- UI EVENT CLASSES
@@ -48,5 +50,4 @@ public class IsisApplibModule {
     extends org.apache.isis.applib.events.domain.PropertyDomainEvent<S,T> {}
 
 
-
 }
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisMetamodelModule.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisMetamodelModule.java
index 3be0781..6810078 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisMetamodelModule.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisMetamodelModule.java
@@ -21,8 +21,18 @@ package org.apache.isis.metamodel;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class IsisMetamodelModule {
-  
-    
+import org.apache.isis.applib.IsisApplibModule;
+import org.apache.isis.config.IsisConfigModule;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@Configuration
+@Import({
+        IsisApplibModule.class,
+        IsisConfigModule.class,
+})
+@ComponentScan
+public class IsisMetamodelModule {
+
 }
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/IsisRuntimeServicesModule.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/IsisRuntimeServicesModule.java
index e648a5e..0c258a3 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/IsisRuntimeServicesModule.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/IsisRuntimeServicesModule.java
@@ -18,6 +18,18 @@
  */
 package org.apache.isis.runtime.services;
 
-public final class IsisRuntimeServicesModule {
+import org.apache.isis.config.IsisConfigModule;
+import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
+import org.apache.isis.runtime.IsisRuntimeModule;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@Configuration
+@Import({
+        IsisRuntimeModule.class,
+})
+@ComponentScan
+public class IsisRuntimeServicesModule {
 
 }
diff --git a/core/runtime-spring/src/main/java/org/apache/isis/runtime/spring/IsisBoot.java b/core/runtime-spring/src/main/java/org/apache/isis/runtime/spring/IsisBoot.java
index 631ab6f..bebaa40 100644
--- a/core/runtime-spring/src/main/java/org/apache/isis/runtime/spring/IsisBoot.java
+++ b/core/runtime-spring/src/main/java/org/apache/isis/runtime/spring/IsisBoot.java
@@ -39,15 +39,8 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 @Configuration
 @Import({
     IsisBeanFactoryPostProcessorForSpring.class,
-    IsisConfigModule.class,
+    IsisRuntimeServicesModule.class,
 })
-@ComponentScan(
-        basePackageClasses= {
-                IsisApplibModule.class,
-                IsisMetamodelModule.class,
-                IsisRuntimeModule.class,
-                IsisRuntimeServicesModule.class
-                })
 public class IsisBoot implements ApplicationContextAware {
 
     @Override
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 6b52122..8731c7e 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -75,7 +75,6 @@
             <scope>test</scope>
         </dependency>
 
-        
         <dependency>
             <groupId>org.apache.isis.core</groupId>
             <artifactId>isis-metamodel</artifactId>
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/IsisRuntimeModule.java b/core/runtime/src/main/java/org/apache/isis/runtime/IsisRuntimeModule.java
index 1dfc124..ed7afd0 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/IsisRuntimeModule.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/IsisRuntimeModule.java
@@ -18,6 +18,16 @@
  */
 package org.apache.isis.runtime;
 
-public final class IsisRuntimeModule {
+import org.apache.isis.metamodel.IsisMetamodelModule;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@Configuration
+@Import({
+        IsisMetamodelModule.class,
+})
+@ComponentScan
+public class IsisRuntimeModule {
 
 }