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:50 UTC
[isis] 04/22: ISIS-2259; reorg asciidoctor modules
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 270cb13a3637489b32242caccf3f616c872067d3
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 11:44:06 2020 +0000
ISIS-2259; reorg asciidoctor modules
---
examples/demo/pom.xml | 2 +-
valuetypes/asciidoc/applib/pom.xml | 46 ++++++++++
.../applib/IsisModuleValAsciidocApplib.java} | 4 +-
.../asciidoc/applib/value/AsciiDoc.java | 5 +-
.../asciidoc/applib/value/Converter.java} | 4 +-
valuetypes/asciidoc/pom.xml | 102 ++-------------------
valuetypes/asciidoc/{ => ui}/pom.xml | 19 ++--
.../asciidoc/ui/IsisModuleValAsciidocUi.java} | 6 +-
.../asciidoc/ui/components/AsciiDocComponent.java | 2 +-
.../AsciiDocPanelFactoriesForWicket.java | 2 +-
.../asciidoc/ui/components/css/prism.css | 0
.../asciidoc/ui/components/js/prism1.14.js | 0
valuetypes/pom.xml | 11 ++-
13 files changed, 88 insertions(+), 115 deletions(-)
diff --git a/examples/demo/pom.xml b/examples/demo/pom.xml
index 24a42b8..3767d13 100644
--- a/examples/demo/pom.xml
+++ b/examples/demo/pom.xml
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes-asciidoc</artifactId>
+ <artifactId>isis-valuetypes-asciidoc-applib</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.incubator</groupId>
diff --git a/valuetypes/asciidoc/applib/pom.xml b/valuetypes/asciidoc/applib/pom.xml
new file mode 100644
index 0000000..21dc281
--- /dev/null
+++ b/valuetypes/asciidoc/applib/pom.xml
@@ -0,0 +1,46 @@
+<?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.valuetypes</groupId>
+ <artifactId>isis-valuetypes-asciidoc</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>isis-valuetypes-asciidoc-applib</artifactId>
+ <name>Apache Isis Val - Asciidoctor</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>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-applib</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctorj-api</artifactId>
+ <version>2.1.0</version>
+ </dependency>
+
+ </dependencies>
+
+</project>
diff --git a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/IsisModuleExtAsciidocApplib.java b/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/IsisModuleValAsciidocApplib.java
similarity index 90%
rename from valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/IsisModuleExtAsciidocApplib.java
rename to valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/IsisModuleValAsciidocApplib.java
index 482bd84..e209aeb 100644
--- a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/IsisModuleExtAsciidocApplib.java
+++ b/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/IsisModuleValAsciidocApplib.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.asciidoc.applib;
+package org.apache.isis.valuetypes.asciidoc.applib;
import org.springframework.context.annotation.Configuration;
@Configuration
-public class IsisModuleExtAsciidocApplib {
+public class IsisModuleValAsciidocApplib {
}
diff --git a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/value/AsciiDoc.java b/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/AsciiDoc.java
similarity index 87%
rename from valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/value/AsciiDoc.java
rename to valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/AsciiDoc.java
index c14469d..402dc4a 100644
--- a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/value/AsciiDoc.java
+++ b/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/AsciiDoc.java
@@ -16,11 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.asciidoc.applib.value;
+package org.apache.isis.valuetypes.asciidoc.applib.value;
import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.value.Markup;
-import org.apache.isis.extensions.asciidoc.ui.converter.AsciiDocConverter;
/**
* Immutable value type holding pre-rendered HTML.
@@ -33,7 +32,7 @@ public class AsciiDoc extends Markup {
private static final long serialVersionUID = 1L;
public static AsciiDoc valueOfAdoc(String asciiDoc) {
- return valueOfHtml(AsciiDocConverter.adocToHtml(asciiDoc));
+ return valueOfHtml(Converter.adocToHtml(asciiDoc));
}
public static AsciiDoc valueOfHtml(String html) {
diff --git a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/converter/AsciiDocConverter.java b/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/Converter.java
similarity index 96%
rename from valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/converter/AsciiDocConverter.java
rename to valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/Converter.java
index a5dca0a..941e17c 100644
--- a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/converter/AsciiDocConverter.java
+++ b/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/Converter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.asciidoc.ui.converter;
+package org.apache.isis.valuetypes.asciidoc.applib.value;
import org.asciidoctor.Asciidoctor;
import org.asciidoctor.AttributesBuilder;
@@ -24,7 +24,7 @@ import org.asciidoctor.Options;
import org.asciidoctor.OptionsBuilder;
import org.asciidoctor.SafeMode;
-public final class AsciiDocConverter {
+final class Converter {
/**
* For syntax highlighting to work, the client/browser needs to load specific
diff --git a/valuetypes/asciidoc/pom.xml b/valuetypes/asciidoc/pom.xml
index dd50ae9..e895e4a 100644
--- a/valuetypes/asciidoc/pom.xml
+++ b/valuetypes/asciidoc/pom.xml
@@ -18,103 +18,19 @@
<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-asciidoc</artifactId>
- <name>Apache Isis Val - Asciidoctor</name>
- <description></description>
+ <name>Apache Isis Val - Asciidoctor (parent)</name>
+ <description>
+ Asciidoc value type.
+ </description>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.asciidoc</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/valuetypes/asciidoc</git-plugin.propertiesDir>
- </properties>
+ <packaging>pom</packaging>
- <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 ASCII-DOC parser -->
- <dependency>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctorj</artifactId>
- <version>2.1.0</version>
- <exclusions>
- <!-- convergence issues -->
- <exclusion>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-constants</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-posix</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-enxio</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-ffi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.github.jnr</groupId>
- <artifactId>jffi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm-util</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-posix</artifactId>
- <version>3.0.49</version>
- <exclusions>
- <!-- convergence issues -->
- <exclusion>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-constants</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-ffi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-enxio</artifactId>
- <version>0.20</version>
- <exclusions>
- <!-- convergence issues -->
- <exclusion>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-constants</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-ffi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-constants</artifactId>
- <version>0.9.11</version>
- </dependency>
- <!-- END OF ASCII-DOC -->
-
- </dependencies>
+ <modules>
+ <module>applib</module>
+ <module>ui</module>
+ </modules>
</project>
diff --git a/valuetypes/asciidoc/pom.xml b/valuetypes/asciidoc/ui/pom.xml
similarity index 89%
copy from valuetypes/asciidoc/pom.xml
copy to valuetypes/asciidoc/ui/pom.xml
index dd50ae9..4805ea3 100644
--- a/valuetypes/asciidoc/pom.xml
+++ b/valuetypes/asciidoc/ui/pom.xml
@@ -16,27 +16,30 @@
<parent>
<groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes</artifactId>
+ <artifactId>isis-valuetypes-asciidoc</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>isis-valuetypes-asciidoc</artifactId>
- <name>Apache Isis Val - Asciidoctor</name>
- <description></description>
+ <artifactId>isis-valuetypes-asciidoc-ui</artifactId>
+ <name>Apache Isis Val - Asciidoctor (ui)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.asciidoc</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/valuetypes/asciidoc</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.asciidoc.ui</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/valuetypes/asciidoc/ui</git-plugin.propertiesDir>
</properties>
<dependencies>
<dependency>
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes-applib</artifactId>
+ </dependency>
+
+ <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>
diff --git a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/IsisModuleExtAsciidocUi.java b/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/IsisModuleValAsciidocUi.java
similarity index 89%
rename from valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/IsisModuleExtAsciidocUi.java
rename to valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/IsisModuleValAsciidocUi.java
index 10f7790..76f5da0 100644
--- a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/IsisModuleExtAsciidocUi.java
+++ b/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/IsisModuleValAsciidocUi.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.asciidoc.ui;
+package org.apache.isis.valuetypes.asciidoc.ui;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.extensions.asciidoc.applib.IsisModuleExtAsciidocApplib;
-import org.apache.isis.extensions.asciidoc.ui.components.AsciiDocPanelFactoriesForWicket;
+import org.apache.isis.valuetypes.asciidoc.ui.components.AsciiDocPanelFactoriesForWicket;
@Configuration
@Import({
@@ -30,5 +30,5 @@ import org.apache.isis.extensions.asciidoc.ui.components.AsciiDocPanelFactoriesF
AsciiDocPanelFactoriesForWicket.Parented.class,
AsciiDocPanelFactoriesForWicket.Standalone.class
})
-public class IsisModuleExtAsciidocUi {
+public class IsisModuleValAsciidocUi {
}
diff --git a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocComponent.java b/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/AsciiDocComponent.java
similarity index 97%
rename from valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocComponent.java
rename to valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/AsciiDocComponent.java
index 08ef8db..ff94d27 100644
--- a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocComponent.java
+++ b/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/AsciiDocComponent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.asciidoc.ui.components;
+package org.apache.isis.valuetypes.asciidoc.ui.components;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
diff --git a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java b/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java
similarity index 97%
rename from valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java
rename to valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java
index 8d4c078..caeec8c 100644
--- a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java
+++ b/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.extensions.asciidoc.ui.components;
+package org.apache.isis.valuetypes.asciidoc.ui.components;
import org.springframework.stereotype.Component;
diff --git a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/css/prism.css b/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/css/prism.css
similarity index 100%
rename from valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/css/prism.css
rename to valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/css/prism.css
diff --git a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/js/prism1.14.js b/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/js/prism1.14.js
similarity index 100%
rename from valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/js/prism1.14.js
rename to valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/js/prism1.14.js
diff --git a/valuetypes/pom.xml b/valuetypes/pom.xml
index d984405..bc1f40b 100644
--- a/valuetypes/pom.xml
+++ b/valuetypes/pom.xml
@@ -63,11 +63,17 @@
<dependency>
<groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes-asciidoc</artifactId>
+ <artifactId>isis-valuetypes-asciidoc-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes-asciidoc-ui</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.valuetypes</groupId>
<artifactId>isis-valuetypes-markdown</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -90,6 +96,9 @@
<modules>
<module>asciidoc</module>
+ <module>asciidoc/applib</module>
+ <module>asciidoc/ui</module>
+
<module>markdown</module>
<module>sse</module>
</modules>