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:08 UTC
[isis] 19/21: ISIS-2259: reorg xdocreport 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 f788b2577e3830dad95bae04a8b052c3e6f14dcf
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 10:24:28 2020 +0000
ISIS-2259: reorg xdocreport module
---
antora/playbooks/site-subdomains.yml | 2 +-
antora/playbooks/site.yml | 2 +-
subdomains/pom.xml | 5 ++--
subdomains/xdocreport/{impl => applib}/pom.xml | 10 +++----
.../applib/IsisModuleSubXDocReportApplib.java} | 4 +--
.../xdocreport/applib/service/OutputType.java | 6 ++++
.../applib/service}/XDocReportModel.java | 2 +-
.../applib/service}/XDocReportService.java | 2 +-
.../applib}/service/XDocReportServiceTest.java | 12 ++++----
.../applib/service}/example/Generate0Fields.java | 6 ++--
.../applib/service}/example/Generate1Docx.java | 6 ++--
.../applib/service}/example/Generate2Pdf.java | 2 +-
.../applib/service}/example/models/Developer.java | 2 +-
.../applib/service}/example/models/Project.java | 2 +-
.../example/models/ProjectDevelopersModel.java | 4 +--
.../example/template/Project-template.docx | Bin
.../service}/example/template/project.fields.xml | 0
.../extensions/xdocreport/dom/impl/OutputType.java | 6 ----
subdomains/xdocreport/pom.xml | 33 +++++++++++++++++++++
.../xdocreport/{impl => }/src/main/doc/antora.yml | 0
.../src/main/doc/modules/xdocreport/nav.adoc | 0
.../main/doc/modules/xdocreport/pages/about.adoc | 0
.../modules/xdocreport/partials/module-nav.adoc | 0
23 files changed, 68 insertions(+), 38 deletions(-)
diff --git a/antora/playbooks/site-subdomains.yml b/antora/playbooks/site-subdomains.yml
index f02c176..6b05fc2 100644
--- a/antora/playbooks/site-subdomains.yml
+++ b/antora/playbooks/site-subdomains.yml
@@ -38,7 +38,7 @@ content:
start_path: subdomains/spring/src/main/doc # subdomains
branches: HEAD
- url: .
- start_path: subdomains/xdocreport/impl/src/main/doc # subdomains
+ start_path: subdomains/xdocreport/src/main/doc # subdomains
branches: HEAD
- url: .
start_path: subdomains/zip/impl/src/main/doc # subdomains
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 2eab173..803986f 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -212,7 +212,7 @@ content:
start_path: subdomains/spring/src/main/doc # subdomains
branches: HEAD
- url: .
- start_path: subdomains/xdocreport/impl/src/main/doc # subdomains
+ start_path: subdomains/xdocreport/src/main/doc # subdomains
branches: HEAD
- url: .
start_path: subdomains/zip/impl/src/main/doc # subdomains
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index 6ce8e1a..9f831ca 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -121,7 +121,7 @@
<dependency>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-xdocreport-dom</artifactId>
+ <artifactId>isis-subdomains-xdocreport-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -150,8 +150,7 @@
<module>ognl</module>
<module>pdfbox</module>
<module>spring</module>
-
- <module>xdocreport/impl</module>
+ <module>xdocreport</module>
<module>zip/impl</module>
</modules>
diff --git a/subdomains/xdocreport/impl/pom.xml b/subdomains/xdocreport/applib/pom.xml
similarity index 90%
rename from subdomains/xdocreport/impl/pom.xml
rename to subdomains/xdocreport/applib/pom.xml
index f61aa12..5799bbe 100644
--- a/subdomains/xdocreport/impl/pom.xml
+++ b/subdomains/xdocreport/applib/pom.xml
@@ -16,18 +16,16 @@
<parent>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains</artifactId>
+ <artifactId>isis-subdomains-xdocreport</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-subdomains-xdocreport-dom</artifactId>
+ <artifactId>isis-subdomains-xdocreport-applib</artifactId>
<name>Apache Isis Sub - xdocreport (applib)</name>
- <description>Integrates XDoc Report Library</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains.xdocreport.dom</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains/xdocreport/dom</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.subdomains.xdocreport.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/subdomains/xdocreport/applib</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/IsisModuleExtXDocReport.java b/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/IsisModuleSubXDocReportApplib.java
similarity index 90%
rename from subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/IsisModuleExtXDocReport.java
rename to subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/IsisModuleSubXDocReportApplib.java
index 38352eb..19cb83d 100644
--- a/subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/IsisModuleExtXDocReport.java
+++ b/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/IsisModuleSubXDocReportApplib.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.xdocreport.dom;
+package org.apache.isis.subdomains.xdocreport.applib;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@Configuration
@ComponentScan
-public class IsisModuleExtXDocReport {
+public class IsisModuleSubXDocReportApplib {
}
diff --git a/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/service/OutputType.java b/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/service/OutputType.java
new file mode 100644
index 0000000..dfa4375
--- /dev/null
+++ b/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/service/OutputType.java
@@ -0,0 +1,6 @@
+package org.apache.isis.subdomains.xdocreport.applib.service;
+
+public enum OutputType {
+ DOCX,
+ PDF
+}
diff --git a/subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/XDocReportModel.java b/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportModel.java
similarity index 89%
rename from subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/XDocReportModel.java
rename to subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportModel.java
index f4253d0..4124887 100644
--- a/subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/XDocReportModel.java
+++ b/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportModel.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.xdocreport.dom.impl;
+package org.apache.isis.subdomains.xdocreport.applib.service;
import java.util.List;
import java.util.Map;
diff --git a/subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/XDocReportService.java b/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportService.java
similarity index 98%
rename from subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/XDocReportService.java
rename to subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportService.java
index 94703b4..f40dae0 100644
--- a/subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/XDocReportService.java
+++ b/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportService.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.xdocreport.dom.impl;
+package org.apache.isis.subdomains.xdocreport.applib.service;
import java.io.ByteArrayInputStream;
import java.io.IOException;
diff --git a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/service/XDocReportServiceTest.java b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceTest.java
similarity index 77%
rename from subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/service/XDocReportServiceTest.java
rename to subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceTest.java
index 6431ffe..e41ccf6 100644
--- a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/service/XDocReportServiceTest.java
+++ b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceTest.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.xdocreport.dom.impl.service;
+package org.apache.isis.subdomains.xdocreport.applib.service;
import java.io.File;
import java.io.FileInputStream;
@@ -12,11 +12,11 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import org.apache.isis.extensions.xdocreport.dom.impl.OutputType;
-import org.apache.isis.extensions.xdocreport.dom.impl.XDocReportService;
-import org.apache.isis.extensions.xdocreport.dom.impl.example.models.Developer;
-import org.apache.isis.extensions.xdocreport.dom.impl.example.models.Project;
-import org.apache.isis.extensions.xdocreport.dom.impl.example.models.ProjectDevelopersModel;
+import org.apache.isis.subdomains.xdocreport.applib.service.OutputType;
+import org.apache.isis.subdomains.xdocreport.applib.service.XDocReportService;
+import org.apache.isis.subdomains.xdocreport.applib.service.example.models.Developer;
+import org.apache.isis.subdomains.xdocreport.applib.service.example.models.Project;
+import org.apache.isis.subdomains.xdocreport.applib.service.example.models.ProjectDevelopersModel;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import fr.opensagres.xdocreport.core.io.IOUtils;
diff --git a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate0Fields.java b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate0Fields.java
similarity index 83%
rename from subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate0Fields.java
rename to subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate0Fields.java
index e92e073..4063f6c 100644
--- a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate0Fields.java
+++ b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate0Fields.java
@@ -1,11 +1,11 @@
-package org.apache.isis.extensions.xdocreport.dom.impl.example;
+package org.apache.isis.subdomains.xdocreport.applib.service.example;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
-import org.apache.isis.extensions.xdocreport.dom.impl.example.models.Developer;
-import org.apache.isis.extensions.xdocreport.dom.impl.example.models.Project;
+import org.apache.isis.subdomains.xdocreport.applib.service.example.models.Developer;
+import org.apache.isis.subdomains.xdocreport.applib.service.example.models.Project;
import fr.opensagres.xdocreport.core.XDocReportException;
import fr.opensagres.xdocreport.template.TemplateEngineKind;
diff --git a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate1Docx.java b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate1Docx.java
similarity index 90%
rename from subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate1Docx.java
rename to subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate1Docx.java
index eb9d128..d396182 100644
--- a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate1Docx.java
+++ b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate1Docx.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.xdocreport.dom.impl.example;
+package org.apache.isis.subdomains.xdocreport.applib.service.example;
import java.io.File;
import java.io.FileInputStream;
@@ -9,8 +9,8 @@ import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
-import org.apache.isis.extensions.xdocreport.dom.impl.example.models.Developer;
-import org.apache.isis.extensions.xdocreport.dom.impl.example.models.Project;
+import org.apache.isis.subdomains.xdocreport.applib.service.example.models.Developer;
+import org.apache.isis.subdomains.xdocreport.applib.service.example.models.Project;
import fr.opensagres.xdocreport.core.XDocReportException;
import fr.opensagres.xdocreport.document.IXDocReport;
diff --git a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate2Pdf.java b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate2Pdf.java
similarity index 93%
rename from subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate2Pdf.java
rename to subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate2Pdf.java
index 03e05ea..2c259dd 100644
--- a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate2Pdf.java
+++ b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate2Pdf.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.xdocreport.dom.impl.example;
+package org.apache.isis.subdomains.xdocreport.applib.service.example;
import java.io.File;
import java.io.FileInputStream;
diff --git a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/Developer.java b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/Developer.java
similarity index 66%
rename from subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/Developer.java
rename to subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/Developer.java
index 1768a4e..0f887c0 100644
--- a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/Developer.java
+++ b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/Developer.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.xdocreport.dom.impl.example.models;
+package org.apache.isis.subdomains.xdocreport.applib.service.example.models;
import lombok.Data;
diff --git a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/Project.java b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/Project.java
similarity index 53%
rename from subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/Project.java
rename to subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/Project.java
index b2c793a..0a3d07b 100644
--- a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/Project.java
+++ b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/Project.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.xdocreport.dom.impl.example.models;
+package org.apache.isis.subdomains.xdocreport.applib.service.example.models;
import lombok.Data;
diff --git a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/ProjectDevelopersModel.java b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/ProjectDevelopersModel.java
similarity index 76%
rename from subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/ProjectDevelopersModel.java
rename to subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/ProjectDevelopersModel.java
index 634856a..ce23c1a 100644
--- a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/ProjectDevelopersModel.java
+++ b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/ProjectDevelopersModel.java
@@ -1,11 +1,11 @@
-package org.apache.isis.extensions.xdocreport.dom.impl.example.models;
+package org.apache.isis.subdomains.xdocreport.applib.service.example.models;
import java.util.List;
import java.util.Map;
import com.google.common.collect.ImmutableMap;
-import org.apache.isis.extensions.xdocreport.dom.impl.XDocReportModel;
+import org.apache.isis.subdomains.xdocreport.applib.service.XDocReportModel;
import lombok.Data;
diff --git a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/template/Project-template.docx b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/template/Project-template.docx
similarity index 100%
rename from subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/template/Project-template.docx
rename to subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/template/Project-template.docx
diff --git a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/template/project.fields.xml b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/template/project.fields.xml
similarity index 100%
rename from subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/template/project.fields.xml
rename to subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/template/project.fields.xml
diff --git a/subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/OutputType.java b/subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/OutputType.java
deleted file mode 100644
index 276eeaa..0000000
--- a/subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/OutputType.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.apache.isis.extensions.xdocreport.dom.impl;
-
-public enum OutputType {
- DOCX,
- PDF
-}
diff --git a/subdomains/xdocreport/pom.xml b/subdomains/xdocreport/pom.xml
new file mode 100644
index 0000000..8068baf
--- /dev/null
+++ b/subdomains/xdocreport/pom.xml
@@ -0,0 +1,33 @@
+<?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.subdomains</groupId>
+ <artifactId>isis-subdomains</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>isis-subdomains-xdocreport</artifactId>
+ <name>Apache Isis Sub - xdocreport (parent)</name>
+ <description>Integrates XDoc Report Library</description>
+
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>applib</module>
+ </modules>
+
+</project>
diff --git a/subdomains/xdocreport/impl/src/main/doc/antora.yml b/subdomains/xdocreport/src/main/doc/antora.yml
similarity index 100%
rename from subdomains/xdocreport/impl/src/main/doc/antora.yml
rename to subdomains/xdocreport/src/main/doc/antora.yml
diff --git a/subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/nav.adoc b/subdomains/xdocreport/src/main/doc/modules/xdocreport/nav.adoc
similarity index 100%
rename from subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/nav.adoc
rename to subdomains/xdocreport/src/main/doc/modules/xdocreport/nav.adoc
diff --git a/subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/pages/about.adoc b/subdomains/xdocreport/src/main/doc/modules/xdocreport/pages/about.adoc
similarity index 100%
rename from subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/pages/about.adoc
rename to subdomains/xdocreport/src/main/doc/modules/xdocreport/pages/about.adoc
diff --git a/subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/partials/module-nav.adoc b/subdomains/xdocreport/src/main/doc/modules/xdocreport/partials/module-nav.adoc
similarity index 100%
rename from subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/partials/module-nav.adoc
rename to subdomains/xdocreport/src/main/doc/modules/xdocreport/partials/module-nav.adoc