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/15 05:53:56 UTC
[isis] branch ISIS-3001 updated (6fb960f773 -> 3c05149659)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch ISIS-3001
in repository https://gitbox.apache.org/repos/asf/isis.git
discard 6fb960f773 ISIS-3001: fixes some compile issues
discard b45888c25c ISIS-3001: more tidy up
discard 61779f1a56 ISIS-3001: fix depMgmt spelling
discard b24758a00e ISIS-3001: more tidy up
discard a751f820a6 ISIS-3001: further minor cleanup
discard 9b4c4de037 ISIS-3001: moves subdomains/excel to extensions/applib/excel
add b0b99b880a Bump checker-qual from 3.21.3 to 3.21.4
add bbdb4e847a Merge pull request #906 from apache/dependabot/maven/master/org.checkerframework-checker-qual-3.21.4
add 719b5a1d6e Bump swagger-core from 1.6.5 to 1.6.6
add 820e8f48a9 Merge pull request #907 from apache/dependabot/maven/master/io.swagger-swagger-core-1.6.6
add ecc1f25bc8 Bump graphql-java from 17.3 to 18.0
add a018b258c1 Merge pull request #908 from apache/dependabot/maven/master/com.graphql-java-graphql-java-18.0
new e84237ff29 ISIS-3001: moves subdomains/excel to extensions/applib/excel
new 91af7520b3 ISIS-3001: further minor cleanup
new 9ef3b470f5 ISIS-3001: more tidy up
new 2d0f201427 ISIS-3001: fix depMgmt spelling
new 9d147f9928 ISIS-3001: more tidy up
new 3c05149659 ISIS-3001: fixes some compile issues
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (6fb960f773)
\
N -- N -- N refs/heads/ISIS-3001 (3c05149659)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
bom/pom.xml | 2 +-
tooling/dsl/pom.xml | 2 +-
tooling/pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
[isis] 02/06: ISIS-3001: further minor cleanup
Posted by da...@apache.org.
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 91af7520b3d4ed80f2db13bad9ae5a7fdec69790
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Apr 14 15:24:30 2022 +0100
ISIS-3001: further minor cleanup
---
.../userguide/modules/ROOT/partials/extensions.adoc | 1 +
.../adoc/modules/excel/partials/module-nav.adoc | 2 +-
isis-tooling.yml | 7 +++----
.../modules/tooling-cli/examples/isis-tooling.yml | 15 +++------------
.../apache/isis/tooling/cli/test/isis-tooling.yml | 20 ++++++--------------
5 files changed, 14 insertions(+), 31 deletions(-)
diff --git a/antora/components/userguide/modules/ROOT/partials/extensions.adoc b/antora/components/userguide/modules/ROOT/partials/extensions.adoc
index c73696b1b4..42657a9538 100644
--- a/antora/components/userguide/modules/ROOT/partials/extensions.adoc
+++ b/antora/components/userguide/modules/ROOT/partials/extensions.adoc
@@ -1,3 +1,4 @@
+include::userguide:excel:partial$module-nav.adoc[]
include::userguide:command-log:partial$module-nav.adoc[]
include::userguide:command-replay:partial$module-nav.adoc[]
include::userguide:flyway:partial$module-nav.adoc[]
diff --git a/extensions/applib/excel/adoc/modules/excel/partials/module-nav.adoc b/extensions/applib/excel/adoc/modules/excel/partials/module-nav.adoc
index 05fbf416e2..dcf24b5140 100644
--- a/extensions/applib/excel/adoc/modules/excel/partials/module-nav.adoc
+++ b/extensions/applib/excel/adoc/modules/excel/partials/module-nav.adoc
@@ -1,4 +1,4 @@
-* xref:userguide:excel:about.adoc[Excel Library]
+** xref:userguide:excel:about.adoc[Excel Library]
diff --git a/isis-tooling.yml b/isis-tooling.yml
index 978124b6b5..752f7d80d5 100644
--- a/isis-tooling.yml
+++ b/isis-tooling.yml
@@ -54,6 +54,7 @@ commands:
"SSE": "org.apache.isis.valuetypes:isis-valuetypes-sse.*"
Extensions: org.apache.isis.extensions
+ "Applib: Excel": "org.apache.isis.extensions:isis-extensions-excel.*"
"Core: Command Log": "org.apache.isis.extensions:isis-extensions-command-log.*"
"Core: Command Replay": "org.apache.isis.extensions:isis-extensions-command-replay.*"
#"Core: Flyway": "org.apache.isis.extensions:isis-extensions-flyway.*"
@@ -68,16 +69,14 @@ commands:
#"Wicket Viewer: Gmap3": "org.apache.isis.security:isis-extensions-gmap3.*"
"Wicket Viewer: Pdf.js": "org.apache.isis.security:isis-extensions-fullcalendar.*"
- Subdomains: org.apache.isis.subdomains
- "Excel": "org.apache.isis.subdomains:isis-subdomains-excel.*"
-
"Tooling": org.apache.isis.tooling.*
"Regression Tests": org.apache.isis.regressiontests.*
Incubator: org.apache.isis.incubator
"Kroviz Client": "org.apache.isis.incubator.clients:isis-client-kroviz.*"
- "JavaFX Viewer": "org.apache.isis.incubator.viewer:isis-viewer-javafx.*"
+ "GraphQL Viewer": "org.apache.isis.incubator.viewer:isis-viewer-graphql.*"
"Vaadin Viewer": "org.apache.isis.incubator.viewer:isis-viewer-vaadin.*"
+ "JavaFX Viewer": "org.apache.isis.incubator.viewer:isis-viewer-javafx.*"
index:
diff --git a/tooling/cli/adoc/modules/tooling-cli/examples/isis-tooling.yml b/tooling/cli/adoc/modules/tooling-cli/examples/isis-tooling.yml
index ac0d628fc5..752f7d80d5 100644
--- a/tooling/cli/adoc/modules/tooling-cli/examples/isis-tooling.yml
+++ b/tooling/cli/adoc/modules/tooling-cli/examples/isis-tooling.yml
@@ -54,6 +54,7 @@ commands:
"SSE": "org.apache.isis.valuetypes:isis-valuetypes-sse.*"
Extensions: org.apache.isis.extensions
+ "Applib: Excel": "org.apache.isis.extensions:isis-extensions-excel.*"
"Core: Command Log": "org.apache.isis.extensions:isis-extensions-command-log.*"
"Core: Command Replay": "org.apache.isis.extensions:isis-extensions-command-replay.*"
#"Core: Flyway": "org.apache.isis.extensions:isis-extensions-flyway.*"
@@ -68,24 +69,14 @@ commands:
#"Wicket Viewer: Gmap3": "org.apache.isis.security:isis-extensions-gmap3.*"
"Wicket Viewer: Pdf.js": "org.apache.isis.security:isis-extensions-fullcalendar.*"
- Subdomains: org.apache.isis.subdomains
- "Base": "org.apache.isis.subdomains:isis-subdomains-base.*"
- #"docx": "org.apache.isis.subdomains:isis-subdomains-docx.*"
- "Excel": "org.apache.isis.subdomains:isis-subdomains-excel.*"
- #"Freemarker": "org.apache.isis.subdomains:isis-subdomains-freemarker.*"
- #"OGNL": "org.apache.isis.subdomains:isis-subdomains-ognl.*"
- #"PDF Box": "org.apache.isis.subdomains:isis-subdomains-pdfbox.*"
- "Spring": "org.apache.isis.subdomains:isis-subdomains-spring.*"
- "XDocReport": "org.apache.isis.subdomains:isis-subdomains-xdocreport.*"
- #"Zip": "org.apache.isis.subdomains:isis-subdomains-zip.*"
-
"Tooling": org.apache.isis.tooling.*
"Regression Tests": org.apache.isis.regressiontests.*
Incubator: org.apache.isis.incubator
"Kroviz Client": "org.apache.isis.incubator.clients:isis-client-kroviz.*"
- "JavaFX Viewer": "org.apache.isis.incubator.viewer:isis-viewer-javafx.*"
+ "GraphQL Viewer": "org.apache.isis.incubator.viewer:isis-viewer-graphql.*"
"Vaadin Viewer": "org.apache.isis.incubator.viewer:isis-viewer-vaadin.*"
+ "JavaFX Viewer": "org.apache.isis.incubator.viewer:isis-viewer-javafx.*"
index:
diff --git a/tooling/cli/src/test/resources/org/apache/isis/tooling/cli/test/isis-tooling.yml b/tooling/cli/src/test/resources/org/apache/isis/tooling/cli/test/isis-tooling.yml
index 8e6003b68a..34684964fc 100644
--- a/tooling/cli/src/test/resources/org/apache/isis/tooling/cli/test/isis-tooling.yml
+++ b/tooling/cli/src/test/resources/org/apache/isis/tooling/cli/test/isis-tooling.yml
@@ -41,17 +41,20 @@ commands:
Bypass: "org.apache.isis.security:isis-security-bypass.*"
Keycloak: "org.apache.isis.security:isis-security-keycloak.*"
Shiro: "org.apache.isis.security:isis-security-shiro.*"
+ Spring: "org.apache.isis.security:isis-security-spring.*"
Viewer: org.apache.isis.viewer
+ "Common": "org.apache.isis.viewer:isis-viewer-common.*"
"Restful Objects": "org.apache.isis.viewer:isis-viewer-restfulobjects.*"
Wicket: "org.apache.isis.viewer:isis-viewer-wicket.*"
Valuetypes: org.apache.isis.valuetypes.*
"Asciidoc": "org.apache.isis.valuetypes:isis-valuetypes-asciidoc.*"
"Markdown": "org.apache.isis.valuetypes:isis-valuetypes-markdown.*"
- "SSE": "org.apache.isis.valuetypes:isis-valuetypes-ssec.*"
+ "SSE": "org.apache.isis.valuetypes:isis-valuetypes-sse.*"
Extensions: org.apache.isis.extensions
+ "Applib: Excel": "org.apache.isis.extensions:isis-extensions-excel.*"
"Core: Command Log": "org.apache.isis.extensions:isis-extensions-command-log.*"
"Core: Command Replay": "org.apache.isis.extensions:isis-extensions-command-replay.*"
#"Core: Flyway": "org.apache.isis.extensions:isis-extensions-flyway.*"
@@ -66,25 +69,14 @@ commands:
#"Wicket Viewer: Gmap3": "org.apache.isis.security:isis-extensions-gmap3.*"
"Wicket Viewer: Pdf.js": "org.apache.isis.security:isis-extensions-fullcalendar.*"
- Subdomains: org.apache.isis.subdomains
- "Base": "org.apache.isis.subdomains:isis-subdomains-base.*"
- #"docx": "org.apache.isis.subdomains:isis-subdomains-docx.*"
- "Excel": "org.apache.isis.subdomains:isis-subdomains-excel.*"
- #"Freemarker": "org.apache.isis.subdomains:isis-subdomains-freemarker.*"
- #"OGNL": "org.apache.isis.subdomains:isis-subdomains-ognl.*"
- #"PDF Box": "org.apache.isis.subdomains:isis-subdomains-pdfbox.*"
- "Spring": "org.apache.isis.subdomains:isis-subdomains-spring.*"
- "XDocReport": "org.apache.isis.subdomains:isis-subdomains-xdocreport.*"
- #"Zip": "org.apache.isis.subdomains:isis-subdomains-zip.*"
-
"Tooling": org.apache.isis.tooling.*
"Regression Tests": org.apache.isis.regressiontests.*
Incubator: org.apache.isis.incubator
"Kroviz Client": "org.apache.isis.incubator.clients:isis-client-kroviz.*"
- "JavaFX Viewer": "org.apache.isis.incubator.viewer:isis-viewer-javafx.*"
+ "GraphQL Viewer": "org.apache.isis.incubator.viewer:isis-viewer-graphql.*"
"Vaadin Viewer": "org.apache.isis.incubator.viewer:isis-viewer-vaadin.*"
-
+ "JavaFX Viewer": "org.apache.isis.incubator.viewer:isis-viewer-javafx.*"
index:
[isis] 03/06: ISIS-3001: more tidy up
Posted by da...@apache.org.
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 9ef3b470f5c21a12ae3ced390a31ee9a00590814
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 6760de4a3f..45e853c655 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 @@
-
-
-
[isis] 05/06: ISIS-3001: more tidy up
Posted by da...@apache.org.
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 9d147f9928cdfcfe707a0a71a8d29cb868009f71
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Apr 14 15:44:54 2022 +0100
ISIS-3001: more tidy up
---
extensions/applib/excel/integtests/pom.xml | 12 ++
subdomains/pom.xml | 198 -----------------------------
2 files changed, 12 insertions(+), 198 deletions(-)
diff --git a/extensions/applib/excel/integtests/pom.xml b/extensions/applib/excel/integtests/pom.xml
index 1499963bdb..27ad752ee1 100644
--- a/extensions/applib/excel/integtests/pom.xml
+++ b/extensions/applib/excel/integtests/pom.xml
@@ -69,6 +69,18 @@ under the License.
</testResources>
</build>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing</artifactId>
+ <scope>import</scope>
+ <type>pom</type>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
deleted file mode 100644
index 5553f21a24..0000000000
--- a/subdomains/pom.xml
+++ /dev/null
@@ -1,198 +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.core</groupId>
- <artifactId>isis-core</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../core/pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains</artifactId>
-
- <name>Apache Isis Subdomains</name>
- <description>
- A library of domain services and of supporting subdomains (often technical in nature), to be called from the
- core domain of an Apache Isis applications.
- </description>
-
- <packaging>pom</packaging>
-
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains</git-plugin.propertiesDir>
- </properties>
-
- <build>
- <resources>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>**</include>
- </includes>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
-
- <dependencyManagement>
- <dependencies>
-
- <dependency>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-extensions-excel-applib</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-extensions-excel-testing</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-extensions-excel-fixtures</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-extensions-excel-integtests</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
-
-
-
- <!-- 3rd party dependencies -->
-
- <dependency>
- <groupId>org.docx4j</groupId>
- <artifactId>docx4j-JAXB-ReferenceImpl</artifactId>
- <version>${docx4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.docx4j</groupId>
- <artifactId>docx4j-JAXB-Internal</artifactId>
- <version>${docx4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.docx4j</groupId>
- <artifactId>docx4j-JAXB-MOXy</artifactId>
- <version>${docx4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.docx4j</groupId>
- <artifactId>docx4j-export-fo</artifactId>
- <version>${docx4j.version}</version>
- </dependency>
-
- <!-- testing -->
- <dependency>
- <groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
- <modules>
- <module>excel</module>
- </modules>
-
- <profiles>
- <profile>
- <id>isis-app-starter-datanucleusenhance</id>
- <activation>
- <file>
- <exists>${basedir}/logging-dn-enhance.properties</exists>
- </file>
- </activation>
- <properties>
- <datanucleus-maven-plugin.log4jConfiguration>${basedir}/logging-dn-enhance.properties</datanucleus-maven-plugin.log4jConfiguration>
- <datanucleus-maven-plugin.verbose>true</datanucleus-maven-plugin.verbose>
- <datanucleus-maven-plugin.fork>false</datanucleus-maven-plugin.fork>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-maven-plugin</artifactId>
- <version>${datanucleus-maven-plugin.version}</version>
- <configuration>
- <fork>${datanucleus-maven-plugin.fork}</fork>
- <log4jConfiguration>${datanucleus-maven-plugin.log4jConfiguration}</log4jConfiguration>
- <verbose>${datanucleus-maven-plugin.verbose}</verbose>
- </configuration>
- <executions>
- <execution>
- <id>process-classes</id>
- <phase>process-classes</phase>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- <execution>
- <id>process-test-classes</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>test-enhance</goal>
- </goals>
- <configuration>
- <metadataDirectory>${project.build.testOutputDirectory}</metadataDirectory>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-core</artifactId>
- <version>${datanucleus-core.version}</version>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-api-jdo</artifactId>
- <version>${datanucleus-api-jdo.version}</version>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-jodatime</artifactId>
- <version>${datanucleus-jodatime.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- </profiles>
-</project>
-
-
[isis] 04/06: ISIS-3001: fix depMgmt spelling
Posted by da...@apache.org.
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 2d0f201427240db45b2ee0f1bc92e0a3e38f9a31
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Apr 14 15:40:46 2022 +0100
ISIS-3001: fix depMgmt spelling
---
extensions/pom.xml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/extensions/pom.xml b/extensions/pom.xml
index ce28fd4521..422a95c966 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -70,19 +70,16 @@
<artifactId>isis-extensions-excel-applib</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-excel-testing</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-excel-fixture</artifactId>
+ <artifactId>isis-extensions-excel-fixtures</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-excel-integtests</artifactId>
[isis] 01/06: ISIS-3001: moves subdomains/excel to extensions/applib/excel
Posted by da...@apache.org.
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 e84237ff29c822ea3100e99a629606faeea679d5
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Apr 14 15:17:52 2022 +0100
ISIS-3001: moves subdomains/excel to extensions/applib/excel
---
antora/playbooks/site-extensions.yml | 3 +
antora/playbooks/site-mappings.yml | 74 ------------------
antora/playbooks/site-subdomains.yml | 83 ---------------------
antora/playbooks/site.yml | 10 +--
.../applib}/excel/adoc/antora.yml | 2 +-
.../applib}/excel/adoc/modules/excel/nav.adoc | 2 +-
.../excel/adoc/modules/excel/pages/about.adoc | 0
.../adoc/modules/excel/partials/module-nav.adoc | 4 +
.../applib}/excel/applib/pom.xml | 12 +--
.../excel/applib/IsisModuleExtExcelApplib.java | 6 +-
.../excel/applib/dom/AggregationType.java | 2 +-
.../excel/applib/dom/ExcelMetaDataEnabled.java | 2 +-
.../extensions}/excel/applib/dom/ExcelService.java | 6 +-
.../extensions}/excel/applib/dom/HyperLink.java | 2 +-
.../extensions}/excel/applib/dom/PivotColumn.java | 2 +-
.../excel/applib/dom/PivotDecoration.java | 2 +-
.../extensions}/excel/applib/dom/PivotRow.java | 2 +-
.../extensions}/excel/applib/dom/PivotValue.java | 2 +-
.../extensions}/excel/applib/dom/RowHandler.java | 2 +-
.../excel/applib/dom/WorksheetContent.java | 2 +-
.../excel/applib/dom/WorksheetSpec.java | 4 +-
.../excel/applib/service/ExcelServiceDefault.java | 10 +--
.../excel/applib/service/_CellMarshaller.java | 4 +-
.../excel/applib/service/_ExcelConverter.java | 28 +++----
.../excel/applib/service/_ExcelServiceHelper.java | 14 ++--
.../excel/applib/util/AnnotationList.java | 2 +-
.../excel/applib/util/AnnotationTriplet.java | 2 +-
.../excel/applib/util/ExcelFileBlobConverter.java | 6 +-
.../isis/extensions}/excel/applib/util/Mode.java | 2 +-
.../extensions}/excel/applib/util/PivotUtils.java | 4 +-
.../excel/applib/util/SheetPivoter.java | 6 +-
.../excel/applib/util/AnnotationListTest.java | 6 +-
.../excel/applib/util/AnnotationTripletTest.java | 4 +-
.../excel/applib/util/PivotUtilsTest.java | 4 +-
.../excel/applib/util/SheetPivoterTest.java | 2 +-
.../applib}/excel/fixture/.gitignore | 0
.../excel/fixture/logging-dn-enhance.properties | 0
.../applib}/excel/fixture/pom.xml | 24 +++---
.../fixture/src/main/java/META-INF/persistence.xml | 0
.../excel/fixtures/IsisModuleExtExcelFixtures.java | 10 +--
.../contributions/ExcelDemoToDoItem_export.java | 8 +-
.../contributions/ExcelDemoToDoItem_export2.java | 8 +-
.../BulkUpdateLineItemForDemoToDoItem.java | 10 +--
.../BulkUpdateLineItemForDemoToDoItem.layout.xml | 0
.../BulkUpdateManagerForDemoToDoItem.java | 14 ++--
.../BulkUpdateManagerForDemoToDoItem.layout.xml | 0
.../bulkupdate/BulkUpdateMenuForDemoToDoItem.java | 8 +-
.../pivot/ExcelPivotByCategoryAndSubcategory.java | 14 ++--
.../ExcelPivotByCategoryAndSubcategoryMenu.java | 6 +-
.../demotodoitem/DemoToDoItemRowHandler.java | 14 ++--
.../demotodoitem/DemoToDoItemRowHandler2.java | 12 +--
.../ExcelUploadRowHandler4ToDoItem.java | 14 ++--
.../ExcelUploadServiceForDemoToDoItem.java | 6 +-
.../DemoFixture_extending_ExcelFixture2.java | 10 +--
.../DemoToDoItem_create_usingExcelFixture.java | 8 +-
.../DemoToDoItem_recreate_usingExcelFixture.java | 4 +-
.../demomodule/fixturescripts/MoreToDoItems.xlsx | Bin
.../demomodule/fixturescripts/ToDoItems.xlsx | Bin
.../fixtures/demoapp/todomodule/dom/Category.java | 2 +-
.../todomodule/dom/DependenciesComparator.java | 2 +-
.../todomodule/dom/ExcelDemoToDoItem-done.png | Bin
.../todomodule/dom/ExcelDemoToDoItem-todo.png | Bin
.../demoapp/todomodule/dom/ExcelDemoToDoItem.java | 2 +-
.../todomodule/dom/ExcelDemoToDoItem.layout.xml | 0
.../demoapp/todomodule/dom/ExcelDemoToDoItem.png | Bin
.../todomodule/dom/ExcelDemoToDoItemMenu.java | 2 +-
.../demoapp/todomodule/dom/Subcategory.java | 2 +-
.../ExcelDemoToDoItem_recreate5_for.java | 10 +--
.../ExcelDemoToDoItem_recreate5_forSven.java | 2 +-
.../fixturescripts/ExcelDemoToDoItem_tearDown.java | 4 +-
.../ExcelDemoToDoItem_tearDown2.java | 2 +-
.../applib}/excel/integtests/log4j2-test.xml | 0
.../applib}/excel/integtests/pom.xml | 18 ++---
.../integtests/ExcelModuleIntegTestAbstract.java | 6 +-
.../ExcelModuleDemoMetaDataEnabled_IntegTest.java | 8 +-
...uleDemoToDoItemBulkUpdateManager_IntegTest.java | 18 ++---
.../ExcelModuleDemoUploadService_IntegTest.java | 14 ++--
.../tests/ToDoItemsWithMultipleSheets.xlsx | Bin
.../excel/integtests/tests/toDoItems-expected.xlsx | Bin
.../excel/integtests/tests/toDoItems-updated.xlsx | Bin
.../applib}/excel/integtests/toDoItems-actual.xlsx | Bin
.../applib}/excel/integtests/translations.pot | 0
{subdomains => extensions/applib}/excel/pom.xml | 9 ++-
.../applib}/excel/testing/pom.xml | 16 ++--
.../extensions}/excel/testing/ExcelFixture.java | 6 +-
.../extensions}/excel/testing/ExcelFixture2.java | 8 +-
.../excel/testing/ExcelFixtureRowHandler.java | 2 +-
.../excel/testing/ExcelFixtureWorkbookHandler.java | 2 +-
.../excel/testing/FixtureAwareRowHandler.java | 4 +-
.../excel/testing/IsisModuleExtExcelTesting.java | 4 +-
extensions/pom.xml | 27 +++++++
.../adoc/modules/excel/partials/module-nav.adoc | 6 --
subdomains/pom.xml | 8 +-
93 files changed, 270 insertions(+), 402 deletions(-)
diff --git a/antora/playbooks/site-extensions.yml b/antora/playbooks/site-extensions.yml
index a498ab8691..be3066543b 100644
--- a/antora/playbooks/site-extensions.yml
+++ b/antora/playbooks/site-extensions.yml
@@ -37,6 +37,9 @@ content:
start_path: extensions/adoc # extensions
branches: HEAD
+ - url: .
+ start_path: extensions/excel/adoc # extensions
+ branches: HEAD
- url: .
start_path: extensions/core/command-log/adoc # extensions
branches: HEAD
diff --git a/antora/playbooks/site-mappings.yml b/antora/playbooks/site-mappings.yml
deleted file mode 100644
index 9e37fdc1ca..0000000000
--- a/antora/playbooks/site-mappings.yml
+++ /dev/null
@@ -1,74 +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.
-
-site:
- title: Apache Isis
- url: https://isis.apache.org/
- start_page: docs:ROOT:about.adoc
-
-content:
- sources:
-
-# antora
- - url: .
- start_path: antora/components/docs # docs
- branches: HEAD
-# examples
- - url: .
- start_path: examples/demo/domain/src/main/adoc # docs
- branches: HEAD
-
-# mavendeps
- - url: .
- start_path: mavendeps/adoc # docs
- branches: HEAD
-
-# starters
- - url: .
- start_path: starters/adoc # docs
- branches: HEAD
-
-
-ui:
- bundle:
- url: ../isis-antora/build/ui-bundle.zip
-# url: https://github.com/apache/isis-antora/blob/master/build/ui-bundle.zip?raw=true
- #url: ./antora/theme/ui-bundle.zip
- snapshot: true
- supplemental_files: antora/supplemental-ui
-
-asciidoc:
- extensions:
- - asciidoctor-kroki # requires: npm i ... @asciidoctor/core@2.2.0 asciidoctor-kroki
-# - asciidoctor-plantuml # requires: npm i ... asciidoctor-plantuml@1.5.0
- - ./antora/lib/lorem
- - ./antora/lib/jira-issue
- attributes:
- experimental: ""
- idprefix: ""
- idseparator: "-"
- # kroki
- # for more options see https://github.com/Mogztter/asciidoctor-kroki
- kroki-default-format: svg # (default)
- kroki-default-options: interactive # only available for SVG
- kroki-fetch-diagram: true
- kroki-server-url: https://kroki.io # (default)
- page-isisprev: "2.0.0-M6"
- page-isisrel: "2.0.0-M7"
-
-output:
- dir: antora/target/site
diff --git a/antora/playbooks/site-subdomains.yml b/antora/playbooks/site-subdomains.yml
deleted file mode 100644
index 7468441c87..0000000000
--- a/antora/playbooks/site-subdomains.yml
+++ /dev/null
@@ -1,83 +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.
-
-site:
- title: Apache Isis
- url: https://isis.apache.org/
- start_page: docs:ROOT:about.adoc
-
-content:
- sources:
-
-# antora
- - url: .
- start_path: antora/components/docs # docs
- branches: HEAD
-# examples
- - url: .
- start_path: examples/demo/domain/src/main/adoc # docs
- branches: HEAD
-
-# mavendeps
- - url: .
- start_path: mavendeps/adoc # docs
- branches: HEAD
-
-# starters
- - url: .
- start_path: starters/adoc # docs
- branches: HEAD
-
-# subdomains
- - url: .
- start_path: subdomains/adoc # subdomains
- branches: HEAD
- - url: .
- start_path: subdomains/excel/adoc # subdomains
- branches: HEAD
-
-
-
-ui:
- bundle:
- url: ../isis-antora/build/ui-bundle.zip
-# url: https://github.com/apache/isis-antora/blob/master/build/ui-bundle.zip?raw=true
- #url: ./antora/theme/ui-bundle.zip
- snapshot: true
- supplemental_files: antora/supplemental-ui
-
-asciidoc:
- extensions:
- - asciidoctor-kroki # requires: npm i ... @asciidoctor/core@2.2.0 asciidoctor-kroki
-# - asciidoctor-plantuml # requires: npm i ... asciidoctor-plantuml@1.5.0
- - ./antora/lib/lorem
- - ./antora/lib/jira-issue
- attributes:
- experimental: ""
- idprefix: ""
- idseparator: "-"
- # kroki
- # for more options see https://github.com/Mogztter/asciidoctor-kroki
- kroki-default-format: svg # (default)
- kroki-default-options: interactive # only available for SVG
- kroki-fetch-diagram: true
- kroki-server-url: https://kroki.io # (default)
- page-isisprev: "2.0.0-M6"
- page-isisrel: "2.0.0-M7"
-
-output:
- dir: antora/target/site
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index b0327d580a..d366ccabcb 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -108,6 +108,9 @@ content:
start_path: extensions/adoc # extensions
branches: HEAD
+ - url: .
+ start_path: extensions/excel/adoc # extensions
+ branches: HEAD
- url: .
start_path: extensions/core/command-log/adoc # extensions
branches: HEAD
@@ -202,13 +205,6 @@ content:
start_path: starters/adoc # toc
branches: HEAD
-# subdomains
- - url: .
- start_path: subdomains/adoc # subdomains
- branches: HEAD
- - url: .
- start_path: subdomains/excel/adoc # subdomains
- branches: HEAD
# testing
- url: .
diff --git a/subdomains/excel/adoc/antora.yml b/extensions/applib/excel/adoc/antora.yml
similarity index 97%
rename from subdomains/excel/adoc/antora.yml
rename to extensions/applib/excel/adoc/antora.yml
index 1044dbbd29..448d819e20 100644
--- a/subdomains/excel/adoc/antora.yml
+++ b/extensions/applib/excel/adoc/antora.yml
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-name: subdomains
+name: userguide
version: latest
diff --git a/subdomains/excel/adoc/modules/excel/nav.adoc b/extensions/applib/excel/adoc/modules/excel/nav.adoc
similarity index 93%
rename from subdomains/excel/adoc/modules/excel/nav.adoc
rename to extensions/applib/excel/adoc/modules/excel/nav.adoc
index dbad73b19b..35b7262129 100644
--- a/subdomains/excel/adoc/modules/excel/nav.adoc
+++ b/extensions/applib/excel/adoc/modules/excel/nav.adoc
@@ -1,4 +1,4 @@
: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[]
+include::userguide:ROOT:partial$component-nav.adoc[]
diff --git a/subdomains/excel/adoc/modules/excel/pages/about.adoc b/extensions/applib/excel/adoc/modules/excel/pages/about.adoc
similarity index 100%
rename from subdomains/excel/adoc/modules/excel/pages/about.adoc
rename to extensions/applib/excel/adoc/modules/excel/pages/about.adoc
diff --git a/extensions/applib/excel/adoc/modules/excel/partials/module-nav.adoc b/extensions/applib/excel/adoc/modules/excel/partials/module-nav.adoc
new file mode 100644
index 0000000000..05fbf416e2
--- /dev/null
+++ b/extensions/applib/excel/adoc/modules/excel/partials/module-nav.adoc
@@ -0,0 +1,4 @@
+
+* xref:userguide:excel:about.adoc[Excel Library]
+
+
diff --git a/subdomains/excel/applib/pom.xml b/extensions/applib/excel/applib/pom.xml
similarity index 91%
rename from subdomains/excel/applib/pom.xml
rename to extensions/applib/excel/applib/pom.xml
index 65989acca9..d57767d67a 100644
--- a/subdomains/excel/applib/pom.xml
+++ b/extensions/applib/excel/applib/pom.xml
@@ -13,17 +13,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-excel</artifactId>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-excel</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
- <artifactId>isis-subdomains-excel-applib</artifactId>
- <name>Apache Isis Sub - Excel (applib)</name>
+ <artifactId>isis-extensions-excel-applib</artifactId>
+ <name>Apache Isis Ext - Excel (applib)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains.excel.applib</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains/excel/applib</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.extensions.excel.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/extensions/excel/applib</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/IsisModuleSubdomainsExcelApplib.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/IsisModuleExtExcelApplib.java
similarity index 87%
rename from subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/IsisModuleSubdomainsExcelApplib.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/IsisModuleExtExcelApplib.java
index 7f496e1a81..d03815c492 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/IsisModuleSubdomainsExcelApplib.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/IsisModuleExtExcelApplib.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.applib;
+package org.apache.isis.extensions.excel.applib;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.subdomains.excel.applib.service.ExcelServiceDefault;
+import org.apache.isis.extensions.excel.applib.service.ExcelServiceDefault;
/**
* @since 2.0 {@index}
@@ -30,7 +30,7 @@ import org.apache.isis.subdomains.excel.applib.service.ExcelServiceDefault;
@Import({
ExcelServiceDefault.class
})
-public class IsisModuleSubdomainsExcelApplib {
+public class IsisModuleExtExcelApplib {
public static final String NAMESPACE = "isis.sub.excel";
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/AggregationType.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/AggregationType.java
similarity index 94%
rename from subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/AggregationType.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/AggregationType.java
index eec42e6e28..482e3dc33a 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/AggregationType.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/AggregationType.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.applib.dom;
+package org.apache.isis.extensions.excel.applib.dom;
/**
* @since 2.0 {@index}
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/ExcelMetaDataEnabled.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/ExcelMetaDataEnabled.java
similarity index 94%
rename from subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/ExcelMetaDataEnabled.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/ExcelMetaDataEnabled.java
index 945458cea2..3aedd6ea7b 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/ExcelMetaDataEnabled.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/ExcelMetaDataEnabled.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.applib.dom;
+package org.apache.isis.extensions.excel.applib.dom;
/**
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/ExcelService.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/ExcelService.java
similarity index 96%
rename from subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/ExcelService.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/ExcelService.java
index 846b01a794..0540b28e1e 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/ExcelService.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/ExcelService.java
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.applib.dom;
+package org.apache.isis.extensions.excel.applib.dom;
import java.io.InputStream;
import java.util.List;
import org.apache.isis.applib.exceptions.RecoverableException;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.subdomains.excel.applib.service.ExcelServiceDefault;
-import org.apache.isis.subdomains.excel.applib.util.Mode;
+import org.apache.isis.extensions.excel.applib.service.ExcelServiceDefault;
+import org.apache.isis.extensions.excel.applib.util.Mode;
/**
* @since 2.0 {@index}
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/HyperLink.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/HyperLink.java
similarity index 95%
rename from subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/HyperLink.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/HyperLink.java
index 8d9b01be06..f527867f08 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/HyperLink.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/HyperLink.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.applib.dom;
+package org.apache.isis.extensions.excel.applib.dom;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/PivotColumn.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/PivotColumn.java
similarity index 95%
rename from subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/PivotColumn.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/PivotColumn.java
index 917fa3672c..fa983871c0 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/PivotColumn.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/PivotColumn.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.applib.dom;
+package org.apache.isis.extensions.excel.applib.dom;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/PivotDecoration.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/PivotDecoration.java
similarity index 95%
rename from subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/PivotDecoration.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/PivotDecoration.java
index e740c2eec7..fb773067f7 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/PivotDecoration.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/PivotDecoration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.applib.dom;
+package org.apache.isis.extensions.excel.applib.dom;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/PivotRow.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/PivotRow.java
similarity index 95%
rename from subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/PivotRow.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/PivotRow.java
index 8b189f7aee..ef2a68bcc2 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/PivotRow.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/PivotRow.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.applib.dom;
+package org.apache.isis.extensions.excel.applib.dom;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/PivotValue.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/PivotValue.java
similarity index 95%
rename from subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/PivotValue.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/PivotValue.java
index 4e8ea45910..b18f747d3b 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/PivotValue.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/PivotValue.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.applib.dom;
+package org.apache.isis.extensions.excel.applib.dom;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/RowHandler.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/RowHandler.java
similarity index 95%
rename from subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/RowHandler.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/RowHandler.java
index 4bff100333..6beb81a249 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/RowHandler.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/RowHandler.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.applib.dom;
+package org.apache.isis.extensions.excel.applib.dom;
import org.apache.isis.applib.annotation.Programmatic;
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/WorksheetContent.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/WorksheetContent.java
similarity index 96%
rename from subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/WorksheetContent.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/WorksheetContent.java
index b39c052889..6493a95224 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/WorksheetContent.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/WorksheetContent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.applib.dom;
+package org.apache.isis.extensions.excel.applib.dom;
import java.util.List;
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/WorksheetSpec.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/WorksheetSpec.java
similarity index 97%
rename from subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/WorksheetSpec.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/WorksheetSpec.java
index 9d89c1dc1a..9d5f477886 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/WorksheetSpec.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/WorksheetSpec.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.applib.dom;
+package org.apache.isis.extensions.excel.applib.dom;
import java.util.List;
@@ -24,7 +24,7 @@ import javax.inject.Inject;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.subdomains.excel.applib.util.Mode;
+import org.apache.isis.extensions.excel.applib.util.Mode;
import lombok.Setter;
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/service/ExcelServiceDefault.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/ExcelServiceDefault.java
similarity index 95%
rename from subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/service/ExcelServiceDefault.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/ExcelServiceDefault.java
index 33a7f77075..24ee30c138 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/service/ExcelServiceDefault.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/ExcelServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.applib.service;
+package org.apache.isis.extensions.excel.applib.service;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -37,10 +37,10 @@ import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
-import org.apache.isis.subdomains.excel.applib.dom.WorksheetContent;
-import org.apache.isis.subdomains.excel.applib.dom.WorksheetSpec;
-import org.apache.isis.subdomains.excel.applib.util.Mode;
+import org.apache.isis.extensions.excel.applib.dom.ExcelService;
+import org.apache.isis.extensions.excel.applib.dom.WorksheetContent;
+import org.apache.isis.extensions.excel.applib.dom.WorksheetSpec;
+import org.apache.isis.extensions.excel.applib.util.Mode;
@Service
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/service/_CellMarshaller.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_CellMarshaller.java
similarity index 99%
rename from subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/service/_CellMarshaller.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_CellMarshaller.java
index a5ba478519..242579a6f9 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/service/_CellMarshaller.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_CellMarshaller.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.applib.service;
+package org.apache.isis.extensions.excel.applib.service;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -498,4 +498,4 @@ final class _CellMarshaller {
}
-}
\ No newline at end of file
+}
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/service/_ExcelConverter.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelConverter.java
similarity index 96%
rename from subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/service/_ExcelConverter.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelConverter.java
index 60afcb78c6..8680254429 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/service/_ExcelConverter.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelConverter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.applib.service;
+package org.apache.isis.extensions.excel.applib.service;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -63,19 +63,19 @@ import org.apache.isis.core.metamodel.spec.feature.MixedIn;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.subdomains.excel.applib.dom.AggregationType;
-import org.apache.isis.subdomains.excel.applib.dom.ExcelMetaDataEnabled;
-import org.apache.isis.subdomains.excel.applib.dom.HyperLink;
-import org.apache.isis.subdomains.excel.applib.dom.PivotColumn;
-import org.apache.isis.subdomains.excel.applib.dom.PivotDecoration;
-import org.apache.isis.subdomains.excel.applib.dom.PivotRow;
-import org.apache.isis.subdomains.excel.applib.dom.PivotValue;
-import org.apache.isis.subdomains.excel.applib.dom.RowHandler;
-import org.apache.isis.subdomains.excel.applib.dom.WorksheetContent;
-import org.apache.isis.subdomains.excel.applib.dom.WorksheetSpec;
-import org.apache.isis.subdomains.excel.applib.util.Mode;
-import org.apache.isis.subdomains.excel.applib.util.PivotUtils;
-import org.apache.isis.subdomains.excel.applib.util.SheetPivoter;
+import org.apache.isis.extensions.excel.applib.dom.AggregationType;
+import org.apache.isis.extensions.excel.applib.dom.ExcelMetaDataEnabled;
+import org.apache.isis.extensions.excel.applib.dom.HyperLink;
+import org.apache.isis.extensions.excel.applib.dom.PivotColumn;
+import org.apache.isis.extensions.excel.applib.dom.PivotDecoration;
+import org.apache.isis.extensions.excel.applib.dom.PivotRow;
+import org.apache.isis.extensions.excel.applib.dom.PivotValue;
+import org.apache.isis.extensions.excel.applib.dom.RowHandler;
+import org.apache.isis.extensions.excel.applib.dom.WorksheetContent;
+import org.apache.isis.extensions.excel.applib.dom.WorksheetSpec;
+import org.apache.isis.extensions.excel.applib.util.Mode;
+import org.apache.isis.extensions.excel.applib.util.PivotUtils;
+import org.apache.isis.extensions.excel.applib.util.SheetPivoter;
import lombok.ToString;
import lombok.val;
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/service/_ExcelServiceHelper.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelServiceHelper.java
similarity index 95%
rename from subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/service/_ExcelServiceHelper.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelServiceHelper.java
index bb80c8b50a..a9d396f138 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/service/_ExcelServiceHelper.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelServiceHelper.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.applib.service;
+package org.apache.isis.extensions.excel.applib.service;
import java.io.File;
import java.io.IOException;
@@ -33,12 +33,12 @@ import org.apache.isis.applib.value.Blob;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.subdomains.excel.applib.dom.PivotColumn;
-import org.apache.isis.subdomains.excel.applib.dom.PivotRow;
-import org.apache.isis.subdomains.excel.applib.dom.PivotValue;
-import org.apache.isis.subdomains.excel.applib.dom.WorksheetContent;
-import org.apache.isis.subdomains.excel.applib.dom.WorksheetSpec;
-import org.apache.isis.subdomains.excel.applib.util.ExcelFileBlobConverter;
+import org.apache.isis.extensions.excel.applib.dom.PivotColumn;
+import org.apache.isis.extensions.excel.applib.dom.PivotRow;
+import org.apache.isis.extensions.excel.applib.dom.PivotValue;
+import org.apache.isis.extensions.excel.applib.dom.WorksheetContent;
+import org.apache.isis.extensions.excel.applib.dom.WorksheetSpec;
+import org.apache.isis.extensions.excel.applib.util.ExcelFileBlobConverter;
import lombok.SneakyThrows;
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/util/AnnotationList.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/AnnotationList.java
similarity index 96%
rename from subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/util/AnnotationList.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/AnnotationList.java
index 1f4283ca29..1a2a8173b9 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/util/AnnotationList.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/AnnotationList.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.applib.util;
+package org.apache.isis.extensions.excel.applib.util;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/util/AnnotationTriplet.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/AnnotationTriplet.java
similarity index 96%
rename from subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/util/AnnotationTriplet.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/AnnotationTriplet.java
index aa1f7678a9..7ae99a0b3e 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/util/AnnotationTriplet.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/AnnotationTriplet.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.applib.util;
+package org.apache.isis.extensions.excel.applib.util;
/**
* @since 2.0 {@index}
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/util/ExcelFileBlobConverter.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/ExcelFileBlobConverter.java
similarity index 93%
rename from subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/util/ExcelFileBlobConverter.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/ExcelFileBlobConverter.java
index d8adf8e2f7..0c5b3277e1 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/util/ExcelFileBlobConverter.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/ExcelFileBlobConverter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.applib.util;
+package org.apache.isis.extensions.excel.applib.util;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -28,8 +28,8 @@ import org.apache.poi.util.IOUtils;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.commons.internal.base._Bytes;
-import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
-import org.apache.isis.subdomains.excel.applib.service.ExcelServiceDefault;
+import org.apache.isis.extensions.excel.applib.dom.ExcelService;
+import org.apache.isis.extensions.excel.applib.service.ExcelServiceDefault;
import lombok.val;
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/util/Mode.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/Mode.java
similarity index 95%
rename from subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/util/Mode.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/Mode.java
index bd15cf613c..2f394569d1 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/util/Mode.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/Mode.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.applib.util;
+package org.apache.isis.extensions.excel.applib.util;
/**
* @since 2.0 {@index}
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/util/PivotUtils.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/PivotUtils.java
similarity index 97%
rename from subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/util/PivotUtils.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/PivotUtils.java
index 80784b08aa..27bea8fd86 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/util/PivotUtils.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/PivotUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.applib.util;
+package org.apache.isis.extensions.excel.applib.util;
import java.util.List;
@@ -24,7 +24,7 @@ import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.Row;
-import org.apache.isis.subdomains.excel.applib.dom.AggregationType;
+import org.apache.isis.extensions.excel.applib.dom.AggregationType;
/**
* @since 2.0 {@index}
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/util/SheetPivoter.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/SheetPivoter.java
similarity index 99%
rename from subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/util/SheetPivoter.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/SheetPivoter.java
index b02e54f263..affb095c65 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/util/SheetPivoter.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/SheetPivoter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.applib.util;
+package org.apache.isis.extensions.excel.applib.util;
import java.util.ArrayList;
import java.util.Arrays;
@@ -34,8 +34,8 @@ import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.util.CellReference;
-import org.apache.isis.subdomains.excel.applib.dom.AggregationType;
-import org.apache.isis.subdomains.excel.applib.service.ExcelServiceDefault;
+import org.apache.isis.extensions.excel.applib.dom.AggregationType;
+import org.apache.isis.extensions.excel.applib.service.ExcelServiceDefault;
import lombok.val;
diff --git a/subdomains/excel/applib/src/test/java/org/apache/isis/subdomains/excel/applib/util/AnnotationListTest.java b/extensions/applib/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/AnnotationListTest.java
similarity index 90%
rename from subdomains/excel/applib/src/test/java/org/apache/isis/subdomains/excel/applib/util/AnnotationListTest.java
rename to extensions/applib/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/AnnotationListTest.java
index c2113daf3d..343f47f0c5 100644
--- a/subdomains/excel/applib/src/test/java/org/apache/isis/subdomains/excel/applib/util/AnnotationListTest.java
+++ b/extensions/applib/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/AnnotationListTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.applib.util;
+package org.apache.isis.extensions.excel.applib.util;
import java.util.Arrays;
import java.util.List;
@@ -24,8 +24,8 @@ import java.util.List;
import org.assertj.core.api.Assertions;
import org.junit.Test;
-import org.apache.isis.subdomains.excel.applib.util.AnnotationList;
-import org.apache.isis.subdomains.excel.applib.util.AnnotationTriplet;
+import org.apache.isis.extensions.excel.applib.util.AnnotationList;
+import org.apache.isis.extensions.excel.applib.util.AnnotationTriplet;
public class AnnotationListTest {
diff --git a/subdomains/excel/applib/src/test/java/org/apache/isis/subdomains/excel/applib/util/AnnotationTripletTest.java b/extensions/applib/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/AnnotationTripletTest.java
similarity index 95%
rename from subdomains/excel/applib/src/test/java/org/apache/isis/subdomains/excel/applib/util/AnnotationTripletTest.java
rename to extensions/applib/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/AnnotationTripletTest.java
index 320b73f361..83d9a12b61 100644
--- a/subdomains/excel/applib/src/test/java/org/apache/isis/subdomains/excel/applib/util/AnnotationTripletTest.java
+++ b/extensions/applib/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/AnnotationTripletTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.applib.util;
+package org.apache.isis.extensions.excel.applib.util;
import java.util.Arrays;
import java.util.Collections;
@@ -25,7 +25,7 @@ import java.util.List;
import org.assertj.core.api.Assertions;
import org.junit.Test;
-import org.apache.isis.subdomains.excel.applib.util.AnnotationTriplet;
+import org.apache.isis.extensions.excel.applib.util.AnnotationTriplet;
public class AnnotationTripletTest {
diff --git a/subdomains/excel/applib/src/test/java/org/apache/isis/subdomains/excel/applib/util/PivotUtilsTest.java b/extensions/applib/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/PivotUtilsTest.java
similarity index 98%
rename from subdomains/excel/applib/src/test/java/org/apache/isis/subdomains/excel/applib/util/PivotUtilsTest.java
rename to extensions/applib/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/PivotUtilsTest.java
index 6c4bd9437e..5b4be70ea3 100644
--- a/subdomains/excel/applib/src/test/java/org/apache/isis/subdomains/excel/applib/util/PivotUtilsTest.java
+++ b/extensions/applib/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/PivotUtilsTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.applib.util;
+package org.apache.isis.extensions.excel.applib.util;
import java.util.Arrays;
import java.util.List;
@@ -30,7 +30,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.assertj.core.api.Assertions;
import org.junit.Test;
-import org.apache.isis.subdomains.excel.applib.util.PivotUtils;
+import org.apache.isis.extensions.excel.applib.util.PivotUtils;
public class PivotUtilsTest {
diff --git a/subdomains/excel/applib/src/test/java/org/apache/isis/subdomains/excel/applib/util/SheetPivoterTest.java b/extensions/applib/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/SheetPivoterTest.java
similarity index 99%
rename from subdomains/excel/applib/src/test/java/org/apache/isis/subdomains/excel/applib/util/SheetPivoterTest.java
rename to extensions/applib/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/SheetPivoterTest.java
index effa154637..39390dc4c4 100644
--- a/subdomains/excel/applib/src/test/java/org/apache/isis/subdomains/excel/applib/util/SheetPivoterTest.java
+++ b/extensions/applib/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/SheetPivoterTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.applib.util;
+package org.apache.isis.extensions.excel.applib.util;
import java.util.Arrays;
import java.util.List;
diff --git a/subdomains/excel/fixture/.gitignore b/extensions/applib/excel/fixture/.gitignore
similarity index 100%
rename from subdomains/excel/fixture/.gitignore
rename to extensions/applib/excel/fixture/.gitignore
diff --git a/subdomains/excel/fixture/logging-dn-enhance.properties b/extensions/applib/excel/fixture/logging-dn-enhance.properties
similarity index 100%
rename from subdomains/excel/fixture/logging-dn-enhance.properties
rename to extensions/applib/excel/fixture/logging-dn-enhance.properties
diff --git a/subdomains/excel/fixture/pom.xml b/extensions/applib/excel/fixture/pom.xml
similarity index 85%
rename from subdomains/excel/fixture/pom.xml
rename to extensions/applib/excel/fixture/pom.xml
index ab40a18c23..6192a6467a 100644
--- a/subdomains/excel/fixture/pom.xml
+++ b/extensions/applib/excel/fixture/pom.xml
@@ -21,18 +21,18 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains</artifactId>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../../pom.xml</relativePath>
</parent>
- <artifactId>isis-subdomains-excel-fixtures</artifactId>
- <name>Apache Isis Sub - Excel (Fixtures)</name>
-
+ <artifactId>isis-extensions-excel-fixtures</artifactId>
+ <name>Apache Isis Ext - Excel (Fixtures)</name>
+
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains.excel.fixture</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains/excel/fixture</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.extensions.excel.fixture</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/extensions/excel/fixture</git-plugin.propertiesDir>
</properties>
<build>
@@ -73,13 +73,13 @@ under the License.
<dependencies>
<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>
<dependency>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-excel-testing</artifactId>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-excel-testing</artifactId>
</dependency>
<dependency>
diff --git a/subdomains/excel/fixture/src/main/java/META-INF/persistence.xml b/extensions/applib/excel/fixture/src/main/java/META-INF/persistence.xml
similarity index 100%
rename from subdomains/excel/fixture/src/main/java/META-INF/persistence.xml
rename to extensions/applib/excel/fixture/src/main/java/META-INF/persistence.xml
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/IsisModuleSubdomainsExcelFixtures.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/IsisModuleExtExcelFixtures.java
similarity index 83%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/IsisModuleSubdomainsExcelFixtures.java
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/IsisModuleExtExcelFixtures.java
index 12fb728ab9..bcb9750699 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/IsisModuleSubdomainsExcelFixtures.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/IsisModuleExtExcelFixtures.java
@@ -16,25 +16,25 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.fixtures;
+package org.apache.isis.extensions.excel.fixtures;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.subdomains.excel.applib.IsisModuleSubdomainsExcelApplib;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown;
+import org.apache.isis.extensions.excel.applib.IsisModuleSubdomainsExcelApplib;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown;
import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixtures;
@Configuration
@Import({
- IsisModuleSubdomainsExcelApplib.class,
+ IsisModuleExtExcelApplib.class,
IsisModuleTestingFixturesApplib.class
})
@ComponentScan //TODO eventually create a concrete list of Components to import
-public class IsisModuleSubdomainsExcelFixtures implements ModuleWithFixtures {
+public class IsisModuleExtExcelFixtures implements ModuleWithFixtures {
@Override public FixtureScript getTeardownFixture() {
return new ExcelDemoToDoItem_tearDown();
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java
similarity index 87%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java
index e2ab57adc8..e59f3d20b4 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.contributions;
+package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.contributions;
import javax.inject.Inject;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
+import org.apache.isis.extensions.excel.applib.dom.ExcelService;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
@Action
public class ExcelDemoToDoItem_export {
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java
similarity index 89%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java
index 7e6902992a..27ffe381b8 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.contributions;
+package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.contributions;
import javax.inject.Inject;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
+import org.apache.isis.extensions.excel.applib.dom.ExcelService;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
@Action
public class ExcelDemoToDoItem_export2 {
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
similarity index 94%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
index 25b87299d9..cc72081a95 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.dom.bulkupdate;
+package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate;
import java.math.BigDecimal;
import java.time.LocalDate;
@@ -40,10 +40,10 @@ import org.apache.isis.applib.jaxb.JavaTimeJaxbAdapters;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.applib.services.user.UserService;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
import lombok.Getter;
import lombok.NoArgsConstructor;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.layout.xml b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.layout.xml
similarity index 100%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.layout.xml
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.layout.xml
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
similarity index 94%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
index adc6783122..660b6fe2f8 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.dom.bulkupdate;
+package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate;
import java.util.List;
import java.util.stream.Collectors;
@@ -46,12 +46,12 @@ import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
-import org.apache.isis.subdomains.excel.applib.dom.WorksheetContent;
-import org.apache.isis.subdomains.excel.applib.dom.WorksheetSpec;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
+import org.apache.isis.extensions.excel.applib.dom.ExcelService;
+import org.apache.isis.extensions.excel.applib.dom.WorksheetContent;
+import org.apache.isis.extensions.excel.applib.dom.WorksheetSpec;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
import static org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem.Predicates.thoseCategorised;
import static org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem.Predicates.thoseCompleted;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.layout.xml b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.layout.xml
similarity index 100%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.layout.xml
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.layout.xml
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
similarity index 91%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
index 77a6014e73..95780191c8 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.dom.bulkupdate;
+package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate;
import javax.inject.Inject;
import javax.xml.bind.annotation.XmlTransient;
@@ -32,9 +32,9 @@ import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.user.UserService;
-import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
+import org.apache.isis.extensions.excel.applib.dom.ExcelService;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
@DomainService(
nature = NatureOfService.VIEW,
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
similarity index 80%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
index 6ff33e714d..a86af91353 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
@@ -16,18 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.dom.pivot;
+package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.pivot;
import java.math.BigDecimal;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.subdomains.excel.applib.dom.AggregationType;
-import org.apache.isis.subdomains.excel.applib.dom.PivotColumn;
-import org.apache.isis.subdomains.excel.applib.dom.PivotRow;
-import org.apache.isis.subdomains.excel.applib.dom.PivotValue;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
+import org.apache.isis.extensions.excel.applib.dom.AggregationType;
+import org.apache.isis.extensions.excel.applib.dom.PivotColumn;
+import org.apache.isis.extensions.excel.applib.dom.PivotRow;
+import org.apache.isis.extensions.excel.applib.dom.PivotValue;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
import lombok.Getter;
import lombok.Setter;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
similarity index 93%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
index 92d943c373..6a60c25d80 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.dom.pivot;
+package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.pivot;
import java.util.ArrayList;
import java.util.List;
@@ -31,8 +31,8 @@ import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.subdomains.excel.applib.service.ExcelServiceDefault;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
+import org.apache.isis.extensions.excel.applib.service.ExcelServiceDefault;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
@DomainService(
nature = NatureOfService.VIEW,
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
similarity index 88%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
index 4762b51b0d..34a461a50d 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem;
+package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem;
import java.math.BigDecimal;
import java.time.LocalDate;
@@ -30,12 +30,12 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.user.UserService;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
-import org.apache.isis.subdomains.excel.testing.ExcelFixture;
-import org.apache.isis.subdomains.excel.testing.ExcelFixtureRowHandler;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
+import org.apache.isis.extensions.excel.testing.ExcelFixture;
+import org.apache.isis.extensions.excel.testing.ExcelFixtureRowHandler;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import lombok.Getter;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
similarity index 86%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
index 10d8518127..9b9b294544 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
@@ -16,17 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem;
+package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem;
import java.math.BigDecimal;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.subdomains.excel.applib.dom.ExcelMetaDataEnabled;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
-import org.apache.isis.subdomains.excel.testing.ExcelFixture2;
-import org.apache.isis.subdomains.excel.testing.FixtureAwareRowHandler;
+import org.apache.isis.extensions.excel.applib.dom.ExcelMetaDataEnabled;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
+import org.apache.isis.extensions.excel.testing.ExcelFixture2;
+import org.apache.isis.extensions.excel.testing.FixtureAwareRowHandler;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import lombok.Getter;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
similarity index 87%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
index 59549bbbb1..74a44dee3b 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.excelupload;
+package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.excelupload;
import java.math.BigDecimal;
import java.time.LocalDate;
@@ -35,12 +35,12 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.jaxb.JavaTimeJaxbAdapters;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
-import org.apache.isis.subdomains.excel.testing.ExcelFixture;
-import org.apache.isis.subdomains.excel.testing.ExcelFixtureRowHandler;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
+import org.apache.isis.extensions.excel.testing.ExcelFixture;
+import org.apache.isis.extensions.excel.testing.ExcelFixtureRowHandler;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import lombok.Getter;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
similarity index 93%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
index ea2dbd4754..274d863cee 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.excelupload;
+package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.excelupload;
import java.util.List;
@@ -30,8 +30,8 @@ import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.subdomains.excel.testing.ExcelFixture;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler;
+import org.apache.isis.extensions.excel.testing.ExcelFixture;
+import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureResult;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
similarity index 86%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
index 4dc998bee1..2530f7949f 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturescripts;
+package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturescripts;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.commons.internal.resources._Resources;
-import org.apache.isis.subdomains.excel.applib.dom.WorksheetSpec;
-import org.apache.isis.subdomains.excel.applib.util.Mode;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler2;
-import org.apache.isis.subdomains.excel.testing.ExcelFixture2;
+import org.apache.isis.extensions.excel.applib.dom.WorksheetSpec;
+import org.apache.isis.extensions.excel.applib.util.Mode;
+import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler2;
+import org.apache.isis.extensions.excel.testing.ExcelFixture2;
import lombok.Getter;
import lombok.Setter;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
similarity index 91%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
index 2d175f4c9e..6a98c90668 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturescripts;
+package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturescripts;
import java.net.URL;
import java.util.List;
@@ -27,9 +27,9 @@ import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.resources._Resources;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
-import org.apache.isis.subdomains.excel.testing.ExcelFixture;
+import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
+import org.apache.isis.extensions.excel.testing.ExcelFixture;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import lombok.Getter;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java
similarity index 93%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java
index d63a3ee31b..37c686e41e 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturescripts;
+package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturescripts;
import javax.inject.Inject;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown2;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown2;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
public class DemoToDoItem_recreate_usingExcelFixture extends FixtureScript {
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/MoreToDoItems.xlsx b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/MoreToDoItems.xlsx
similarity index 100%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/MoreToDoItems.xlsx
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/MoreToDoItems.xlsx
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/ToDoItems.xlsx b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/ToDoItems.xlsx
similarity index 100%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/ToDoItems.xlsx
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/ToDoItems.xlsx
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/Category.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Category.java
similarity index 96%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/Category.java
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Category.java
index ae4fcadfd9..b0d362598c 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/Category.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Category.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom;
+package org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom;
import java.util.Arrays;
import java.util.List;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/DependenciesComparator.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/DependenciesComparator.java
similarity index 95%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/DependenciesComparator.java
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/DependenciesComparator.java
index 590d307470..2839fbff57 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/DependenciesComparator.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/DependenciesComparator.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom;
+package org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom;
import java.util.Comparator;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-done.png b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-done.png
similarity index 100%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-done.png
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-done.png
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-todo.png b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-todo.png
similarity index 100%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-todo.png
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-todo.png
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/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
similarity index 99%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
index 14fb3e1d21..4d10109470 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/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
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom;
+package org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom;
import java.math.BigDecimal;
import java.time.LocalDate;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.layout.xml b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.layout.xml
similarity index 100%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.layout.xml
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.layout.xml
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.png b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.png
similarity index 100%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.png
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.png
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java
similarity index 99%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java
index 9f6128d019..75398630c9 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom;
+package org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom;
import java.math.BigDecimal;
import java.time.LocalDate;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/Subcategory.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Subcategory.java
similarity index 96%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/Subcategory.java
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Subcategory.java
index 4e3e1779ea..9e2b27fe3f 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/Subcategory.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Subcategory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom;
+package org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom;
import java.util.Collections;
import java.util.List;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
similarity index 93%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
index e53e838455..8e24ecee59 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescripts;
+package org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.fixturescripts;
import java.math.BigDecimal;
import java.time.LocalDate;
@@ -25,10 +25,10 @@ import java.time.ZoneId;
import javax.inject.Inject;
import org.apache.isis.applib.services.clock.ClockService;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
public class ExcelDemoToDoItem_recreate5_for extends FixtureScript {
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_forSven.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_forSven.java
similarity index 94%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_forSven.java
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_forSven.java
index f4afbd934a..ee62e6f65d 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_forSven.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_forSven.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescripts;
+package org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.fixturescripts;
public class ExcelDemoToDoItem_recreate5_forSven extends ExcelDemoToDoItem_recreate5_for {
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
similarity index 90%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
index ec9ce52468..2110e504a6 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescripts;
+package org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.fixturescripts;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAbstract;
public class ExcelDemoToDoItem_tearDown extends TeardownFixtureJdoAbstract {
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java
similarity index 96%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java
rename to extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java
index a710a3f6cf..d69c9f8b80 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescripts;
+package org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.fixturescripts;
import javax.inject.Inject;
diff --git a/subdomains/excel/integtests/log4j2-test.xml b/extensions/applib/excel/integtests/log4j2-test.xml
similarity index 100%
rename from subdomains/excel/integtests/log4j2-test.xml
rename to extensions/applib/excel/integtests/log4j2-test.xml
diff --git a/subdomains/excel/integtests/pom.xml b/extensions/applib/excel/integtests/pom.xml
similarity index 86%
rename from subdomains/excel/integtests/pom.xml
rename to extensions/applib/excel/integtests/pom.xml
index 323c1ccb7c..1499963bdb 100644
--- a/subdomains/excel/integtests/pom.xml
+++ b/extensions/applib/excel/integtests/pom.xml
@@ -22,18 +22,18 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains</artifactId>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../../pom.xml</relativePath>
</parent>
- <artifactId>isis-subdomains-excel-integtests</artifactId>
- <name>Apache Isis Sub - Excel (Integ Tests)</name>
+ <artifactId>isis-extensions-excel-integtests</artifactId>
+ <name>Apache Isis Ext - Excel (Integ Tests)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains.excel.integtests</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains/excel/integtests</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.extensions.excel.integtests</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/extensions/excel/integtests</git-plugin.propertiesDir>
</properties>
<build>
@@ -72,8 +72,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-excel-fixtures</artifactId>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-excel-fixtures</artifactId>
<scope>test</scope>
</dependency>
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java b/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
similarity index 93%
rename from subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java
rename to extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
index d5c623f742..c26e7d41be 100644
--- a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java
+++ b/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.integtests;
+package org.apache.isis.extensions.excel.integtests;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Configuration;
@@ -31,7 +31,7 @@ import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.persistence.jdo.applib.IsisModulePersistenceJdoApplib;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
-import org.apache.isis.subdomains.excel.fixtures.IsisModuleSubdomainsExcelFixtures;
+import org.apache.isis.extensions.excel.fixtures.IsisModuleSubdomainsExcelFixtures;
import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
@@ -58,7 +58,7 @@ public abstract class ExcelModuleIntegTestAbstract extends IsisIntegrationTestAb
new ExcelFixturesModule(),
FakeDataModule.class
*/
- IsisModuleSubdomainsExcelFixtures.class
+ IsisModuleExtExcelFixtures.class
})
public static class AppManifest {
}
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java b/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java
similarity index 92%
rename from subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java
rename to extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java
index 5ccb4f1669..7769e4c9e2 100644
--- a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java
+++ b/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.integtests.tests;
+package org.apache.isis.extensions.excel.integtests.tests;
import java.util.ArrayList;
import java.util.List;
@@ -29,9 +29,9 @@ import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler2;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturescripts.DemoFixture_extending_ExcelFixture2;
-import org.apache.isis.subdomains.excel.integtests.ExcelModuleIntegTestAbstract;
+import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler2;
+import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturescripts.DemoFixture_extending_ExcelFixture2;
+import org.apache.isis.extensions.excel.integtests.ExcelModuleIntegTestAbstract;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureResult;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java b/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
similarity index 89%
rename from subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
rename to extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
index 9bcb222d96..43d36343ec 100644
--- a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
+++ b/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.integtests.tests;
+package org.apache.isis.extensions.excel.integtests.tests;
import java.io.IOException;
import java.util.List;
@@ -35,13 +35,13 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.commons.internal.base._Bytes;
import org.apache.isis.commons.internal.resources._Resources;
-import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateLineItemForDemoToDoItem;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateManagerForDemoToDoItem;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateMenuForDemoToDoItem;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturescripts.DemoToDoItem_recreate_usingExcelFixture;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
-import org.apache.isis.subdomains.excel.integtests.ExcelModuleIntegTestAbstract;
+import org.apache.isis.extensions.excel.applib.dom.ExcelService;
+import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateLineItemForDemoToDoItem;
+import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateManagerForDemoToDoItem;
+import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateMenuForDemoToDoItem;
+import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturescripts.DemoToDoItem_recreate_usingExcelFixture;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
+import org.apache.isis.extensions.excel.integtests.ExcelModuleIntegTestAbstract;
public class ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest extends ExcelModuleIntegTestAbstract {
@@ -121,4 +121,4 @@ public class ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest extends ExcelMod
}
-}
\ No newline at end of file
+}
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java b/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java
similarity index 83%
rename from subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java
rename to extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java
index 426910311f..c28b92400c 100644
--- a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java
+++ b/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.integtests.tests;
+package org.apache.isis.extensions.excel.integtests.tests;
import java.net.URL;
import java.util.List;
@@ -30,12 +30,12 @@ import org.junit.jupiter.api.Test;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.commons.internal.resources._Resources;
-import org.apache.isis.subdomains.excel.applib.util.ExcelFileBlobConverter;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.excelupload.ExcelUploadServiceForDemoToDoItem;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
-import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown;
-import org.apache.isis.subdomains.excel.integtests.ExcelModuleIntegTestAbstract;
+import org.apache.isis.extensions.excel.applib.util.ExcelFileBlobConverter;
+import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.excelupload.ExcelUploadServiceForDemoToDoItem;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
+import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown;
+import org.apache.isis.extensions.excel.integtests.ExcelModuleIntegTestAbstract;
public class ExcelModuleDemoUploadService_IntegTest extends ExcelModuleIntegTestAbstract {
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ToDoItemsWithMultipleSheets.xlsx b/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ToDoItemsWithMultipleSheets.xlsx
similarity index 100%
rename from subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ToDoItemsWithMultipleSheets.xlsx
rename to extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ToDoItemsWithMultipleSheets.xlsx
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/toDoItems-expected.xlsx b/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/toDoItems-expected.xlsx
similarity index 100%
rename from subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/toDoItems-expected.xlsx
rename to extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/toDoItems-expected.xlsx
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/toDoItems-updated.xlsx b/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/toDoItems-updated.xlsx
similarity index 100%
rename from subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/toDoItems-updated.xlsx
rename to extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/toDoItems-updated.xlsx
diff --git a/subdomains/excel/integtests/toDoItems-actual.xlsx b/extensions/applib/excel/integtests/toDoItems-actual.xlsx
similarity index 100%
rename from subdomains/excel/integtests/toDoItems-actual.xlsx
rename to extensions/applib/excel/integtests/toDoItems-actual.xlsx
diff --git a/subdomains/excel/integtests/translations.pot b/extensions/applib/excel/integtests/translations.pot
similarity index 100%
rename from subdomains/excel/integtests/translations.pot
rename to extensions/applib/excel/integtests/translations.pot
diff --git a/subdomains/excel/pom.xml b/extensions/applib/excel/pom.xml
similarity index 85%
rename from subdomains/excel/pom.xml
rename to extensions/applib/excel/pom.xml
index 7a53b047cb..67d144a1e5 100644
--- a/subdomains/excel/pom.xml
+++ b/extensions/applib/excel/pom.xml
@@ -13,13 +13,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains</artifactId>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions</artifactId>
<version>2.0.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-subdomains-excel</artifactId>
- <name>Apache Isis Sub - Excel (parent)</name>
+ <artifactId>isis-extensions-excel</artifactId>
+ <name>Apache Isis Ext - Excel (parent)</name>
<description>
A domain service for Apache Isis', allowing collections
diff --git a/subdomains/excel/testing/pom.xml b/extensions/applib/excel/testing/pom.xml
similarity index 81%
rename from subdomains/excel/testing/pom.xml
rename to extensions/applib/excel/testing/pom.xml
index 4f36940900..3e3aa82b53 100644
--- a/subdomains/excel/testing/pom.xml
+++ b/extensions/applib/excel/testing/pom.xml
@@ -13,24 +13,24 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-excel</artifactId>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-excel</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
- <artifactId>isis-subdomains-excel-testing</artifactId>
+ <artifactId>isis-extensions-excel-testing</artifactId>
<name>Apache Isis Sub - Excel (testing support)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains.excel.testing</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains/excel/testing</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.extensions.excel.testing</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/extensions/excel/testing</git-plugin.propertiesDir>
</properties>
<dependencies>
<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>
<dependency>
@@ -44,7 +44,7 @@
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.isis.testing</groupId>
<artifactId>isis-testing-fixtures-applib</artifactId>
diff --git a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture.java b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture.java
similarity index 97%
rename from subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture.java
rename to extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture.java
index 9e3a25d999..bc2d230ddb 100644
--- a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture.java
+++ b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.testing;
+package org.apache.isis.extensions.excel.testing;
import java.net.URL;
import java.util.Arrays;
@@ -40,8 +40,8 @@ import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.subdomains.excel.applib.IsisModuleSubdomainsExcelApplib;
-import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
+import org.apache.isis.extensions.excel.applib.IsisModuleSubdomainsExcelApplib;
+import org.apache.isis.extensions.excel.applib.dom.ExcelService;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureResultList;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
diff --git a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture2.java b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture2.java
similarity index 95%
rename from subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture2.java
rename to extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture2.java
index 15a392f0b1..d785a5b9da 100644
--- a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture2.java
+++ b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture2.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.testing;
+package org.apache.isis.extensions.excel.testing;
import java.net.URL;
import java.util.Arrays;
@@ -29,9 +29,9 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.commons.internal.base._Bytes;
-import org.apache.isis.subdomains.excel.applib.IsisModuleSubdomainsExcelApplib;
-import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
-import org.apache.isis.subdomains.excel.applib.dom.WorksheetSpec;
+import org.apache.isis.extensions.excel.applib.IsisModuleSubdomainsExcelApplib;
+import org.apache.isis.extensions.excel.applib.dom.ExcelService;
+import org.apache.isis.extensions.excel.applib.dom.WorksheetSpec;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import lombok.Getter;
diff --git a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureRowHandler.java b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixtureRowHandler.java
similarity index 95%
rename from subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureRowHandler.java
rename to extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixtureRowHandler.java
index 42cc6dee14..80987137ec 100644
--- a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureRowHandler.java
+++ b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixtureRowHandler.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.testing;
+package org.apache.isis.extensions.excel.testing;
import java.util.List;
diff --git a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureWorkbookHandler.java b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixtureWorkbookHandler.java
similarity index 95%
rename from subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureWorkbookHandler.java
rename to extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixtureWorkbookHandler.java
index e09f70d041..a628d59d74 100644
--- a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureWorkbookHandler.java
+++ b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixtureWorkbookHandler.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.testing;
+package org.apache.isis.extensions.excel.testing;
import java.util.List;
diff --git a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/FixtureAwareRowHandler.java b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/FixtureAwareRowHandler.java
similarity index 91%
rename from subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/FixtureAwareRowHandler.java
rename to extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/FixtureAwareRowHandler.java
index c9762586f0..370d5fc5ab 100644
--- a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/FixtureAwareRowHandler.java
+++ b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/FixtureAwareRowHandler.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.testing;
+package org.apache.isis.extensions.excel.testing;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
-import org.apache.isis.subdomains.excel.applib.dom.RowHandler;
+import org.apache.isis.extensions.excel.applib.dom.RowHandler;
/**
* @since 2.0 {@index}
diff --git a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/IsisModuleSubdomainsExcelTesting.java b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/IsisModuleExtExcelTesting.java
similarity index 91%
rename from subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/IsisModuleSubdomainsExcelTesting.java
rename to extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/IsisModuleExtExcelTesting.java
index dc3a73c11b..ca3e50c13e 100644
--- a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/IsisModuleSubdomainsExcelTesting.java
+++ b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/IsisModuleExtExcelTesting.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.excel.testing;
+package org.apache.isis.extensions.excel.testing;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.subdomains.excel.applib.IsisModuleSubdomainsExcelApplib;
+import org.apache.isis.extensions.excel.applib.IsisModuleSubdomainsExcelApplib;
/**
* @since 2.0 {@index}
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 90302c3a0a..ce28fd4521 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -65,6 +65,31 @@
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-excel-applib</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-excel-testing</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-excel-fixture</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-excel-integtests</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+
+
<dependency>
<groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-command-log-applib</artifactId>
@@ -218,6 +243,8 @@
</dependencies>
<modules>
+ <module>applib/excel</module>
+
<module>core/command-log</module>
<module>core/command-replay</module>
<module>core/flyway</module>
diff --git a/subdomains/excel/adoc/modules/excel/partials/module-nav.adoc b/subdomains/excel/adoc/modules/excel/partials/module-nav.adoc
deleted file mode 100644
index 5d12265e2f..0000000000
--- a/subdomains/excel/adoc/modules/excel/partials/module-nav.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-* xref:subdomains:excel:about.adoc[Excel Library]
-
-
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index 7a82e5ed04..5553f21a24 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -64,22 +64,22 @@
<dependency>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-excel-applib</artifactId>
+ <artifactId>isis-extensions-excel-applib</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-excel-testing</artifactId>
+ <artifactId>isis-extensions-excel-testing</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-excel-fixtures</artifactId>
+ <artifactId>isis-extensions-excel-fixtures</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-excel-integtests</artifactId>
+ <artifactId>isis-extensions-excel-integtests</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
[isis] 06/06: ISIS-3001: fixes some compile issues
Posted by da...@apache.org.
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 3c05149659e7db43771fb0b5d74531c77391e81b
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Apr 14 16:14:03 2022 +0100
ISIS-3001: fixes some compile issues
---
.../isis/extensions/excel/fixtures/IsisModuleExtExcelFixtures.java | 2 +-
.../demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java | 4 ++--
.../extensions/excel/integtests/ExcelModuleIntegTestAbstract.java | 6 +-----
.../java/org/apache/isis/extensions/excel/testing/ExcelFixture.java | 4 ++--
.../org/apache/isis/extensions/excel/testing/ExcelFixture2.java | 4 ++--
.../isis/extensions/excel/testing/IsisModuleExtExcelTesting.java | 6 +++---
6 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/IsisModuleExtExcelFixtures.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/IsisModuleExtExcelFixtures.java
index bcb9750699..60e9a82d09 100644
--- a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/IsisModuleExtExcelFixtures.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/IsisModuleExtExcelFixtures.java
@@ -22,7 +22,7 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.excel.applib.IsisModuleSubdomainsExcelApplib;
+import org.apache.isis.extensions.excel.applib.IsisModuleExtExcelApplib;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown;
import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
index 660b6fe2f8..ecf89c65cc 100644
--- a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
@@ -53,8 +53,8 @@ import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
-import static org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem.Predicates.thoseCategorised;
-import static org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem.Predicates.thoseCompleted;
+import static org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem.Predicates.thoseCategorised;
+import static org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem.Predicates.thoseCompleted;
import lombok.Getter;
import lombok.Setter;
diff --git a/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java b/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
index c26e7d41be..ec93666698 100644
--- a/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
+++ b/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
@@ -29,9 +29,9 @@ import org.springframework.transaction.annotation.Transactional;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
+import org.apache.isis.extensions.excel.fixtures.IsisModuleExtExcelFixtures;
import org.apache.isis.persistence.jdo.applib.IsisModulePersistenceJdoApplib;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
-import org.apache.isis.extensions.excel.fixtures.IsisModuleSubdomainsExcelFixtures;
import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
@@ -54,10 +54,6 @@ public abstract class ExcelModuleIntegTestAbstract extends IsisIntegrationTestAb
IsisModulePersistenceJdoApplib.class,
IsisModuleTestingFixturesApplib.class,
- /*
- new ExcelFixturesModule(),
- FakeDataModule.class
- */
IsisModuleExtExcelFixtures.class
})
public static class AppManifest {
diff --git a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture.java b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture.java
index bc2d230ddb..970642bc0e 100644
--- a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture.java
+++ b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture.java
@@ -40,7 +40,7 @@ import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.extensions.excel.applib.IsisModuleSubdomainsExcelApplib;
+import org.apache.isis.extensions.excel.applib.IsisModuleExtExcelApplib;
import org.apache.isis.extensions.excel.applib.dom.ExcelService;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureResultList;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
@@ -61,7 +61,7 @@ import lombok.val;
)
public class ExcelFixture extends FixtureScript {
- public final static String LOGICAL_TYPE_NAME = IsisModuleSubdomainsExcelApplib.NAMESPACE + ".ExcelFixture";
+ public final static String LOGICAL_TYPE_NAME = IsisModuleExtExcelApplib.NAMESPACE + ".ExcelFixture";
@Inject SpecificationLoader specLoader;
@Inject ExcelService excelService;
diff --git a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture2.java b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture2.java
index d785a5b9da..e75b9c2347 100644
--- a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture2.java
+++ b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture2.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.commons.internal.base._Bytes;
-import org.apache.isis.extensions.excel.applib.IsisModuleSubdomainsExcelApplib;
+import org.apache.isis.extensions.excel.applib.IsisModuleExtExcelApplib;
import org.apache.isis.extensions.excel.applib.dom.ExcelService;
import org.apache.isis.extensions.excel.applib.dom.WorksheetSpec;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
@@ -50,7 +50,7 @@ import lombok.val;
)
public class ExcelFixture2 extends FixtureScript {
- public final static String LOGICAL_TYPE_NAME = IsisModuleSubdomainsExcelApplib.NAMESPACE + ".ExcelFixture2";
+ public final static String LOGICAL_TYPE_NAME = IsisModuleExtExcelApplib.NAMESPACE + ".ExcelFixture2";
/**
* Input, optional: defines the name of the resource.
diff --git a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/IsisModuleExtExcelTesting.java b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/IsisModuleExtExcelTesting.java
index ca3e50c13e..a15c5994be 100644
--- a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/IsisModuleExtExcelTesting.java
+++ b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/IsisModuleExtExcelTesting.java
@@ -22,13 +22,13 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.excel.applib.IsisModuleSubdomainsExcelApplib;
+import org.apache.isis.extensions.excel.applib.IsisModuleExtExcelApplib;
/**
* @since 2.0 {@index}
*/
@Configuration
-@Import({IsisModuleSubdomainsExcelApplib.class})
+@Import({IsisModuleExtExcelApplib.class})
@ComponentScan
-public class IsisModuleSubdomainsExcelTesting {
+public class IsisModuleExtExcelTesting {
}