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 2022/04/12 17:41:46 UTC
[isis] 08/12: ISIS-2999: moves subdomains/spring into runtimeservices, refactors fixtures/applib
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 a6ab4575884dfe1c4598daf165dff17be95010b4
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Apr 12 13:43:55 2022 +0100
ISIS-2999: moves subdomains/spring into runtimeservices, refactors fixtures/applib
---
antora/playbooks/site-subdomains.yml | 6 ---
antora/playbooks/site.yml | 6 ---
.../runtimeservices/spring}/BeanDescriptor.java | 2 +-
.../core/runtimeservices/spring}/ContextBeans.java | 2 +-
.../spring}/SpringBeansService.java | 2 +-
subdomains/pom.xml | 6 ---
subdomains/spring/adoc/antora.yml | 19 ---------
subdomains/spring/adoc/modules/spring/nav.adoc | 4 --
.../spring/adoc/modules/spring/pages/about.adoc | 5 ---
.../adoc/modules/spring/partials/module-nav.adoc | 6 ---
subdomains/spring/applib/pom.xml | 46 ----------------------
.../applib/IsisModuleSubdomainsSpringApplib.java | 35 ----------------
subdomains/spring/pom.xml | 33 ----------------
testing/fixtures/applib/pom.xml | 7 +---
.../applib/modules/ModuleWithFixturesService.java | 13 +++---
testing/pom.xml | 26 +++++-------
16 files changed, 18 insertions(+), 200 deletions(-)
diff --git a/antora/playbooks/site-subdomains.yml b/antora/playbooks/site-subdomains.yml
index d1a61ae2ea..c6c08e7a3e 100644
--- a/antora/playbooks/site-subdomains.yml
+++ b/antora/playbooks/site-subdomains.yml
@@ -49,15 +49,9 @@ content:
- url: .
start_path: subdomains/base/adoc # subdomains
branches: HEAD
- - url: .
- start_path: subdomains/docx/adoc # subdomains
- branches: HEAD
- url: .
start_path: subdomains/excel/adoc # subdomains
branches: HEAD
- - url: .
- start_path: subdomains/spring/adoc # subdomains
- branches: HEAD
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index d6ebcd349e..52207930d1 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -226,15 +226,9 @@ content:
- url: .
start_path: subdomains/base/adoc # subdomains
branches: HEAD
- - url: .
- start_path: subdomains/docx/adoc # subdomains
- branches: HEAD
- url: .
start_path: subdomains/excel/adoc # subdomains
branches: HEAD
- - url: .
- start_path: subdomains/spring/adoc # subdomains
- branches: HEAD
# testing
- url: .
diff --git a/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/BeanDescriptor.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/spring/BeanDescriptor.java
similarity index 98%
rename from subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/BeanDescriptor.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/spring/BeanDescriptor.java
index 023df042dc..c14b25ab4f 100644
--- a/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/BeanDescriptor.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/spring/BeanDescriptor.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.spring.applib.service;
+package org.apache.isis.core.runtimeservices.spring;
import java.util.Arrays;
import java.util.Collections;
diff --git a/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/ContextBeans.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/spring/ContextBeans.java
similarity index 97%
rename from subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/ContextBeans.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/spring/ContextBeans.java
index ff03ec2df4..0046ee8ee9 100644
--- a/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/ContextBeans.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/spring/ContextBeans.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.spring.applib.service;
+package org.apache.isis.core.runtimeservices.spring;
import java.util.Arrays;
import java.util.Collections;
diff --git a/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/SpringBeansService.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/spring/SpringBeansService.java
similarity index 97%
rename from subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/SpringBeansService.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/spring/SpringBeansService.java
index 50dfda90b3..ed1fa702d1 100644
--- a/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/SpringBeansService.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/spring/SpringBeansService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.spring.applib.service;
+package org.apache.isis.core.runtimeservices.spring;
import java.util.HashMap;
import java.util.Map;
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index 7219ac6e24..e08b0b9879 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -89,11 +89,6 @@
<version>2.0.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-spring-applib</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
<!-- 3rd party dependencies -->
@@ -145,7 +140,6 @@
<modules>
<module>base</module>
<module>excel</module>
- <module>spring</module>
</modules>
<profiles>
diff --git a/subdomains/spring/adoc/antora.yml b/subdomains/spring/adoc/antora.yml
deleted file mode 100644
index 1044dbbd29..0000000000
--- a/subdomains/spring/adoc/antora.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-name: subdomains
-version: latest
diff --git a/subdomains/spring/adoc/modules/spring/nav.adoc b/subdomains/spring/adoc/modules/spring/nav.adoc
deleted file mode 100644
index dbad73b19b..0000000000
--- a/subdomains/spring/adoc/modules/spring/nav.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-include::subdomains:ROOT:partial$component-nav.adoc[]
diff --git a/subdomains/spring/adoc/modules/spring/pages/about.adoc b/subdomains/spring/adoc/modules/spring/pages/about.adoc
deleted file mode 100644
index a35be5acf3..0000000000
--- a/subdomains/spring/adoc/modules/spring/pages/about.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
-= Spring
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-WARNING: TODO
diff --git a/subdomains/spring/adoc/modules/spring/partials/module-nav.adoc b/subdomains/spring/adoc/modules/spring/partials/module-nav.adoc
deleted file mode 100644
index 5e19816d4c..0000000000
--- a/subdomains/spring/adoc/modules/spring/partials/module-nav.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-* xref:subdomains:spring:about.adoc[Spring Library]
-
-
diff --git a/subdomains/spring/applib/pom.xml b/subdomains/spring/applib/pom.xml
deleted file mode 100644
index 5d55c8607c..0000000000
--- a/subdomains/spring/applib/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-spring</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>isis-subdomains-spring-applib</artifactId>
- <name>Apache Isis Sub - Spring (applib)</name>
-
- <properties>
- <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-core-runtime</artifactId>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-
-</project>
diff --git a/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/IsisModuleSubdomainsSpringApplib.java b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/IsisModuleSubdomainsSpringApplib.java
deleted file mode 100644
index 89a9824b53..0000000000
--- a/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/IsisModuleSubdomainsSpringApplib.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.subdomains.spring.applib;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-import org.apache.isis.subdomains.spring.applib.service.SpringBeansService;
-
-/**
- * @since 2.0 {@index}
- */
-@Configuration
-@Import({
- SpringBeansService.class
-})
-public class IsisModuleSubdomainsSpringApplib {
-
-}
diff --git a/subdomains/spring/pom.xml b/subdomains/spring/pom.xml
deleted file mode 100644
index c5ebbdef92..0000000000
--- a/subdomains/spring/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <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>
- </modules>
-
-</project>
diff --git a/testing/fixtures/applib/pom.xml b/testing/fixtures/applib/pom.xml
index 9142a1bfc4..58eecc92ff 100644
--- a/testing/fixtures/applib/pom.xml
+++ b/testing/fixtures/applib/pom.xml
@@ -54,11 +54,6 @@
<artifactId>joda-time</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-spring-applib</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.isis.testing</groupId>
<artifactId>isis-testing-integtestsupport-applib</artifactId>
@@ -79,7 +74,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
+ <artifactId>isis-core-runtimeservices</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixturesService.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixturesService.java
index d5bbb05499..55d938a136 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixturesService.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixturesService.java
@@ -41,12 +41,13 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.commons.internal.reflection._Reflect;
-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.core.runtimeservices.spring.BeanDescriptor;
+import org.apache.isis.core.runtimeservices.spring.ContextBeans;
+import org.apache.isis.core.runtimeservices.spring.SpringBeansService;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import lombok.Data;
+import lombok.RequiredArgsConstructor;
import lombok.val;
import lombok.extern.log4j.Log4j2;
@@ -58,15 +59,11 @@ import lombok.extern.log4j.Log4j2;
@Priority(PriorityPrecedence.MIDPOINT)
@Qualifier("Default")
@Log4j2
+@RequiredArgsConstructor(onConstructor_ = {@Inject})
public class ModuleWithFixturesService {
private final SpringBeansService springBeansService;
- @Inject
- public ModuleWithFixturesService(final SpringBeansService springBeansService) {
- this.springBeansService = springBeansService;
- }
-
public FixtureScript getRefDataSetupFixture() {
return new FixtureScript() {
@Override
diff --git a/testing/pom.xml b/testing/pom.xml
index 702c3e5545..54fe2f08f6 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -123,14 +123,6 @@
<version>2.0.0-SNAPSHOT</version>
</dependency>
-
- <!-- dependencies -->
- <dependency>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-spring-applib</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
-
</dependencies>
</dependencyManagement>