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 11:18:06 UTC
[isis] 17/21: ISIS-2259: reorg pdfbox 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 e0f1458d046746342042fe8b75c7cc80cf04e833
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 10:11:35 2020 +0000
ISIS-2259: reorg pdfbox module
---
antora/playbooks/site-subdomains.yml | 4 ++--
antora/playbooks/site.yml | 4 ++--
subdomains/base/pom.xml | 4 ++--
subdomains/docx/pom.xml | 2 ++
subdomains/freemarker/applib/pom.xml | 1 -
subdomains/freemarker/pom.xml | 2 ++
subdomains/ognl/{impl => applib}/pom.xml | 14 ++++++++------
.../subdomains/ognl/applib/IsisModuleSubOgnlApplib.java} | 4 ++--
subdomains/{freemarker => ognl}/pom.xml | 9 +++++----
subdomains/{pdfbox/impl => ognl}/src/main/doc/antora.yml | 0
.../pdfbox => ognl/src/main/doc/modules/ognl}/nav.adoc | 0
.../src/main/doc/modules/ognl/pages/about.adoc | 0
.../src/main/doc/modules/ognl/partials/module-nav.adoc | 0
subdomains/pdfbox/{impl => applib}/pom.xml | 16 +++++++++-------
.../pdfbox/applib/IsisModuleSubPdfBoxApplib.java} | 4 ++--
subdomains/{freemarker => pdfbox}/pom.xml | 7 +++----
subdomains/{ognl/impl => pdfbox}/src/main/doc/antora.yml | 0
.../ognl => pdfbox/src/main/doc/modules/pdfbox}/nav.adoc | 0
.../src/main/doc/modules/pdfbox/pages/about.adoc | 0
.../src/main/doc/modules/pdfbox/partials/module-nav.adoc | 0
subdomains/pom.xml | 14 ++++++++++++++
subdomains/spring/impl/pom.xml | 2 +-
subdomains/xdocreport/impl/pom.xml | 6 +-----
subdomains/zip/impl/pom.xml | 5 +----
24 files changed, 56 insertions(+), 42 deletions(-)
diff --git a/antora/playbooks/site-subdomains.yml b/antora/playbooks/site-subdomains.yml
index a1589f7..a283de3 100644
--- a/antora/playbooks/site-subdomains.yml
+++ b/antora/playbooks/site-subdomains.yml
@@ -29,10 +29,10 @@ content:
start_path: subdomains/freemarker/src/main/doc # subdomains
branches: HEAD
- url: .
- start_path: subdomains/ognl/impl/src/main/doc # subdomains
+ start_path: subdomains/ognl/src/main/doc # subdomains
branches: HEAD
- url: .
- start_path: subdomains/pdfbox/impl/src/main/doc # subdomains
+ start_path: subdomains/pdfbox/src/main/doc # subdomains
branches: HEAD
- url: .
start_path: subdomains/spring/impl/src/main/doc # subdomains
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index b881bd1..6d5d845 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -203,10 +203,10 @@ content:
start_path: subdomains/freemarker/src/main/doc # subdomains
branches: HEAD
- url: .
- start_path: subdomains/ognl/impl/src/main/doc # subdomains
+ start_path: subdomains/ognl/src/main/doc # subdomains
branches: HEAD
- url: .
- start_path: subdomains/pdfbox/impl/src/main/doc # subdomains
+ start_path: subdomains/pdfbox/src/main/doc # subdomains
branches: HEAD
- url: .
start_path: subdomains/spring/impl/src/main/doc # subdomains
diff --git a/subdomains/base/pom.xml b/subdomains/base/pom.xml
index efbe302..ec52bfe 100644
--- a/subdomains/base/pom.xml
+++ b/subdomains/base/pom.xml
@@ -10,13 +10,13 @@
<artifactId>isis-subdomains-base</artifactId>
- <packaging>pom</packaging>
-
<name>Apache Isis Sub - Base (applib)</name>
<description>
A module providing Base utilities for other subdomain modules
</description>
+ <packaging>pom</packaging>
+
<modules>
<module>applib</module>
</modules>
diff --git a/subdomains/docx/pom.xml b/subdomains/docx/pom.xml
index 1597af8..4c15f42 100644
--- a/subdomains/docx/pom.xml
+++ b/subdomains/docx/pom.xml
@@ -24,6 +24,8 @@
<name>Apache Isis Sub - Docx (parent)</name>
<description>Uses the Apache POI library for mail merge functions of .docx Word documents</description>
+ <packaging>pom</packaging>
+
<modules>
<module>applib</module>
</modules>
diff --git a/subdomains/freemarker/applib/pom.xml b/subdomains/freemarker/applib/pom.xml
index 65514f5..13e506a 100644
--- a/subdomains/freemarker/applib/pom.xml
+++ b/subdomains/freemarker/applib/pom.xml
@@ -29,7 +29,6 @@
</properties>
<dependencies>
-
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-applib</artifactId>
diff --git a/subdomains/freemarker/pom.xml b/subdomains/freemarker/pom.xml
index f3991d8..6181054 100644
--- a/subdomains/freemarker/pom.xml
+++ b/subdomains/freemarker/pom.xml
@@ -24,6 +24,8 @@
<name>Apache Isis Sub - Freemarker (parent)</name>
<description>Integrates Freemarker Library</description>
+ <packaging>pom</packaging>
+
<modules>
<module>applib</module>
</modules>
diff --git a/subdomains/ognl/impl/pom.xml b/subdomains/ognl/applib/pom.xml
similarity index 79%
rename from subdomains/ognl/impl/pom.xml
rename to subdomains/ognl/applib/pom.xml
index c0bb171..c78194d 100644
--- a/subdomains/ognl/impl/pom.xml
+++ b/subdomains/ognl/applib/pom.xml
@@ -21,17 +21,19 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-subdomains-ognl-dom</artifactId>
- <name>Apache Isis Sub - Ognl</name>
- <description>Integrates Ognl Library</description>
+ <artifactId>isis-subdomains-ognl-applib</artifactId>
+ <name>Apache Isis Sub - Ognl (applib)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains.ognl.dom</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains/ognl/dom</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.subdomains.ognl.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/subdomains/ognl/applib</git-plugin.propertiesDir>
</properties>
<dependencies>
-
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-applib</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/subdomains/ognl/impl/src/main/java/org/apache/isis/extensions/ognl/dom/IsisModuleExtOgnl.java b/subdomains/ognl/applib/src/main/java/org/apache/isis/subdomains/ognl/applib/IsisModuleSubOgnlApplib.java
similarity index 91%
rename from subdomains/ognl/impl/src/main/java/org/apache/isis/extensions/ognl/dom/IsisModuleExtOgnl.java
rename to subdomains/ognl/applib/src/main/java/org/apache/isis/subdomains/ognl/applib/IsisModuleSubOgnlApplib.java
index aa1c2fb..3dbee72 100644
--- a/subdomains/ognl/impl/src/main/java/org/apache/isis/extensions/ognl/dom/IsisModuleExtOgnl.java
+++ b/subdomains/ognl/applib/src/main/java/org/apache/isis/subdomains/ognl/applib/IsisModuleSubOgnlApplib.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.ognl.dom;
+package org.apache.isis.subdomains.ognl.applib;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@Configuration
@ComponentScan
-public class IsisModuleExtOgnl {
+public class IsisModuleSubOgnlApplib {
}
diff --git a/subdomains/freemarker/pom.xml b/subdomains/ognl/pom.xml
similarity index 88%
copy from subdomains/freemarker/pom.xml
copy to subdomains/ognl/pom.xml
index f3991d8..cd1081e 100644
--- a/subdomains/freemarker/pom.xml
+++ b/subdomains/ognl/pom.xml
@@ -20,13 +20,14 @@
<version>2.0.0-M3-SNAPSHOT</version>
</parent>
- <artifactId>isis-subdomains-freemarker</artifactId>
- <name>Apache Isis Sub - Freemarker (parent)</name>
- <description>Integrates Freemarker Library</description>
+ <artifactId>isis-subdomains-ognl</artifactId>
+ <name>Apache Isis Sub - Ognl (parent)</name>
+ <description>Integrates Ognl Library</description>
+
+ <packaging>pom</packaging>
<modules>
<module>applib</module>
</modules>
-
</project>
diff --git a/subdomains/pdfbox/impl/src/main/doc/antora.yml b/subdomains/ognl/src/main/doc/antora.yml
similarity index 100%
rename from subdomains/pdfbox/impl/src/main/doc/antora.yml
rename to subdomains/ognl/src/main/doc/antora.yml
diff --git a/subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/nav.adoc b/subdomains/ognl/src/main/doc/modules/ognl/nav.adoc
similarity index 100%
rename from subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/nav.adoc
rename to subdomains/ognl/src/main/doc/modules/ognl/nav.adoc
diff --git a/subdomains/ognl/impl/src/main/doc/modules/ognl/pages/about.adoc b/subdomains/ognl/src/main/doc/modules/ognl/pages/about.adoc
similarity index 100%
rename from subdomains/ognl/impl/src/main/doc/modules/ognl/pages/about.adoc
rename to subdomains/ognl/src/main/doc/modules/ognl/pages/about.adoc
diff --git a/subdomains/ognl/impl/src/main/doc/modules/ognl/partials/module-nav.adoc b/subdomains/ognl/src/main/doc/modules/ognl/partials/module-nav.adoc
similarity index 100%
rename from subdomains/ognl/impl/src/main/doc/modules/ognl/partials/module-nav.adoc
rename to subdomains/ognl/src/main/doc/modules/ognl/partials/module-nav.adoc
diff --git a/subdomains/pdfbox/impl/pom.xml b/subdomains/pdfbox/applib/pom.xml
similarity index 76%
rename from subdomains/pdfbox/impl/pom.xml
rename to subdomains/pdfbox/applib/pom.xml
index 8d961f4..6b984b7 100644
--- a/subdomains/pdfbox/impl/pom.xml
+++ b/subdomains/pdfbox/applib/pom.xml
@@ -16,22 +16,24 @@
<parent>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains</artifactId>
+ <artifactId>isis-subdomains-pdfbox</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-subdomains-pdfbox-dom</artifactId>
- <name>Apache Isis Sub - PDF Box</name>
+ <artifactId>isis-subdomains-pdfbox-applib</artifactId>
+ <name>Apache Isis Sub - PDF Box (applib)</name>
<description>Integrates PDF Box Library</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains.pdfbox.dom</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains/pdfbox/dom</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.subdomains.pdfbox.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/subdomains/pdfbox/applib</git-plugin.propertiesDir>
</properties>
<dependencies>
-
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-applib</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/subdomains/pdfbox/impl/src/main/java/org/apache/isis/extensions/pdfbox/dom/IsisModuleExtPdfBox.java b/subdomains/pdfbox/applib/src/main/java/org/apache/isis/subdomains/pdfbox/applib/IsisModuleSubPdfBoxApplib.java
similarity index 91%
rename from subdomains/pdfbox/impl/src/main/java/org/apache/isis/extensions/pdfbox/dom/IsisModuleExtPdfBox.java
rename to subdomains/pdfbox/applib/src/main/java/org/apache/isis/subdomains/pdfbox/applib/IsisModuleSubPdfBoxApplib.java
index 6555bb8..fe2733c 100644
--- a/subdomains/pdfbox/impl/src/main/java/org/apache/isis/extensions/pdfbox/dom/IsisModuleExtPdfBox.java
+++ b/subdomains/pdfbox/applib/src/main/java/org/apache/isis/subdomains/pdfbox/applib/IsisModuleSubPdfBoxApplib.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.pdfbox.dom;
+package org.apache.isis.subdomains.pdfbox.applib;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@Configuration
@ComponentScan
-public class IsisModuleExtPdfBox {
+public class IsisModuleSubPdfBoxApplib {
}
diff --git a/subdomains/freemarker/pom.xml b/subdomains/pdfbox/pom.xml
similarity index 88%
copy from subdomains/freemarker/pom.xml
copy to subdomains/pdfbox/pom.xml
index f3991d8..abc97e4 100644
--- a/subdomains/freemarker/pom.xml
+++ b/subdomains/pdfbox/pom.xml
@@ -20,13 +20,12 @@
<version>2.0.0-M3-SNAPSHOT</version>
</parent>
- <artifactId>isis-subdomains-freemarker</artifactId>
- <name>Apache Isis Sub - Freemarker (parent)</name>
- <description>Integrates Freemarker Library</description>
+ <artifactId>isis-subdomains-pdfbox</artifactId>
+ <name>Apache Isis Sub - PDF Box (parent)</name>
+ <description>Integrates PDF Box Library</description>
<modules>
<module>applib</module>
</modules>
-
</project>
diff --git a/subdomains/ognl/impl/src/main/doc/antora.yml b/subdomains/pdfbox/src/main/doc/antora.yml
similarity index 100%
rename from subdomains/ognl/impl/src/main/doc/antora.yml
rename to subdomains/pdfbox/src/main/doc/antora.yml
diff --git a/subdomains/ognl/impl/src/main/doc/modules/ognl/nav.adoc b/subdomains/pdfbox/src/main/doc/modules/pdfbox/nav.adoc
similarity index 100%
rename from subdomains/ognl/impl/src/main/doc/modules/ognl/nav.adoc
rename to subdomains/pdfbox/src/main/doc/modules/pdfbox/nav.adoc
diff --git a/subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/pages/about.adoc b/subdomains/pdfbox/src/main/doc/modules/pdfbox/pages/about.adoc
similarity index 100%
rename from subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/pages/about.adoc
rename to subdomains/pdfbox/src/main/doc/modules/pdfbox/pages/about.adoc
diff --git a/subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/partials/module-nav.adoc b/subdomains/pdfbox/src/main/doc/modules/pdfbox/partials/module-nav.adoc
similarity index 100%
rename from subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/partials/module-nav.adoc
rename to subdomains/pdfbox/src/main/doc/modules/pdfbox/partials/module-nav.adoc
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index fdafe7d..aadd918 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -103,6 +103,18 @@
<dependency>
<groupId>org.apache.isis.subdomains</groupId>
+ <artifactId>isis-subdomains-ognl-applib</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.subdomains</groupId>
+ <artifactId>isis-subdomains-pdfbox-applib</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.subdomains</groupId>
<artifactId>isis-subdomains-spring</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -135,6 +147,8 @@
<module>docx</module>
<module>excel</module>
<module>freemarker</module>
+ <module>ognl</module>
+ <module>pdfbox</module>
<module>spring/impl</module>
diff --git a/subdomains/spring/impl/pom.xml b/subdomains/spring/impl/pom.xml
index 9fe3cfa..76f3984 100644
--- a/subdomains/spring/impl/pom.xml
+++ b/subdomains/spring/impl/pom.xml
@@ -22,7 +22,7 @@
</parent>
<artifactId>isis-subdomains-spring</artifactId>
- <name>Apache Isis Sin - Spring</name>
+ <name>Apache Isis Sub - Spring (applib)</name>
<description>Utility services for interacting with the Spring application context (that hosts the Apache Isis application itself)</description>
<properties>
diff --git a/subdomains/xdocreport/impl/pom.xml b/subdomains/xdocreport/impl/pom.xml
index c359d1d..f61aa12 100644
--- a/subdomains/xdocreport/impl/pom.xml
+++ b/subdomains/xdocreport/impl/pom.xml
@@ -22,7 +22,7 @@
</parent>
<artifactId>isis-subdomains-xdocreport-dom</artifactId>
- <name>Apache Isis Sub - xdocreport</name>
+ <name>Apache Isis Sub - xdocreport (applib)</name>
<description>Integrates XDoc Report Library</description>
<properties>
@@ -36,10 +36,6 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-applib</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
<dependency>
<groupId>fr.opensagres.xdocreport</groupId>
diff --git a/subdomains/zip/impl/pom.xml b/subdomains/zip/impl/pom.xml
index 2fcad09..e98e4cc 100644
--- a/subdomains/zip/impl/pom.xml
+++ b/subdomains/zip/impl/pom.xml
@@ -40,10 +40,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-applib</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
+
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>