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:18:07 UTC
[isis] 18/21: ISIS-2259: reorg spring subdomains module
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 7ff9bb90e9c6170831b9e340e20259a7471e418f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 10:16:32 2020 +0000
ISIS-2259: reorg spring subdomains module
---
antora/playbooks/site-subdomains.yml | 2 +-
antora/playbooks/site.yml | 2 +-
subdomains/pdfbox/pom.xml | 2 ++
subdomains/pom.xml | 5 ++---
subdomains/spring/{impl => applib}/pom.xml | 15 +++++++++------
.../spring/applib/IsisModuleSubSpringApplib.java} | 6 +++---
.../subdomains/spring/applib}/service/BeanDescriptor.java | 2 +-
.../subdomains/spring/applib}/service/ContextBeans.java | 2 +-
.../spring/applib}/service/SpringBeansService.java | 2 +-
subdomains/{pdfbox => spring}/pom.xml | 9 ++++++---
subdomains/spring/{impl => }/src/main/doc/antora.yml | 0
.../{impl => }/src/main/doc/modules/spring/nav.adoc | 0
.../src/main/doc/modules/spring/pages/about.adoc | 0
.../src/main/doc/modules/spring/partials/module-nav.adoc | 0
testing/fixtures/pom.xml | 2 +-
.../isis/extensions/fixtures/IsisModuleExtFixtures.java | 4 ++--
.../fixtures/modules/ModuleWithFixturesService.java | 6 +++---
testing/pom.xml | 2 +-
18 files changed, 34 insertions(+), 27 deletions(-)
diff --git a/antora/playbooks/site-subdomains.yml b/antora/playbooks/site-subdomains.yml
index a283de3..f02c176 100644
--- a/antora/playbooks/site-subdomains.yml
+++ b/antora/playbooks/site-subdomains.yml
@@ -35,7 +35,7 @@ content:
start_path: subdomains/pdfbox/src/main/doc # subdomains
branches: HEAD
- url: .
- start_path: subdomains/spring/impl/src/main/doc # subdomains
+ start_path: subdomains/spring/src/main/doc # subdomains
branches: HEAD
- url: .
start_path: subdomains/xdocreport/impl/src/main/doc # subdomains
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 6d5d845..2eab173 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -209,7 +209,7 @@ content:
start_path: subdomains/pdfbox/src/main/doc # subdomains
branches: HEAD
- url: .
- start_path: subdomains/spring/impl/src/main/doc # subdomains
+ start_path: subdomains/spring/src/main/doc # subdomains
branches: HEAD
- url: .
start_path: subdomains/xdocreport/impl/src/main/doc # subdomains
diff --git a/subdomains/pdfbox/pom.xml b/subdomains/pdfbox/pom.xml
index abc97e4..fe098b3 100644
--- a/subdomains/pdfbox/pom.xml
+++ b/subdomains/pdfbox/pom.xml
@@ -24,6 +24,8 @@
<name>Apache Isis Sub - PDF Box (parent)</name>
<description>Integrates PDF Box Library</description>
+ <packaging>pom</packaging>
+
<modules>
<module>applib</module>
</modules>
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index aadd918..6ce8e1a 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -115,7 +115,7 @@
<dependency>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-spring</artifactId>
+ <artifactId>isis-subdomains-spring-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -149,8 +149,7 @@
<module>freemarker</module>
<module>ognl</module>
<module>pdfbox</module>
-
- <module>spring/impl</module>
+ <module>spring</module>
<module>xdocreport/impl</module>
<module>zip/impl</module>
diff --git a/subdomains/spring/impl/pom.xml b/subdomains/spring/applib/pom.xml
similarity index 78%
rename from subdomains/spring/impl/pom.xml
rename to subdomains/spring/applib/pom.xml
index 76f3984..0277c01 100644
--- a/subdomains/spring/impl/pom.xml
+++ b/subdomains/spring/applib/pom.xml
@@ -16,24 +16,27 @@
<parent>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains</artifactId>
+ <artifactId>isis-subdomains-spring</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-subdomains-spring</artifactId>
+ <artifactId>isis-subdomains-spring-applib</artifactId>
<name>Apache Isis Sub - Spring (applib)</name>
- <description>Utility services for interacting with the Spring application context (that hosts the Apache Isis application itself)</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains.spring</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains/spring</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.subdomains.spring.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/subdomains/spring.applib</git-plugin.propertiesDir>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-applib</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-runtime</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/IsisModuleExtSpring.java b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/IsisModuleSubSpringApplib.java
similarity index 85%
rename from subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/IsisModuleExtSpring.java
rename to subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/IsisModuleSubSpringApplib.java
index 38eca4d..3768961 100644
--- a/subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/IsisModuleExtSpring.java
+++ b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/IsisModuleSubSpringApplib.java
@@ -16,17 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.spring;
+package org.apache.isis.subdomains.spring.applib;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.spring.service.SpringBeansService;
+import org.apache.isis.subdomains.spring.applib.service.SpringBeansService;
@Configuration
@Import({
SpringBeansService.class
})
-public class IsisModuleExtSpring {
+public class IsisModuleSubSpringApplib {
}
diff --git a/subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/service/BeanDescriptor.java b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/BeanDescriptor.java
similarity index 97%
rename from subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/service/BeanDescriptor.java
rename to subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/BeanDescriptor.java
index 7e41829..f25c123 100644
--- a/subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/service/BeanDescriptor.java
+++ b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/BeanDescriptor.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.spring.service;
+package org.apache.isis.subdomains.spring.applib.service;
import java.util.Arrays;
import java.util.Collections;
diff --git a/subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/service/ContextBeans.java b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/ContextBeans.java
similarity index 97%
rename from subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/service/ContextBeans.java
rename to subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/ContextBeans.java
index 1f71509..cb810e2 100644
--- a/subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/service/ContextBeans.java
+++ b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/ContextBeans.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.spring.service;
+package org.apache.isis.subdomains.spring.applib.service;
import java.util.Arrays;
import java.util.Collections;
diff --git a/subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/SpringBeansService.java
similarity index 97%
rename from subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java
rename to subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/SpringBeansService.java
index d869a18..9f7e326 100644
--- a/subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java
+++ b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/SpringBeansService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.spring.service;
+package org.apache.isis.subdomains.spring.applib.service;
import java.util.HashMap;
import java.util.Map;
diff --git a/subdomains/pdfbox/pom.xml b/subdomains/spring/pom.xml
similarity index 80%
copy from subdomains/pdfbox/pom.xml
copy to subdomains/spring/pom.xml
index abc97e4..e02db86 100644
--- a/subdomains/pdfbox/pom.xml
+++ b/subdomains/spring/pom.xml
@@ -18,11 +18,14 @@
<groupId>org.apache.isis.subdomains</groupId>
<artifactId>isis-subdomains</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-subdomains-pdfbox</artifactId>
- <name>Apache Isis Sub - PDF Box (parent)</name>
- <description>Integrates PDF Box Library</description>
+ <artifactId>isis-subdomains-spring</artifactId>
+ <name>Apache Isis Sub - Spring (parent)</name>
+ <description>Utility services for interacting with the Spring application context (that hosts the Apache Isis application itself)</description>
+
+ <packaging>pom</packaging>
<modules>
<module>applib</module>
diff --git a/subdomains/spring/impl/src/main/doc/antora.yml b/subdomains/spring/src/main/doc/antora.yml
similarity index 100%
rename from subdomains/spring/impl/src/main/doc/antora.yml
rename to subdomains/spring/src/main/doc/antora.yml
diff --git a/subdomains/spring/impl/src/main/doc/modules/spring/nav.adoc b/subdomains/spring/src/main/doc/modules/spring/nav.adoc
similarity index 100%
rename from subdomains/spring/impl/src/main/doc/modules/spring/nav.adoc
rename to subdomains/spring/src/main/doc/modules/spring/nav.adoc
diff --git a/subdomains/spring/impl/src/main/doc/modules/spring/pages/about.adoc b/subdomains/spring/src/main/doc/modules/spring/pages/about.adoc
similarity index 100%
rename from subdomains/spring/impl/src/main/doc/modules/spring/pages/about.adoc
rename to subdomains/spring/src/main/doc/modules/spring/pages/about.adoc
diff --git a/subdomains/spring/impl/src/main/doc/modules/spring/partials/module-nav.adoc b/subdomains/spring/src/main/doc/modules/spring/partials/module-nav.adoc
similarity index 100%
rename from subdomains/spring/impl/src/main/doc/modules/spring/partials/module-nav.adoc
rename to subdomains/spring/src/main/doc/modules/spring/partials/module-nav.adoc
diff --git a/testing/fixtures/pom.xml b/testing/fixtures/pom.xml
index e4b9c9b..a296ae2 100644
--- a/testing/fixtures/pom.xml
+++ b/testing/fixtures/pom.xml
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-spring</artifactId>
+ <artifactId>isis-subdomains-spring-applib</artifactId>
</dependency>
<!-- JDO API (non transient, provided by plugin) -->
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisModuleExtFixtures.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisModuleExtFixtures.java
index 067970e..4c2c7df 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisModuleExtFixtures.java
+++ b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisModuleExtFixtures.java
@@ -25,12 +25,12 @@ import org.apache.isis.extensions.fixtures.fixturescripts.ExecutionParametersSer
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.apache.isis.extensions.fixtures.legacy.queryresultscache.QueryResultsCacheControlDefault;
import org.apache.isis.extensions.fixtures.modules.ModuleWithFixturesService;
-import org.apache.isis.extensions.spring.IsisModuleExtSpring;
+import org.apache.isis.subdomains.spring.applib.IsisModuleSubSpringApplib;
@Configuration
@Import({
// modules
- IsisModuleExtSpring.class,
+ IsisModuleSubSpringApplib.class,
// @Service's
FixturesLifecycleService.class,
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java
index 51ab0f6..b586331 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java
+++ b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java
@@ -40,9 +40,9 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.spring.service.BeanDescriptor;
-import org.apache.isis.extensions.spring.service.ContextBeans;
-import org.apache.isis.extensions.spring.service.SpringBeansService;
+import org.apache.isis.subdomains.spring.applib.service.BeanDescriptor;
+import org.apache.isis.subdomains.spring.applib.service.ContextBeans;
+import org.apache.isis.subdomains.spring.applib.service.SpringBeansService;
import org.apache.isis.metamodel.facets.Annotations;
import lombok.Data;
diff --git a/testing/pom.xml b/testing/pom.xml
index ba3d882..039c114 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-spring</artifactId>
+ <artifactId>isis-subdomains-spring-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>