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/14 14:35:58 UTC
[isis] 03/03: ISIS-3001: more tidy up
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-3001
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b24758a00ed7e074b7264b1f1a14845472d287de
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Apr 14 15:35:28 2022 +0100
ISIS-3001: more tidy up
---
.../userguide/modules/fun/pages/modules.adoc | 28 +++++++++++-----------
.../org/apache/isis/applib/annotation/Module.java | 4 ++--
bom/pom.xml | 10 ++++----
.../demoapp/todomodule/dom/ExcelDemoToDoItem.java | 15 ++++++------
.../applib/excel/integtests/translations.pot | 16 ++++++-------
extensions/core/outbox-publisher/.gitkeep | 0
pom.xml | 10 ++++----
starters/pom.xml | 18 ++++----------
subdomains/adoc/antora.yml | 23 ------------------
subdomains/adoc/modules/ROOT/nav.adoc | 4 ----
subdomains/adoc/modules/ROOT/pages/about.adoc | 5 ----
.../adoc/modules/ROOT/partials/component-nav.adoc | 14 -----------
.../adoc/modules/ROOT/partials/module-nav.adoc | 3 ---
13 files changed, 45 insertions(+), 105 deletions(-)
diff --git a/antora/components/userguide/modules/fun/pages/modules.adoc b/antora/components/userguide/modules/fun/pages/modules.adoc
index a5689b6303..10b86e26c4 100644
--- a/antora/components/userguide/modules/fun/pages/modules.adoc
+++ b/antora/components/userguide/modules/fun/pages/modules.adoc
@@ -15,29 +15,29 @@ By convention, we have one Spring "logical" module in each Maven "physical" modu
Thus, there will be a single top-level package corresponding to the module, and this will be aligned with the `<groupId>` and `<artifactId>` of the Maven module in which it resides.
The framework's own modules follow this convention.
-For example, the xref:subdomains:excel:about.adoc[Excel subdomain] module has several submodules, one of which is its applib.
+For example, the xref:extensions:excel:about.adoc[Excel extension] module has several submodules, one of which is its applib.
This:
* has a Maven
-** groupId = `org.apache.isis.subdomains`
-** artifactId = `isis-subdomains-excel-applib`
+** groupId = `org.apache.isis.extensions`
+** artifactId = `isis-extensions-excel-applib`
-* in the applib, has a top-level package of `org.apache.isis.subdomains.excel.applib`
+* in the applib, has a top-level package of `org.apache.isis.extensions.excel.applib`
-* defines a Spring configuration module called `IsisModuleSubdomainsExcelApplib`, that is simply:
+* defines a Spring configuration module called `IsisModuleExtExcelApplib`, that is simply:
+
[source,java]
----
@Configuration
@ComponentScan // <.>
-public class IsisModuleSubdomainsExcelApplib {
+public class IsisModuleExtExcelApplib {
}
----
<.> the link:https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/context/annotation/ComponentScan.html[@ComponentScan] indicates that the classpath should be scanned for domain services, entities and xref:testing:fixtures:about.adoc[fixture scripts].
When there is a dependency, this is expressed in two ways: first, as a "physical" `<dependency` in Maven; and second, as a "logical" dependency using link:https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/context/annotation/Import.html[@Import] in the `@Configuration` module.
-We can see this for example in the `testing` module of the Excel library (artifactId of `isis-submodules-excel-testing`), where:
+We can see this for example in the `testing` module of the Excel library (artifactId of `isis-extensions-excel-testing`), where:
@@ -61,21 +61,21 @@ Therefore:
[source,xml]
----
<dependency>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-excel-applib</artifactId>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-excel-applib</artifactId>
</dependency>
----
-* and in the testing module's `IsisModuleSubdomainsExcelTesting` we see:
+* and in the testing module's `IsisModuleExtExcelTesting` we see:
+
[source,java]
----
@Configuration
@Import({ // <.>
- IsisModuleSubdomainsExcelApplib.class
+ IsisModuleExtExcelApplib.class
})
@ComponentScan
-public class IsisModuleSubdomainsExcelTesting {
+public class IsisModuleExtExcelTesting {
}
----
<.> The link:https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/context/annotation/Import.html[@Import] annotation declares the dependency.
@@ -92,7 +92,7 @@ package com.mycompany.modules.customer;
@Configuration // <.>
@Import({
- IsisModuleSubdomainsExcelApplib.class // <.>
+ IsisModuleExtExcelApplib.class // <.>
})
@ComponentScan // <.>
public class CustomerModule {}
@@ -112,7 +112,7 @@ import org.apache.isis.applib.annotation.Module;
@Module
@Import({
- IsisModuleSubdomainsExcelApplib.class
+ IsisModuleExtExcelApplib.class
})
public class CustomerModule {}
----
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/Module.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Module.java
index 6d6d2eedeb..64897941ff 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/Module.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Module.java
@@ -44,8 +44,8 @@ import org.springframework.context.annotation.Import;
* Also, a {@link Module @Module} also declares the Spring {@link ComponentScan @ComponentScan} (with no parameters),
* which means that any domain services in the same package or subpackages are automatically found and registered.
* </p>
- *
- * @since 1.x {@index}
+ *
+ * @since 2.x {@index}
* @implNote - there are possible performance implications from using this annotation, because it may result in
* scanning more classes than are needed. It is therefore not used within the framework code, but is
* provided as a convenience by domain applications.
diff --git a/bom/pom.xml b/bom/pom.xml
index a4c3d0c7b6..e2a7262a07 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -337,12 +337,12 @@ under the License.
<surefire.version>3.0.0-M6</surefire.version>
<surefire-plugin.argLine>-Xmx512m</surefire-plugin.argLine>
<!-- APACHE ISIS customisation 4/15: end -->
-
+
<assembly.tarLongFileMode>posix</assembly.tarLongFileMode>
<!-- set this property for all derived projects:
-->
<project.build.outputTimestamp>1</project.build.outputTimestamp>
-
+
<!-- LIBRARY DEPENDENCIES -->
<archunit.version>0.23.1</archunit.version>
<asm.version>9.3</asm.version> <!-- keep in sync with org.eclipse.persistence:org.eclipse.persistence.asm -->
@@ -448,7 +448,7 @@ under the License.
<wicketstuff.version>${wicket.version}</wicketstuff.version> <!-- org.wicketstuff:wicketstuff-select2 -->
<wicketstuff-gmap3.version>${wicket.version}</wicketstuff-gmap3.version>
-
+
</properties>
<!-- breaks dependabot run: timeout due to repo not accessible
@@ -1144,7 +1144,6 @@ under the License.
<module>../extensions</module>
<module>../mavendeps</module>
<module>../starters</module>
- <module>../subdomains</module>
<module>../testing</module>
<module>../valuetypes</module>
</modules>
@@ -1234,7 +1233,6 @@ under the License.
<module>../extensions</module>
<module>../mavendeps</module>
<module>../starters</module>
- <module>../subdomains</module>
<module>../testing</module>
<module>../valuetypes</module>
</modules>
@@ -1313,7 +1311,7 @@ under the License.
</plugins>
</build>
</profile>
-
+
<!-- APACHE ISIS customisation 15/15: end -->
</profiles>
diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
index 4d10109470..41c07c9db3 100644
--- a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
@@ -77,36 +77,36 @@ import lombok.ToString;
@javax.jdo.annotations.Query(
name = "todo_all", language = "JDOQL",
value = "SELECT "
- + "FROM org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem "
+ + "FROM " + ExcelDemoToDoItem.FQCN + " "
+ "WHERE ownedBy == :ownedBy"),
@javax.jdo.annotations.Query(
name = "todo_notYetComplete", language = "JDOQL",
value = "SELECT "
- + "FROM org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem "
+ + "FROM " + ExcelDemoToDoItem.FQCN + " "
+ "WHERE ownedBy == :ownedBy "
+ " && complete == false"),
@javax.jdo.annotations.Query(
name = "findByDescription", language = "JDOQL",
value = "SELECT "
- + "FROM org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem "
+ + "FROM " + ExcelDemoToDoItem.FQCN + " "
+ "WHERE ownedBy == :ownedBy "
+ " && description == :description"),
@javax.jdo.annotations.Query(
name = "todo_complete", language = "JDOQL",
value = "SELECT "
- + "FROM org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem "
+ + "FROM " + ExcelDemoToDoItem.FQCN + " "
+ "WHERE ownedBy == :ownedBy "
+ "&& complete == true"),
@javax.jdo.annotations.Query(
name = "todo_similarTo", language = "JDOQL",
value = "SELECT "
- + "FROM org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem "
+ + "FROM " + ExcelDemoToDoItem.FQCN + " "
+ "WHERE ownedBy == :ownedBy "
+ "&& category == :category"),
@javax.jdo.annotations.Query(
name = "todo_autoComplete", language = "JDOQL",
value = "SELECT "
- + "FROM org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem "
+ + "FROM " + ExcelDemoToDoItem.FQCN + " "
+ "WHERE ownedBy == :ownedBy && "
+ "description.indexOf(:description) >= 0")
})
@@ -126,7 +126,8 @@ import lombok.ToString;
})
public class ExcelDemoToDoItem implements Comparable<ExcelDemoToDoItem> /*, CalendarEventable, Locatable*/ {
- //@Inject private UserService userService;
+ public static final String FQCN = "org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem";
+
@Inject private MessageService messageService;
@Inject private RepositoryService repositoryService;
@Inject private TitleService titleService;
diff --git a/extensions/applib/excel/integtests/translations.pot b/extensions/applib/excel/integtests/translations.pot
index a973b9196a..2d5d3b3d75 100644
--- a/extensions/applib/excel/integtests/translations.pot
+++ b/extensions/applib/excel/integtests/translations.pot
@@ -263,8 +263,8 @@ msgstr ""
#: org.apache.isis.applib.fixturescripts.FixtureScript#downloadLayoutXml()
#: org.apache.isis.applib.fixturescripts.SimpleFixtureScript#downloadLayoutXml()
#: org.apache.isis.applib.services.config.ConfigurationProperty#downloadLayoutXml()
-#:org.apache.isis.subdomains.excel.applib.ExcelFixture#downloadLayoutXml()
-#:org.apache.isis.subdomains.excel.applib.ExcelFixture2#downloadLayoutXml()
+#:org.apache.isis.extensions.excel.applib.ExcelFixture#downloadLayoutXml()
+#:org.apache.isis.extensions.excel.applib.ExcelFixture2#downloadLayoutXml()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateLineItemForDemoToDoItem#downloadLayoutXml()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateManagerForDemoToDoItem#downloadLayoutXml()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.pivot.ExcelPivotByCategoryAndSubcategory#downloadLayoutXml()
@@ -533,8 +533,8 @@ msgstr ""
#: org.apache.isis.applib.fixturescripts.SimpleFixtureScript#openRestApi()
#: org.apache.isis.applib.services.config.ConfigurationProperty#openRestApi()
#: org.apache.isis.applib.services.swagger.SwaggerServiceMenu#openRestApi()
-#:org.apache.isis.subdomains.excel.applib.ExcelFixture#openRestApi()
-#:org.apache.isis.subdomains.excel.applib.ExcelFixture2#openRestApi()
+#:org.apache.isis.extensions.excel.applib.ExcelFixture#openRestApi()
+#:org.apache.isis.extensions.excel.applib.ExcelFixture2#openRestApi()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateLineItemForDemoToDoItem#openRestApi()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateManagerForDemoToDoItem#openRestApi()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.pivot.ExcelPivotByCategoryAndSubcategory#openRestApi()
@@ -659,8 +659,8 @@ msgstr ""
#: org.apache.isis.applib.fixturescripts.FixtureScript#rebuildMetamodel()
#: org.apache.isis.applib.fixturescripts.SimpleFixtureScript#rebuildMetamodel()
#: org.apache.isis.applib.services.config.ConfigurationProperty#rebuildMetamodel()
-#:org.apache.isis.subdomains.excel.applib.ExcelFixture#rebuildMetamodel()
-#:org.apache.isis.subdomains.excel.applib.ExcelFixture2#rebuildMetamodel()
+#:org.apache.isis.extensions.excel.applib.ExcelFixture#rebuildMetamodel()
+#:org.apache.isis.extensions.excel.applib.ExcelFixture2#rebuildMetamodel()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateLineItemForDemoToDoItem#rebuildMetamodel()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateManagerForDemoToDoItem#rebuildMetamodel()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.pivot.ExcelPivotByCategoryAndSubcategory#rebuildMetamodel()
@@ -711,8 +711,8 @@ msgstr ""
#: org.apache.isis.applib.fixturescripts.DiscoverableFixtureScript
#: org.apache.isis.applib.fixturescripts.FixtureScript
#: org.apache.isis.applib.fixturescripts.SimpleFixtureScript
-#:org.apache.isis.subdomains.excel.applib.ExcelFixture
-#:org.apache.isis.subdomains.excel.applib.ExcelFixture2
+#:org.apache.isis.extensions.excel.applib.ExcelFixture
+#:org.apache.isis.extensions.excel.applib.ExcelFixture2
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturescripts.DemoFixture_extending_ExcelFixture2
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturescripts.DemoToDoItem_create_usingExcelFixture
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturescripts.DemoToDoItem_recreate_usingExcelFixture
diff --git a/extensions/core/outbox-publisher/.gitkeep b/extensions/core/outbox-publisher/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/pom.xml b/pom.xml
index 7995d2d0fc..c2cffc5346 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,6 @@
<module>extensions</module>
<module>mavendeps</module>
<module>starters</module>
- <module>subdomains</module>
<module>testing</module>
<module>valuetypes</module>
</modules>
@@ -88,7 +87,6 @@
<module>extensions</module>
<module>mavendeps</module>
<module>starters</module>
- <module>subdomains</module>
<module>testing</module>
<module>valuetypes</module>
</modules>
@@ -175,7 +173,7 @@
<modules>
<!-- prerequisites ... -->
<module>incubator/viewers/javafx</module>
-
+
<module>examples/demo/javafx</module>
</modules>
</profile>
@@ -192,7 +190,7 @@
<module>examples/demo</module>
<module>examples/demo/domain</module>
<module>examples/demo/web</module>
-
+
<module>examples/demo/wicket/common</module>
<module>examples/demo/wicket/jdo</module>
<module>examples/demo/wicket/jpa</module>
@@ -214,7 +212,7 @@
<module>examples/demo/web</module>
<module>examples/demo/wicket/common</module>
<module>examples/demo/wicket/jdo</module>
-
+
<module>examples/demo/vaadin</module>
</modules>
</profile>
@@ -281,7 +279,7 @@
<modules>
<!-- prerequisites ... -->
<module>tooling</module>
-
+
<module>regressiontests</module>
</modules>
</profile>
diff --git a/starters/pom.xml b/starters/pom.xml
index 67852e9806..2ae7a21489 100644
--- a/starters/pom.xml
+++ b/starters/pom.xml
@@ -98,14 +98,6 @@
<type>pom</type>
</dependency>
- <dependency>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
-
<dependency>
<groupId>org.apache.isis.testing</groupId>
<artifactId>isis-testing</artifactId>
@@ -471,7 +463,7 @@
</repository>
</distributionManagement>
</profile>
-
+
<profile>
<id>nightly-localfs-repo</id>
<activation>
@@ -481,10 +473,10 @@
</activation>
<distributionManagement>
<repository>
- <id>nightly-localfs-repo</id>
- <name>Temporary Local Filesystem Staging Repository</name>
- <url>file://${MVN_SNAPSHOTS_PATH}</url>
- </repository>
+ <id>nightly-localfs-repo</id>
+ <name>Temporary Local Filesystem Staging Repository</name>
+ <url>file://${MVN_SNAPSHOTS_PATH}</url>
+ </repository>
</distributionManagement>
<build>
<plugins>
diff --git a/subdomains/adoc/antora.yml b/subdomains/adoc/antora.yml
deleted file mode 100644
index 972e1f9e42..0000000000
--- a/subdomains/adoc/antora.yml
+++ /dev/null
@@ -1,23 +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
-title: "Subdomains Catalog"
-version: latest
-start_page: ROOT:about.adoc
-nav:
-- modules/ROOT/nav.adoc
diff --git a/subdomains/adoc/modules/ROOT/nav.adoc b/subdomains/adoc/modules/ROOT/nav.adoc
deleted file mode 100644
index dbad73b19b..0000000000
--- a/subdomains/adoc/modules/ROOT/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/adoc/modules/ROOT/pages/about.adoc b/subdomains/adoc/modules/ROOT/pages/about.adoc
deleted file mode 100644
index 9615138414..0000000000
--- a/subdomains/adoc/modules/ROOT/pages/about.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
-= Subdomain Libraries
-
-: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/adoc/modules/ROOT/partials/component-nav.adoc b/subdomains/adoc/modules/ROOT/partials/component-nav.adoc
deleted file mode 100644
index 9f5381128f..0000000000
--- a/subdomains/adoc/modules/ROOT/partials/component-nav.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-include::subdomains:ROOT:partial$module-nav.adoc[]
-
-// commented out the libraries that have not yet been brought over from incode-platform
-
-include::subdomains:base:partial$module-nav.adoc[]
-include::subdomains:docx:partial$module-nav.adoc[]
-include::subdomains:excel:partial$module-nav.adoc[]
-//include::subdomains:freemarker:partial$module-nav.adoc[]
-//include::subdomains:ognl:partial$module-nav.adoc[]
-//include::subdomains:pdfbox:partial$module-nav.adoc[]
-include::subdomains:spring:partial$module-nav.adoc[]
-include::subdomains:xdocreport:partial$module-nav.adoc[]
-//include::subdomains:zip:partial$module-nav.adoc[]
-
diff --git a/subdomains/adoc/modules/ROOT/partials/module-nav.adoc b/subdomains/adoc/modules/ROOT/partials/module-nav.adoc
deleted file mode 100644
index b28b04f643..0000000000
--- a/subdomains/adoc/modules/ROOT/partials/module-nav.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-