You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/07 20:08:43 UTC
[isis] 03/05: ISIS-2259: fixes compile issues.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit cad702ba37f5e59a95ae80a2539ced0cee770926
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jan 7 17:51:48 2020 +0000
ISIS-2259: fixes compile issues.
---
core-parent/pom.xml | 9 ++-
extensions/pom.xml | 18 -----
legacy/extensions/core/applib/pom.xml | 2 +-
legacy/extensions/core/commons/pom.xml | 2 +-
legacy/extensions/core/metamodel/pom.xml | 2 +-
legacy/extensions/core/runtime/pom.xml | 2 +-
starters/pom.xml | 16 ++++
subdomains/xdocreport/impl/pom.xml | 2 +-
subdomains/zip/impl/pom.xml | 2 +-
{extensions/vw => valuetypes}/asciidoc/pom.xml | 14 ++--
.../asciidoc}/src/main/doc/antora.yml | 0
.../main/doc/modules/asciidoc}/_attributes.adoc | 0
.../src/main/doc/modules/asciidoc}/nav.adoc | 0
.../doc/modules/asciidoc/pages}/_attributes.adoc | 0
.../src/main/doc/modules/asciidoc/pages/about.adoc | 0
.../modules/asciidoc/partials}/_attributes.adoc | 0
.../doc/modules/asciidoc/partials/module-nav.adoc | 0
.../applib/IsisModuleExtAsciidocApplib.java | 0
.../extensions/asciidoc/applib/value/AsciiDoc.java | 0
.../asciidoc/ui/IsisModuleExtAsciidocUi.java | 0
.../asciidoc/ui/components/AsciiDocComponent.java | 0
.../AsciiDocPanelFactoriesForWicket.java | 0
.../asciidoc}/ui/components/css/prism.css | 0
.../asciidoc}/ui/components/js/prism1.14.js | 0
.../asciidoc/ui/converter/AsciiDocConverter.java | 0
{extensions/vw => valuetypes}/markdown/pom.xml | 14 ++--
.../markdown/src/main/doc/antora.yml | 0
.../src/main/doc/modules/markdown/_attributes.adoc | 0
.../src/main/doc/modules/markdown}/nav.adoc | 0
.../doc/modules/markdown/pages}/_attributes.adoc | 0
.../src/main/doc/modules/markdown/pages/about.adoc | 0
.../modules/markdown/partials}/_attributes.adoc | 0
.../doc/modules/markdown/partials/module-nav.adoc | 0
.../applib/IsisModuleExtMarkdownApplib.java | 0
.../extensions/markdown/applib/value/Markdown.java | 0
.../markdown/ui/IsisModuleExtMarkdownUi.java | 0
.../markdown/ui/components/MarkdownComponent.java | 0
.../MarkdownPanelFactoriesForWicket.java | 0
.../markdown}/ui/components/css/prism.css | 0
.../markdown}/ui/components/js/prism1.14.js | 0
.../markdown/ui/converter/MarkdownConverter.java | 0
{extensions => valuetypes}/pom.xml | 94 ++++------------------
{extensions/vw => valuetypes}/sse/pom.xml | 14 ++--
.../sse}/src/main/doc/antora.yml | 0
.../sse/src/main/doc/modules/sse}/_attributes.adoc | 0
.../sse/src/main/doc/modules/sse/nav.adoc | 0
.../main/doc/modules/sse/pages}/_attributes.adoc | 0
.../sse/src/main/doc/modules/sse/pages/about.adoc | 0
.../doc/modules/sse/partials}/_attributes.adoc | 0
.../main/doc/modules/sse/partials/module-nav.adoc | 0
.../isis/extensions/sse/IsisModuleExtSse.java | 0
.../isis/extensions/sse/SseMetaModelPlugin.java | 0
.../isis/extensions/sse/api/ServerSentEvents.java | 0
.../apache/isis/extensions/sse/api/SseChannel.java | 0
.../apache/isis/extensions/sse/api/SseService.java | 0
.../apache/isis/extensions/sse/api/SseSource.java | 0
.../sse/facets/SseAnnotationFacetFactory.java | 0
.../extensions/sse/facets/SseObserveFacet.java | 0
.../sse/facets/SseObserveFacetAbstract.java | 0
...eObserveFacetForServerSentEventsAnnotation.java | 0
.../extensions/sse/markup/ListeningMarkup.java | 0
.../sse/markup/ListeningMarkupComponent.java | 0
.../markup/ListeningMarkupComponent_observing.java | 0
.../ListeningMarkupPanelFactoriesForWicket.java | 0
.../extensions/sse/markup/js/ObservingComponent.js | 0
.../extensions/sse/services/SseServiceDefault.java | 0
.../sse/webmodule/ServerSentEventsServlet.java | 0
.../sse/webmodule/WebModuleServerSentEvents.java | 0
68 files changed, 65 insertions(+), 126 deletions(-)
diff --git a/core-parent/pom.xml b/core-parent/pom.xml
index bdf6361..26d544a 100644
--- a/core-parent/pom.xml
+++ b/core-parent/pom.xml
@@ -806,14 +806,15 @@ under the License.
</activation>
<modules>
<module>../core</module>
- <module>../mavendeps</module>
- <module>../testing</module>
<module>../extensions</module>
- <module>../subdomains</module>
- <module>../mappings</module>
<module>../incubator</module>
<module>../legacy</module>
+ <module>../mappings</module>
+ <module>../mavendeps</module>
<module>../starters</module>
+ <module>../subdomains</module>
+ <module>../testing</module>
+ <module>../valuetypes</module>
</modules>
</profile>
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 7f79ec3..361169d 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -64,21 +64,11 @@
<dependency>
<groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-asciidoc</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-exceldownload</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-markdown</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-secman</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -122,11 +112,6 @@
<artifactId>isis-extensions-cors</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-sse</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
- </dependency>
<!-- testing -->
<dependency>
@@ -148,10 +133,7 @@
<module>vro/cors</module>
- <module>vw/asciidoc</module>
<module>vw/exceldownload</module>
- <module>vw/markdown</module>
- <module>vw/sse</module>
</modules>
diff --git a/legacy/extensions/core/applib/pom.xml b/legacy/extensions/core/applib/pom.xml
index 9e0a6dc..c08d24c 100644
--- a/legacy/extensions/core/applib/pom.xml
+++ b/legacy/extensions/core/applib/pom.xml
@@ -18,7 +18,7 @@
<groupId>org.apache.isis.legacy</groupId>
<artifactId>isis-legacy</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>isis-legacy-applib</artifactId>
diff --git a/legacy/extensions/core/commons/pom.xml b/legacy/extensions/core/commons/pom.xml
index 5207004..20749aa 100644
--- a/legacy/extensions/core/commons/pom.xml
+++ b/legacy/extensions/core/commons/pom.xml
@@ -18,7 +18,7 @@
<groupId>org.apache.isis.legacy</groupId>
<artifactId>isis-legacy</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>isis-legacy-commons</artifactId>
diff --git a/legacy/extensions/core/metamodel/pom.xml b/legacy/extensions/core/metamodel/pom.xml
index 7f64071..564f6d1 100644
--- a/legacy/extensions/core/metamodel/pom.xml
+++ b/legacy/extensions/core/metamodel/pom.xml
@@ -18,7 +18,7 @@
<groupId>org.apache.isis.legacy</groupId>
<artifactId>isis-legacy</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>isis-legacy-metamodel</artifactId>
diff --git a/legacy/extensions/core/runtime/pom.xml b/legacy/extensions/core/runtime/pom.xml
index 35294b4..240a8e1 100644
--- a/legacy/extensions/core/runtime/pom.xml
+++ b/legacy/extensions/core/runtime/pom.xml
@@ -18,7 +18,7 @@
<groupId>org.apache.isis.legacy</groupId>
<artifactId>isis-legacy</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>isis-legacy-runtime</artifactId>
diff --git a/starters/pom.xml b/starters/pom.xml
index a21bd62..1a94578 100644
--- a/starters/pom.xml
+++ b/starters/pom.xml
@@ -118,6 +118,14 @@ under the License.
</dependency>
<dependency>
+ <groupId>org.apache.isis.subdomains</groupId>
+ <artifactId>isis-subdomains</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.isis.testing</groupId>
<artifactId>isis-testing</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
@@ -126,6 +134,14 @@ under the License.
</dependency>
<dependency>
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
<groupId>com.approvaltests</groupId>
<artifactId>approvaltests</artifactId>
<version>${approvaltests.version}</version>
diff --git a/subdomains/xdocreport/impl/pom.xml b/subdomains/xdocreport/impl/pom.xml
index 2705705..c359d1d 100644
--- a/subdomains/xdocreport/impl/pom.xml
+++ b/subdomains/xdocreport/impl/pom.xml
@@ -18,7 +18,7 @@
<groupId>org.apache.isis.subdomains</groupId>
<artifactId>isis-subdomains</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>isis-subdomains-xdocreport-dom</artifactId>
diff --git a/subdomains/zip/impl/pom.xml b/subdomains/zip/impl/pom.xml
index cb9a2e0..2fcad09 100644
--- a/subdomains/zip/impl/pom.xml
+++ b/subdomains/zip/impl/pom.xml
@@ -18,7 +18,7 @@
<groupId>org.apache.isis.subdomains</groupId>
<artifactId>isis-subdomains</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>isis-subdomains-zip-dom</artifactId>
diff --git a/extensions/vw/asciidoc/pom.xml b/valuetypes/asciidoc/pom.xml
similarity index 90%
rename from extensions/vw/asciidoc/pom.xml
rename to valuetypes/asciidoc/pom.xml
index 2b6c841..dd50ae9 100644
--- a/extensions/vw/asciidoc/pom.xml
+++ b/valuetypes/asciidoc/pom.xml
@@ -15,19 +15,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions</artifactId>
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>isis-extensions-asciidoc</artifactId>
- <name>Apache Isis Ext - Asciidoctor Bundle</name>
+ <artifactId>isis-valuetypes-asciidoc</artifactId>
+ <name>Apache Isis Val - Asciidoctor</name>
<description></description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.extensions.asciidoc</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/asciidoc</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.asciidoc</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/valuetypes/asciidoc</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/extensions/vw/sse/src/main/doc/antora.yml b/valuetypes/asciidoc/src/main/doc/antora.yml
similarity index 100%
rename from extensions/vw/sse/src/main/doc/antora.yml
rename to valuetypes/asciidoc/src/main/doc/antora.yml
diff --git a/extensions/vw/sse/src/main/doc/modules/sse/_attributes.adoc b/valuetypes/asciidoc/src/main/doc/modules/asciidoc/_attributes.adoc
similarity index 100%
rename from extensions/vw/sse/src/main/doc/modules/sse/_attributes.adoc
rename to valuetypes/asciidoc/src/main/doc/modules/asciidoc/_attributes.adoc
diff --git a/extensions/vw/markdown/src/main/doc/modules/markdown/nav.adoc b/valuetypes/asciidoc/src/main/doc/modules/asciidoc/nav.adoc
similarity index 100%
rename from extensions/vw/markdown/src/main/doc/modules/markdown/nav.adoc
rename to valuetypes/asciidoc/src/main/doc/modules/asciidoc/nav.adoc
diff --git a/extensions/vw/sse/src/main/doc/modules/sse/partials/_attributes.adoc b/valuetypes/asciidoc/src/main/doc/modules/asciidoc/pages/_attributes.adoc
similarity index 100%
rename from extensions/vw/sse/src/main/doc/modules/sse/partials/_attributes.adoc
rename to valuetypes/asciidoc/src/main/doc/modules/asciidoc/pages/_attributes.adoc
diff --git a/extensions/vw/asciidoc/src/main/doc/modules/asciidoc/pages/about.adoc b/valuetypes/asciidoc/src/main/doc/modules/asciidoc/pages/about.adoc
similarity index 100%
rename from extensions/vw/asciidoc/src/main/doc/modules/asciidoc/pages/about.adoc
rename to valuetypes/asciidoc/src/main/doc/modules/asciidoc/pages/about.adoc
diff --git a/extensions/vw/sse/src/main/doc/modules/sse/pages/_attributes.adoc b/valuetypes/asciidoc/src/main/doc/modules/asciidoc/partials/_attributes.adoc
similarity index 100%
rename from extensions/vw/sse/src/main/doc/modules/sse/pages/_attributes.adoc
rename to valuetypes/asciidoc/src/main/doc/modules/asciidoc/partials/_attributes.adoc
diff --git a/extensions/vw/asciidoc/src/main/doc/modules/asciidoc/partials/module-nav.adoc b/valuetypes/asciidoc/src/main/doc/modules/asciidoc/partials/module-nav.adoc
similarity index 100%
rename from extensions/vw/asciidoc/src/main/doc/modules/asciidoc/partials/module-nav.adoc
rename to valuetypes/asciidoc/src/main/doc/modules/asciidoc/partials/module-nav.adoc
diff --git a/extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/IsisModuleExtAsciidocApplib.java b/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/IsisModuleExtAsciidocApplib.java
similarity index 100%
rename from extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/IsisModuleExtAsciidocApplib.java
rename to valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/IsisModuleExtAsciidocApplib.java
diff --git a/extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/value/AsciiDoc.java b/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/value/AsciiDoc.java
similarity index 100%
rename from extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/value/AsciiDoc.java
rename to valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/value/AsciiDoc.java
diff --git a/extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/IsisModuleExtAsciidocUi.java b/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/IsisModuleExtAsciidocUi.java
similarity index 100%
rename from extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/IsisModuleExtAsciidocUi.java
rename to valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/IsisModuleExtAsciidocUi.java
diff --git a/extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocComponent.java b/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocComponent.java
similarity index 100%
rename from extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocComponent.java
rename to valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocComponent.java
diff --git a/extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java b/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java
similarity index 100%
rename from extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java
rename to valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java
diff --git a/extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/css/prism.css b/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/css/prism.css
similarity index 100%
rename from extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/css/prism.css
rename to valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/css/prism.css
diff --git a/extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/js/prism1.14.js b/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/js/prism1.14.js
similarity index 100%
rename from extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/js/prism1.14.js
rename to valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/js/prism1.14.js
diff --git a/extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/converter/AsciiDocConverter.java b/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/converter/AsciiDocConverter.java
similarity index 100%
rename from extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/converter/AsciiDocConverter.java
rename to valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/converter/AsciiDocConverter.java
diff --git a/extensions/vw/markdown/pom.xml b/valuetypes/markdown/pom.xml
similarity index 84%
rename from extensions/vw/markdown/pom.xml
rename to valuetypes/markdown/pom.xml
index e6abfb9..e3a879a 100644
--- a/extensions/vw/markdown/pom.xml
+++ b/valuetypes/markdown/pom.xml
@@ -15,19 +15,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions</artifactId>
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>isis-extensions-markdown</artifactId>
- <name>Apache Isis Ext - Markdown Bundle</name>
+ <artifactId>isis-valuetypes-markdown</artifactId>
+ <name>Apache Isis Val - Markdown</name>
<description></description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.extensions.markdown</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/markdown</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.markdown</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/valuetypes/markdown</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/extensions/vw/markdown/src/main/doc/antora.yml b/valuetypes/markdown/src/main/doc/antora.yml
similarity index 100%
rename from extensions/vw/markdown/src/main/doc/antora.yml
rename to valuetypes/markdown/src/main/doc/antora.yml
diff --git a/extensions/vw/markdown/src/main/doc/modules/markdown/_attributes.adoc b/valuetypes/markdown/src/main/doc/modules/markdown/_attributes.adoc
similarity index 100%
rename from extensions/vw/markdown/src/main/doc/modules/markdown/_attributes.adoc
rename to valuetypes/markdown/src/main/doc/modules/markdown/_attributes.adoc
diff --git a/extensions/vw/asciidoc/src/main/doc/modules/asciidoc/nav.adoc b/valuetypes/markdown/src/main/doc/modules/markdown/nav.adoc
similarity index 100%
rename from extensions/vw/asciidoc/src/main/doc/modules/asciidoc/nav.adoc
rename to valuetypes/markdown/src/main/doc/modules/markdown/nav.adoc
diff --git a/extensions/vw/markdown/src/main/doc/modules/markdown/partials/_attributes.adoc b/valuetypes/markdown/src/main/doc/modules/markdown/pages/_attributes.adoc
similarity index 100%
rename from extensions/vw/markdown/src/main/doc/modules/markdown/partials/_attributes.adoc
rename to valuetypes/markdown/src/main/doc/modules/markdown/pages/_attributes.adoc
diff --git a/extensions/vw/markdown/src/main/doc/modules/markdown/pages/about.adoc b/valuetypes/markdown/src/main/doc/modules/markdown/pages/about.adoc
similarity index 100%
rename from extensions/vw/markdown/src/main/doc/modules/markdown/pages/about.adoc
rename to valuetypes/markdown/src/main/doc/modules/markdown/pages/about.adoc
diff --git a/extensions/vw/markdown/src/main/doc/modules/markdown/pages/_attributes.adoc b/valuetypes/markdown/src/main/doc/modules/markdown/partials/_attributes.adoc
similarity index 100%
rename from extensions/vw/markdown/src/main/doc/modules/markdown/pages/_attributes.adoc
rename to valuetypes/markdown/src/main/doc/modules/markdown/partials/_attributes.adoc
diff --git a/extensions/vw/markdown/src/main/doc/modules/markdown/partials/module-nav.adoc b/valuetypes/markdown/src/main/doc/modules/markdown/partials/module-nav.adoc
similarity index 100%
rename from extensions/vw/markdown/src/main/doc/modules/markdown/partials/module-nav.adoc
rename to valuetypes/markdown/src/main/doc/modules/markdown/partials/module-nav.adoc
diff --git a/extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/IsisModuleExtMarkdownApplib.java b/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/IsisModuleExtMarkdownApplib.java
similarity index 100%
rename from extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/IsisModuleExtMarkdownApplib.java
rename to valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/IsisModuleExtMarkdownApplib.java
diff --git a/extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/value/Markdown.java b/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/value/Markdown.java
similarity index 100%
rename from extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/value/Markdown.java
rename to valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/value/Markdown.java
diff --git a/extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/IsisModuleExtMarkdownUi.java b/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/IsisModuleExtMarkdownUi.java
similarity index 100%
rename from extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/IsisModuleExtMarkdownUi.java
rename to valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/IsisModuleExtMarkdownUi.java
diff --git a/extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownComponent.java b/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownComponent.java
similarity index 100%
rename from extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownComponent.java
rename to valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownComponent.java
diff --git a/extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownPanelFactoriesForWicket.java b/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownPanelFactoriesForWicket.java
similarity index 100%
rename from extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownPanelFactoriesForWicket.java
rename to valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownPanelFactoriesForWicket.java
diff --git a/extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/css/prism.css b/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/css/prism.css
similarity index 100%
rename from extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/css/prism.css
rename to valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/css/prism.css
diff --git a/extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/js/prism1.14.js b/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/js/prism1.14.js
similarity index 100%
rename from extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/js/prism1.14.js
rename to valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/js/prism1.14.js
diff --git a/extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/converter/MarkdownConverter.java b/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/converter/MarkdownConverter.java
similarity index 100%
rename from extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/converter/MarkdownConverter.java
rename to valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/converter/MarkdownConverter.java
diff --git a/extensions/pom.xml b/valuetypes/pom.xml
similarity index 62%
copy from extensions/pom.xml
copy to valuetypes/pom.xml
index 7f79ec3..d5314a8 100644
--- a/extensions/pom.xml
+++ b/valuetypes/pom.xml
@@ -21,20 +21,19 @@
<relativePath>../core/pom.xml</relativePath>
</parent>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions</artifactId>
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes</artifactId>
- <name>Apache Isis Extensions</name>
+ <name>Apache Isis Value types</name>
<description>
- Extensions to the Apache Isis framework itself.
- These are _not_ intended to be called by the domain logic of an Apache Isis application (see instead org.apache.isis.platform).
+ Value types for use within Apache Isis applications.
</description>
<packaging>pom</packaging>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.extensions</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.valuetypes</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/valuetypes</git-plugin.propertiesDir>
</properties>
<build>
@@ -63,96 +62,36 @@
<dependencies>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-asciidoc</artifactId>
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes-asciidoc</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-exceldownload</artifactId>
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes-markdown</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-markdown</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman-model</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman-encryption-jbcrypt</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman-persistence-jdo</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman-shiro-realm</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-shiro-realm-ldap</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-h2console-dom</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-hsqldbmgr-dom</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-cors</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-sse</artifactId>
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes-sse</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<!-- testing -->
+
<dependency>
<groupId>org.apache.isis.testing</groupId>
<artifactId>isis-testing-fixtures</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
-
</dependencies>
</dependencyManagement>
<modules>
- <module>persistence/h2console/impl</module>
- <module>persistence/hsqldbmgr/impl</module>
-
- <module>security/secman</module>
- <module>security/shiro-realm-ldap</module>
-
- <module>vro/cors</module>
-
- <module>vw/asciidoc</module>
- <module>vw/exceldownload</module>
- <module>vw/markdown</module>
- <module>vw/sse</module>
-
+ <module>asciidoc</module>
+ <module>markdown</module>
+ <module>sse</module>
</modules>
<profiles>
@@ -229,6 +168,7 @@
</profile>
</profiles>
+
</project>
diff --git a/extensions/vw/sse/pom.xml b/valuetypes/sse/pom.xml
similarity index 82%
rename from extensions/vw/sse/pom.xml
rename to valuetypes/sse/pom.xml
index b943584..ebbfd1c 100644
--- a/extensions/vw/sse/pom.xml
+++ b/valuetypes/sse/pom.xml
@@ -15,19 +15,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions</artifactId>
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>isis-extensions-sse</artifactId>
- <name>Apache Isis Ext - Server Sent Events</name>
+ <artifactId>isis-valuetypes-sse</artifactId>
+ <name>Apache Isis Val - Server Sent Events</name>
<description></description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.extensions.sse</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/sse</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.sse</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/valuetypes/sse</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/extensions/vw/asciidoc/src/main/doc/antora.yml b/valuetypes/sse/src/main/doc/antora.yml
similarity index 100%
rename from extensions/vw/asciidoc/src/main/doc/antora.yml
rename to valuetypes/sse/src/main/doc/antora.yml
diff --git a/extensions/vw/asciidoc/src/main/doc/modules/asciidoc/_attributes.adoc b/valuetypes/sse/src/main/doc/modules/sse/_attributes.adoc
similarity index 100%
rename from extensions/vw/asciidoc/src/main/doc/modules/asciidoc/_attributes.adoc
rename to valuetypes/sse/src/main/doc/modules/sse/_attributes.adoc
diff --git a/extensions/vw/sse/src/main/doc/modules/sse/nav.adoc b/valuetypes/sse/src/main/doc/modules/sse/nav.adoc
similarity index 100%
rename from extensions/vw/sse/src/main/doc/modules/sse/nav.adoc
rename to valuetypes/sse/src/main/doc/modules/sse/nav.adoc
diff --git a/extensions/vw/asciidoc/src/main/doc/modules/asciidoc/partials/_attributes.adoc b/valuetypes/sse/src/main/doc/modules/sse/pages/_attributes.adoc
similarity index 100%
rename from extensions/vw/asciidoc/src/main/doc/modules/asciidoc/partials/_attributes.adoc
rename to valuetypes/sse/src/main/doc/modules/sse/pages/_attributes.adoc
diff --git a/extensions/vw/sse/src/main/doc/modules/sse/pages/about.adoc b/valuetypes/sse/src/main/doc/modules/sse/pages/about.adoc
similarity index 100%
rename from extensions/vw/sse/src/main/doc/modules/sse/pages/about.adoc
rename to valuetypes/sse/src/main/doc/modules/sse/pages/about.adoc
diff --git a/extensions/vw/asciidoc/src/main/doc/modules/asciidoc/pages/_attributes.adoc b/valuetypes/sse/src/main/doc/modules/sse/partials/_attributes.adoc
similarity index 100%
rename from extensions/vw/asciidoc/src/main/doc/modules/asciidoc/pages/_attributes.adoc
rename to valuetypes/sse/src/main/doc/modules/sse/partials/_attributes.adoc
diff --git a/extensions/vw/sse/src/main/doc/modules/sse/partials/module-nav.adoc b/valuetypes/sse/src/main/doc/modules/sse/partials/module-nav.adoc
similarity index 100%
rename from extensions/vw/sse/src/main/doc/modules/sse/partials/module-nav.adoc
rename to valuetypes/sse/src/main/doc/modules/sse/partials/module-nav.adoc
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/IsisModuleExtSse.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/IsisModuleExtSse.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/IsisModuleExtSse.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/IsisModuleExtSse.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/SseMetaModelPlugin.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/SseMetaModelPlugin.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/SseMetaModelPlugin.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/SseMetaModelPlugin.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/api/ServerSentEvents.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/ServerSentEvents.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/api/ServerSentEvents.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/ServerSentEvents.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/api/SseChannel.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/SseChannel.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/api/SseChannel.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/SseChannel.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/api/SseService.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/SseService.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/api/SseService.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/SseService.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/api/SseSource.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/SseSource.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/api/SseSource.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/SseSource.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseAnnotationFacetFactory.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseAnnotationFacetFactory.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseAnnotationFacetFactory.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseAnnotationFacetFactory.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacet.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacet.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacet.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacet.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetAbstract.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetAbstract.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetAbstract.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetAbstract.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetForServerSentEventsAnnotation.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetForServerSentEventsAnnotation.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetForServerSentEventsAnnotation.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetForServerSentEventsAnnotation.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkup.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkup.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkup.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkup.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent_observing.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent_observing.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent_observing.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent_observing.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupPanelFactoriesForWicket.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupPanelFactoriesForWicket.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupPanelFactoriesForWicket.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupPanelFactoriesForWicket.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/js/ObservingComponent.js b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/js/ObservingComponent.js
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/js/ObservingComponent.js
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/js/ObservingComponent.js
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/ServerSentEventsServlet.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/ServerSentEventsServlet.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/ServerSentEventsServlet.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/ServerSentEventsServlet.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/WebModuleServerSentEvents.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/WebModuleServerSentEvents.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/WebModuleServerSentEvents.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/WebModuleServerSentEvents.java