You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/10 12:56:51 UTC
[isis] 05/22: ISIS-2259: reorg markdown module
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 4ea128967bff70b5792d9a6d62f0de7cd792f26f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 11:56:00 2020 +0000
ISIS-2259: reorg markdown module
---
valuetypes/asciidoc/applib/pom.xml | 4 +-
valuetypes/asciidoc/pom.xml | 4 ++
valuetypes/asciidoc/ui/pom.xml | 2 +-
valuetypes/{asciidoc => markdown}/applib/pom.xml | 18 ++++----
.../applib/IsisModuleValMarkdownApplib.java | 7 ++++
.../markdown/applib/value/Converter.java} | 4 +-
.../markdown/applib/value/Markdown.java | 5 +--
valuetypes/markdown/pom.xml | 48 +++++-----------------
.../applib/IsisModuleExtMarkdownApplib.java | 7 ----
valuetypes/markdown/{ => ui}/pom.xml | 20 +++++----
.../markdown/ui/IsisModuleValMarkdownUi.java} | 10 ++---
.../markdown/ui/components/MarkdownComponent.java | 2 +-
.../MarkdownPanelFactoriesForWicket.java | 4 +-
.../markdown/ui/components/css/prism.css | 0
.../markdown/ui/components/js/prism1.14.js | 0
valuetypes/pom.xml | 13 ++++--
16 files changed, 68 insertions(+), 80 deletions(-)
diff --git a/valuetypes/asciidoc/applib/pom.xml b/valuetypes/asciidoc/applib/pom.xml
index 21dc281..6610333 100644
--- a/valuetypes/asciidoc/applib/pom.xml
+++ b/valuetypes/asciidoc/applib/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-valuetypes-asciidoc-applib</artifactId>
- <name>Apache Isis Val - Asciidoctor</name>
+ <name>Apache Isis Val - Asciidoctor (applib)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.valuetypes.asciidoc.applib</jar-plugin.automaticModuleName>
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj-api</artifactId>
- <version>2.1.0</version>
+ <version>${asciidoctorj.version}</version>
</dependency>
</dependencies>
diff --git a/valuetypes/asciidoc/pom.xml b/valuetypes/asciidoc/pom.xml
index e895e4a..389838c 100644
--- a/valuetypes/asciidoc/pom.xml
+++ b/valuetypes/asciidoc/pom.xml
@@ -28,6 +28,10 @@
<packaging>pom</packaging>
+ <properties>
+ <asciidoctorj.version>2.1.0</asciidoctorj.version>
+ </properties>
+
<modules>
<module>applib</module>
<module>ui</module>
diff --git a/valuetypes/asciidoc/ui/pom.xml b/valuetypes/asciidoc/ui/pom.xml
index 4805ea3..1e82885 100644
--- a/valuetypes/asciidoc/ui/pom.xml
+++ b/valuetypes/asciidoc/ui/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj</artifactId>
- <version>2.1.0</version>
+ <version>${asciidoctorj.version}</version>
<exclusions>
<!-- convergence issues -->
<exclusion>
diff --git a/valuetypes/asciidoc/applib/pom.xml b/valuetypes/markdown/applib/pom.xml
similarity index 72%
copy from valuetypes/asciidoc/applib/pom.xml
copy to valuetypes/markdown/applib/pom.xml
index 21dc281..1332a1f 100644
--- a/valuetypes/asciidoc/applib/pom.xml
+++ b/valuetypes/markdown/applib/pom.xml
@@ -16,16 +16,16 @@
<parent>
<groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes-asciidoc</artifactId>
+ <artifactId>isis-valuetypes-markdown</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</parent>
- <artifactId>isis-valuetypes-asciidoc-applib</artifactId>
- <name>Apache Isis Val - Asciidoctor</name>
+ <artifactId>isis-valuetypes-markdown-applib</artifactId>
+ <name>Apache Isis Val - Markdown (applib)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.asciidoc.applib</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/valuetypes/asciidoc/applib</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.markdown.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/valuetypes/markdown/applib</git-plugin.propertiesDir>
</properties>
<dependencies>
@@ -36,9 +36,11 @@
</dependency>
<dependency>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctorj-api</artifactId>
- <version>2.1.0</version>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>flexmark-all</artifactId>
+ <version>${flexmark.version}</version>
+ <!-- avoid polluting the classpath -->
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/IsisModuleValMarkdownApplib.java b/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/IsisModuleValMarkdownApplib.java
new file mode 100644
index 0000000..3684c81
--- /dev/null
+++ b/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/IsisModuleValMarkdownApplib.java
@@ -0,0 +1,7 @@
+package org.apache.isis.valuetypes.markdown.applib;
+
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class IsisModuleValMarkdownApplib {
+}
diff --git a/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/converter/MarkdownConverter.java b/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/value/Converter.java
similarity index 96%
rename from valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/converter/MarkdownConverter.java
rename to valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/value/Converter.java
index 11b1bf5..3b25de1 100644
--- a/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/converter/MarkdownConverter.java
+++ b/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/value/Converter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.markdown.ui.converter;
+package org.apache.isis.valuetypes.markdown.applib.value;
import java.util.Arrays;
@@ -26,7 +26,7 @@ import com.vladsch.flexmark.html.HtmlRenderer;
import com.vladsch.flexmark.parser.Parser;
import com.vladsch.flexmark.util.options.MutableDataSet;
-public final class MarkdownConverter {
+public final class Converter {
/**
* For syntax highlighting to work, the client/browser needs to load specific
diff --git a/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/value/Markdown.java b/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/value/Markdown.java
similarity index 87%
rename from valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/value/Markdown.java
rename to valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/value/Markdown.java
index 931dde6..807ffec 100644
--- a/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/value/Markdown.java
+++ b/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/value/Markdown.java
@@ -16,11 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.markdown.applib.value;
+package org.apache.isis.valuetypes.markdown.applib.value;
import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.value.Markup;
-import org.apache.isis.extensions.markdown.ui.converter.MarkdownConverter;
/**
* Immutable value type holding pre-rendered HTML.
@@ -33,7 +32,7 @@ public class Markdown extends Markup {
private static final long serialVersionUID = 1L;
public static Markdown valueOfMarkdown(String asciiDoc) {
- return valueOfHtml(MarkdownConverter.mdToHtml(asciiDoc));
+ return valueOfHtml(Converter.mdToHtml(asciiDoc));
}
public static Markdown valueOfHtml(String html) {
diff --git a/valuetypes/markdown/pom.xml b/valuetypes/markdown/pom.xml
index e3a879a..6b0d833 100644
--- a/valuetypes/markdown/pom.xml
+++ b/valuetypes/markdown/pom.xml
@@ -18,49 +18,23 @@
<groupId>org.apache.isis.valuetypes</groupId>
<artifactId>isis-valuetypes</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>isis-valuetypes-markdown</artifactId>
- <name>Apache Isis Val - Markdown</name>
- <description></description>
+ <name>Apache Isis Val - Markdown (parent)</name>
+ <description>
+ Markdown value type.
+ </description>
+
+ <packaging>pom</packaging>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.markdown</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/valuetypes/markdown</git-plugin.propertiesDir>
+ <flexmark.version>0.34.32</flexmark.version>
</properties>
- <dependencies>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-viewer-wicket-ui</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- provides a markdown parser -->
- <dependency>
- <groupId>com.vladsch.flexmark</groupId>
- <artifactId>flexmark-all</artifactId>
- <version>0.34.32</version>
- <exclusions>
- <exclusion>
- <groupId>org.jsoup</groupId>
- <artifactId>jsoup</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jsoup</groupId>
- <artifactId>jsoup</artifactId>
- <version>1.10.2</version>
- </dependency>
-
- </dependencies>
+ <modules>
+ <module>applib</module>
+ <module>ui</module>
+ </modules>
</project>
diff --git a/valuetypes/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
deleted file mode 100644
index 5b16379..0000000
--- a/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/IsisModuleExtMarkdownApplib.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.apache.isis.extensions.markdown.applib;
-
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class IsisModuleExtMarkdownApplib {
-}
diff --git a/valuetypes/markdown/pom.xml b/valuetypes/markdown/ui/pom.xml
similarity index 80%
copy from valuetypes/markdown/pom.xml
copy to valuetypes/markdown/ui/pom.xml
index e3a879a..0a6928c 100644
--- a/valuetypes/markdown/pom.xml
+++ b/valuetypes/markdown/ui/pom.xml
@@ -16,23 +16,26 @@
<parent>
<groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes</artifactId>
+ <artifactId>isis-valuetypes-markdown</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>isis-valuetypes-markdown</artifactId>
- <name>Apache Isis Val - Markdown</name>
- <description></description>
+ <artifactId>isis-valuetypes-markdown-ui</artifactId>
+ <name>Apache Isis Val - Markdown (ui)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.markdown</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/valuetypes/markdown</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.markdown.ui</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/valuetypes/markdown/ui</git-plugin.propertiesDir>
</properties>
<dependencies>
<dependency>
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes-markdown-applib</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-metamodel</artifactId>
</dependency>
@@ -40,14 +43,13 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <scope>provided</scope>
</dependency>
<!-- provides a markdown parser -->
<dependency>
<groupId>com.vladsch.flexmark</groupId>
<artifactId>flexmark-all</artifactId>
- <version>0.34.32</version>
+ <version>${flexmark.version}</version>
<exclusions>
<exclusion>
<groupId>org.jsoup</groupId>
diff --git a/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/IsisModuleExtMarkdownUi.java b/valuetypes/markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/IsisModuleValMarkdownUi.java
similarity index 53%
rename from valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/IsisModuleExtMarkdownUi.java
rename to valuetypes/markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/IsisModuleValMarkdownUi.java
index 4b6cbe8..dedd22d 100644
--- a/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/IsisModuleExtMarkdownUi.java
+++ b/valuetypes/markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/IsisModuleValMarkdownUi.java
@@ -1,16 +1,16 @@
-package org.apache.isis.extensions.markdown.ui;
+package org.apache.isis.valuetypes.markdown.ui;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.markdown.applib.IsisModuleExtMarkdownApplib;
-import org.apache.isis.extensions.markdown.ui.components.MarkdownPanelFactoriesForWicket;
+import org.apache.isis.valuetypes.markdown.applib.IsisModuleValMarkdownApplib;
+import org.apache.isis.valuetypes.markdown.ui.components.MarkdownPanelFactoriesForWicket;
@Configuration
@Import({
- IsisModuleExtMarkdownApplib.class,
+ IsisModuleValMarkdownApplib.class,
MarkdownPanelFactoriesForWicket.Parented.class,
MarkdownPanelFactoriesForWicket.Standalone.class,
})
-public class IsisModuleExtMarkdownUi {
+public class IsisModuleValMarkdownUi {
}
diff --git a/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownComponent.java b/valuetypes/markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/components/MarkdownComponent.java
similarity index 97%
rename from valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownComponent.java
rename to valuetypes/markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/components/MarkdownComponent.java
index 5abe54a..bb3cace 100644
--- a/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownComponent.java
+++ b/valuetypes/markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/components/MarkdownComponent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.markdown.ui.components;
+package org.apache.isis.valuetypes.markdown.ui.components;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
diff --git a/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownPanelFactoriesForWicket.java b/valuetypes/markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/components/MarkdownPanelFactoriesForWicket.java
similarity index 95%
rename from valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownPanelFactoriesForWicket.java
rename to valuetypes/markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/components/MarkdownPanelFactoriesForWicket.java
index 883b16e..a879e7e 100644
--- a/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownPanelFactoriesForWicket.java
+++ b/valuetypes/markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/components/MarkdownPanelFactoriesForWicket.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.isis.extensions.markdown.ui.components;
+package org.apache.isis.valuetypes.markdown.ui.components;
-import org.apache.isis.extensions.markdown.applib.value.Markdown;
+import org.apache.isis.valuetypes.markdown.applib.value.Markdown;
import org.apache.isis.viewer.wicket.ui.components.scalars.markup.MarkupComponentFactory;
import org.apache.isis.viewer.wicket.ui.components.scalars.markup.MarkupPanelFactories;
diff --git a/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/css/prism.css b/valuetypes/markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/components/css/prism.css
similarity index 100%
rename from valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/css/prism.css
rename to valuetypes/markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/components/css/prism.css
diff --git a/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/js/prism1.14.js b/valuetypes/markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/components/js/prism1.14.js
similarity index 100%
rename from valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/js/prism1.14.js
rename to valuetypes/markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/components/js/prism1.14.js
diff --git a/valuetypes/pom.xml b/valuetypes/pom.xml
index bc1f40b..996783e 100644
--- a/valuetypes/pom.xml
+++ b/valuetypes/pom.xml
@@ -74,11 +74,17 @@
<dependency>
<groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes-markdown</artifactId>
+ <artifactId>isis-valuetypes-markdown-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes-markdown-ui</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.valuetypes</groupId>
<artifactId>isis-valuetypes-sse</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -96,10 +102,11 @@
<modules>
<module>asciidoc</module>
- <module>asciidoc/applib</module>
- <module>asciidoc/ui</module>
<module>markdown</module>
+ <module>markdown/applib</module>
+ <module>markdown/ui</module>
+
<module>sse</module>
</modules>