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:03 UTC
[isis] 14/21: ISIS-2259: adds parent for docx subdomain.
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 7083dd480481c6dc8b53997670828f702c4d3d54
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 08:59:19 2020 +0000
ISIS-2259: adds parent for docx subdomain.
Also removes dependency on core-applib to
---
antora/playbooks/site-subdomains.yml | 2 +-
antora/playbooks/site.yml | 2 +-
core/schema/pom.xml | 6 ++++++
.../java/org/apache/isis/schema/IsisModuleSchema.java | 6 ------
.../schema/jaxbadapters/JodaDateTimeStringAdapter.java | 3 +--
.../schema/jaxbadapters/JodaLocalDateStringAdapter.java | 4 +---
.../jaxbadapters/JodaLocalDateTimeStringAdapter.java | 4 +---
.../schema/jaxbadapters/JodaLocalTimeStringAdapter.java | 4 +---
...sModuleExtBase.java => IsisModuleSubBaseApplib.java} | 2 +-
subdomains/docx/{impl => applib}/pom.xml | 17 +++++++++--------
.../docx/applib/IsisModuleSubDocxApplib.java} | 5 ++---
subdomains/docx/{impl => }/pom.xml | 16 +++++-----------
subdomains/docx/{impl => }/src/main/doc/antora.yml | 0
.../docx/{impl => }/src/main/doc/modules/docx/nav.adoc | 0
.../src/main/doc/modules/docx/pages/about.adoc | 0
.../src/main/doc/modules/docx/partials/module-nav.adoc | 0
subdomains/pom.xml | 10 ++++++++++
17 files changed, 39 insertions(+), 42 deletions(-)
diff --git a/antora/playbooks/site-subdomains.yml b/antora/playbooks/site-subdomains.yml
index 4a99fe7..26a1050 100644
--- a/antora/playbooks/site-subdomains.yml
+++ b/antora/playbooks/site-subdomains.yml
@@ -20,7 +20,7 @@ content:
start_path: subdomains/base/src/main/doc # subdomains
branches: HEAD
- url: .
- start_path: subdomains/docx/impl/src/main/doc # subdomains
+ start_path: subdomains/docx/src/main/doc # subdomains
branches: HEAD
- url: .
start_path: subdomains/excel/impl/src/main/doc # subdomains
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index edea0db..4580422 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -194,7 +194,7 @@ content:
start_path: subdomains/base/src/main/doc # subdomains
branches: HEAD
- url: .
- start_path: subdomains/docx/impl/src/main/doc # subdomains
+ start_path: subdomains/docx/src/main/doc # subdomains
branches: HEAD
- url: .
start_path: subdomains/excel/impl/src/main/doc # subdomains
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index 4169094..39eb8da 100644
--- a/core/schema/pom.xml
+++ b/core/schema/pom.xml
@@ -34,10 +34,16 @@
</properties>
<dependencies>
+<!--
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-commons</artifactId>
</dependency>
+-->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
diff --git a/core/schema/src/main/java/org/apache/isis/schema/IsisModuleSchema.java b/core/schema/src/main/java/org/apache/isis/schema/IsisModuleSchema.java
index e5c361d..312559b 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/IsisModuleSchema.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/IsisModuleSchema.java
@@ -21,13 +21,7 @@ package org.apache.isis.schema;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.commons.IsisModuleCommons;
-
@Configuration
-@Import({
- IsisModuleCommons.class
-})
public class IsisModuleSchema {
-
}
diff --git a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeStringAdapter.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeStringAdapter.java
index facaa11..a342e4f 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeStringAdapter.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeStringAdapter.java
@@ -24,7 +24,6 @@ import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.ISODateTimeFormat;
-import org.apache.isis.commons.internal.base._Strings;
/**
* Note: not actually registered as a JAXB adapter.
@@ -36,7 +35,7 @@ public final class JodaDateTimeStringAdapter {
private static DateTimeFormatter formatter = ISODateTimeFormat.dateTime();
public static DateTime parse(final String dateTimeStr) {
- return !_Strings.isNullOrEmpty(dateTimeStr) ? formatter.parseDateTime(dateTimeStr) : null;
+ return !Strings.isNullOrEmpty(dateTimeStr) ? formatter.parseDateTime(dateTimeStr) : null;
}
public static String print(final DateTime date) {
diff --git a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateStringAdapter.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateStringAdapter.java
index b708493..8cad02d 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateStringAdapter.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateStringAdapter.java
@@ -22,8 +22,6 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.joda.time.LocalDate;
-import org.apache.isis.commons.internal.base._Strings;
-
/**
* Note: not actually registered as a JAXB adapter.
*/
@@ -32,7 +30,7 @@ public final class JodaLocalDateStringAdapter {
}
public static LocalDate parse(final String date) {
- if (_Strings.isNullOrEmpty(date)) {
+ if (Strings.isNullOrEmpty(date)) {
return null;
}
return LocalDate.parse(date);
diff --git a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeStringAdapter.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeStringAdapter.java
index ec7fb21..f571dd7 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeStringAdapter.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeStringAdapter.java
@@ -22,8 +22,6 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.joda.time.LocalDateTime;
-import org.apache.isis.commons.internal.base._Strings;
-
/**
* Note: not actually registered as a JAXB adapter.
*/
@@ -32,7 +30,7 @@ public final class JodaLocalDateTimeStringAdapter {
}
public static LocalDateTime parse(final String localDateTimeStr) {
- if (_Strings.isNullOrEmpty(localDateTimeStr)) {
+ if (Strings.isNullOrEmpty(localDateTimeStr)) {
return null;
}
return LocalDateTime.parse(localDateTimeStr);
diff --git a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeStringAdapter.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeStringAdapter.java
index ebbc743..47a600a 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeStringAdapter.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeStringAdapter.java
@@ -22,8 +22,6 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.joda.time.LocalTime;
-import org.apache.isis.commons.internal.base._Strings;
-
/**
* Note: not actually registered as a JAXB adapter.
*/
@@ -32,7 +30,7 @@ public final class JodaLocalTimeStringAdapter {
}
public static LocalTime parse(final String localTimeStr) {
- if (_Strings.isNullOrEmpty(localTimeStr)) {
+ if (Strings.isNullOrEmpty(localTimeStr)) {
return null;
}
return LocalTime.parse(localTimeStr);
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/IsisModuleExtBase.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/IsisModuleSubBaseApplib.java
similarity index 76%
rename from subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/IsisModuleExtBase.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/IsisModuleSubBaseApplib.java
index 4998757..0e82dcd 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/IsisModuleExtBase.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/IsisModuleSubBaseApplib.java
@@ -3,5 +3,5 @@ package org.apache.isis.subdomains.base.applib;
import org.springframework.context.annotation.Configuration;
@Configuration
-public class IsisModuleExtBase {
+public class IsisModuleSubBaseApplib {
}
diff --git a/subdomains/docx/impl/pom.xml b/subdomains/docx/applib/pom.xml
similarity index 75%
copy from subdomains/docx/impl/pom.xml
copy to subdomains/docx/applib/pom.xml
index d362e1b..7270f29 100644
--- a/subdomains/docx/impl/pom.xml
+++ b/subdomains/docx/applib/pom.xml
@@ -16,22 +16,23 @@
<parent>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains</artifactId>
+ <artifactId>isis-subdomains-docx</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-subdomains-docx-dom</artifactId>
- <name>Apache Isis Sub - Docx</name>
- <description>Uses the Apache POI library for mail merge functions of .docx Word documents</description>
+ <artifactId>isis-subdomains-docx-applib</artifactId>
+ <name>Apache Isis Sub - Docx (applib)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains.docx.dom</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains/docx/dom</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.subdomains.docx.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/subdomains/docx/applib</git-plugin.propertiesDir>
</properties>
<dependencies>
-
+ <dependency>
+ <groupId>org.apache.isis.subdomains</groupId>
+ <artifactId>isis-subdomains-base-applib</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/subdomains/docx/impl/src/main/java/org/apache/isis/extensions/docx/dom/IsisModuleExtDocx.java b/subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/IsisModuleSubDocxApplib.java
similarity index 91%
rename from subdomains/docx/impl/src/main/java/org/apache/isis/extensions/docx/dom/IsisModuleExtDocx.java
rename to subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/IsisModuleSubDocxApplib.java
index 1bbf415..a01a597 100644
--- a/subdomains/docx/impl/src/main/java/org/apache/isis/extensions/docx/dom/IsisModuleExtDocx.java
+++ b/subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/IsisModuleSubDocxApplib.java
@@ -16,13 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.docx.dom;
+package org.apache.isis.subdomains.docx.applib;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@Configuration
-@ComponentScan
-public class IsisModuleExtDocx {
+public class IsisModuleSubDocxApplib {
}
diff --git a/subdomains/docx/impl/pom.xml b/subdomains/docx/pom.xml
similarity index 77%
rename from subdomains/docx/impl/pom.xml
rename to subdomains/docx/pom.xml
index d362e1b..1597af8 100644
--- a/subdomains/docx/impl/pom.xml
+++ b/subdomains/docx/pom.xml
@@ -18,20 +18,14 @@
<groupId>org.apache.isis.subdomains</groupId>
<artifactId>isis-subdomains</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-subdomains-docx-dom</artifactId>
- <name>Apache Isis Sub - Docx</name>
+ <artifactId>isis-subdomains-docx</artifactId>
+ <name>Apache Isis Sub - Docx (parent)</name>
<description>Uses the Apache POI library for mail merge functions of .docx Word documents</description>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains.docx.dom</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains/docx/dom</git-plugin.propertiesDir>
- </properties>
-
- <dependencies>
-
- </dependencies>
+ <modules>
+ <module>applib</module>
+ </modules>
</project>
diff --git a/subdomains/docx/impl/src/main/doc/antora.yml b/subdomains/docx/src/main/doc/antora.yml
similarity index 100%
rename from subdomains/docx/impl/src/main/doc/antora.yml
rename to subdomains/docx/src/main/doc/antora.yml
diff --git a/subdomains/docx/impl/src/main/doc/modules/docx/nav.adoc b/subdomains/docx/src/main/doc/modules/docx/nav.adoc
similarity index 100%
rename from subdomains/docx/impl/src/main/doc/modules/docx/nav.adoc
rename to subdomains/docx/src/main/doc/modules/docx/nav.adoc
diff --git a/subdomains/docx/impl/src/main/doc/modules/docx/pages/about.adoc b/subdomains/docx/src/main/doc/modules/docx/pages/about.adoc
similarity index 100%
rename from subdomains/docx/impl/src/main/doc/modules/docx/pages/about.adoc
rename to subdomains/docx/src/main/doc/modules/docx/pages/about.adoc
diff --git a/subdomains/docx/impl/src/main/doc/modules/docx/partials/module-nav.adoc b/subdomains/docx/src/main/doc/modules/docx/partials/module-nav.adoc
similarity index 100%
rename from subdomains/docx/impl/src/main/doc/modules/docx/partials/module-nav.adoc
rename to subdomains/docx/src/main/doc/modules/docx/partials/module-nav.adoc
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index 40338bc..3544fbf 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -70,6 +70,12 @@
<dependency>
<groupId>org.apache.isis.subdomains</groupId>
+ <artifactId>isis-subdomains-docx-applib</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.subdomains</groupId>
<artifactId>isis-subdomains-excel-dom</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -116,6 +122,10 @@
<module>base</module>
<!--
+ <module>docx</module>
+-->
+
+<!--
<module>excel/fixture</module>
<module>excel/integtests</module>
-->