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 2022/04/12 17:41:45 UTC
[isis] 07/12: ISIS-2999: removes xdocreport and zip from subdomains
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 4fd89330cddca18ace094367f9dc7274d0caf6d9
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Apr 12 13:29:05 2022 +0100
ISIS-2999: removes xdocreport and zip from subdomains
---
antora/playbooks/site-subdomains.yml | 6 -
antora/playbooks/site.yml | 6 -
core/pom.xml | 28 ----
subdomains/pom.xml | 13 --
subdomains/xdocreport/adoc/antora.yml | 19 ---
.../xdocreport/adoc/modules/xdocreport/nav.adoc | 4 -
.../adoc/modules/xdocreport/pages/about.adoc | 5 -
.../modules/xdocreport/partials/module-nav.adoc | 6 -
subdomains/xdocreport/applib/pom.xml | 172 ---------------------
.../IsisModuleSubdomainsXDocReportApplib.java | 35 -----
.../xdocreport/applib/XDocReportService.java | 60 -------
.../applib/service/XDocReportServiceDefault.java | 119 --------------
.../applib/service/XDocReportServiceTest.java | 78 ----------
.../applib/service/example/Generate0Fields.java | 52 -------
.../applib/service/example/Generate1Docx.java | 79 ----------
.../applib/service/example/Generate2Pdf.java | 51 ------
.../applib/service/example/models/Developer.java | 30 ----
.../applib/service/example/models/Project.java | 28 ----
.../example/models/ProjectDevelopersModel.java | 42 -----
.../service/example/template/Project-template.docx | Bin 697650 -> 0 bytes
.../service/example/template/project.fields.xml | 34 ----
subdomains/xdocreport/pom.xml | 33 ----
subdomains/zip/adoc/antora.yml | 19 ---
subdomains/zip/adoc/modules/zip/nav.adoc | 4 -
subdomains/zip/adoc/modules/zip/pages/about.adoc | 5 -
.../zip/adoc/modules/zip/partials/module-nav.adoc | 6 -
subdomains/zip/applib/pom.xml | 51 ------
.../subdomains/zip/applib/IsisModuleExtZip.java | 32 ----
.../isis/subdomains/zip/applib/ZipService.java | 59 -------
.../zip/applib/service/ZipServiceDefault.java | 101 ------------
subdomains/zip/pom.xml | 36 -----
31 files changed, 1213 deletions(-)
diff --git a/antora/playbooks/site-subdomains.yml b/antora/playbooks/site-subdomains.yml
index 67e73f1697..d1a61ae2ea 100644
--- a/antora/playbooks/site-subdomains.yml
+++ b/antora/playbooks/site-subdomains.yml
@@ -58,12 +58,6 @@ content:
- url: .
start_path: subdomains/spring/adoc # subdomains
branches: HEAD
- - url: .
- start_path: subdomains/xdocreport/adoc # subdomains
- branches: HEAD
- - url: .
- start_path: subdomains/zip/adoc # subdomains
- branches: HEAD
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 17e843dd39..d6ebcd349e 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -235,12 +235,6 @@ content:
- url: .
start_path: subdomains/spring/adoc # subdomains
branches: HEAD
- - url: .
- start_path: subdomains/xdocreport/adoc # subdomains
- branches: HEAD
- - url: .
- start_path: subdomains/zip/adoc # subdomains
- branches: HEAD
# testing
- url: .
diff --git a/core/pom.xml b/core/pom.xml
index 8e13003777..f84ff16127 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -187,8 +187,6 @@
<wicketstuff.version>${wicket.version}</wicketstuff.version> <!-- org.wicketstuff:wicketstuff-select2 -->
<wicketstuff-gmap3.version>${wicket.version}</wicketstuff-gmap3.version>
- <xdocreport.version>2.0.2</xdocreport.version>
-
</properties>
<pluginRepositories>
@@ -944,32 +942,6 @@
<version>${wicket-webjars.version}</version>
</dependency>
- <dependency>
- <groupId>fr.opensagres.xdocreport</groupId>
- <artifactId>fr.opensagres.xdocreport.document.docx</artifactId>
- <version>${xdocreport.version}</version>
- </dependency>
- <dependency>
- <groupId>fr.opensagres.xdocreport</groupId>
- <artifactId>fr.opensagres.xdocreport.template.freemarker</artifactId>
- <version>${xdocreport.version}</version>
- </dependency>
- <dependency>
- <groupId>fr.opensagres.xdocreport</groupId>
- <artifactId>fr.opensagres.xdocreport.converter.docx.xwpf</artifactId>
- <version>${xdocreport.version}</version>
- </dependency>
- <dependency>
- <groupId>fr.opensagres.xdocreport</groupId>
- <artifactId>org.apache.poi.xwpf.converter.pdf</artifactId>
- <version>${xdocreport.version}</version>
- </dependency>
- <dependency>
- <groupId>fr.opensagres.xdocreport</groupId>
- <artifactId>org.apache.poi.xwpf.converter.core</artifactId>
- <version>${xdocreport.version}</version>
- </dependency>
-
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-core</artifactId>
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index 4e02ce543a..7219ac6e24 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -95,17 +95,6 @@
<version>2.0.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-xdocreport-applib</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-zip-applib</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
<!-- 3rd party dependencies -->
@@ -157,8 +146,6 @@
<module>base</module>
<module>excel</module>
<module>spring</module>
- <module>xdocreport</module>
- <module>zip</module>
</modules>
<profiles>
diff --git a/subdomains/xdocreport/adoc/antora.yml b/subdomains/xdocreport/adoc/antora.yml
deleted file mode 100644
index 1044dbbd29..0000000000
--- a/subdomains/xdocreport/adoc/antora.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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.
-
-name: subdomains
-version: latest
diff --git a/subdomains/xdocreport/adoc/modules/xdocreport/nav.adoc b/subdomains/xdocreport/adoc/modules/xdocreport/nav.adoc
deleted file mode 100644
index dbad73b19b..0000000000
--- a/subdomains/xdocreport/adoc/modules/xdocreport/nav.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-
-:Notice: 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 ag [...]
-
-include::subdomains:ROOT:partial$component-nav.adoc[]
diff --git a/subdomains/xdocreport/adoc/modules/xdocreport/pages/about.adoc b/subdomains/xdocreport/adoc/modules/xdocreport/pages/about.adoc
deleted file mode 100644
index ed8366fc60..0000000000
--- a/subdomains/xdocreport/adoc/modules/xdocreport/pages/about.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
-= XDocReport Library
-
-:Notice: 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 ag [...]
-
-WARNING: TODO
diff --git a/subdomains/xdocreport/adoc/modules/xdocreport/partials/module-nav.adoc b/subdomains/xdocreport/adoc/modules/xdocreport/partials/module-nav.adoc
deleted file mode 100644
index 1e38f23abe..0000000000
--- a/subdomains/xdocreport/adoc/modules/xdocreport/partials/module-nav.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-* xref:subdomains:xdocreport:about.adoc[XDocReport Library]
-
-
diff --git a/subdomains/xdocreport/applib/pom.xml b/subdomains/xdocreport/applib/pom.xml
deleted file mode 100644
index 3b5f5ef25f..0000000000
--- a/subdomains/xdocreport/applib/pom.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?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-xdocreport</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>isis-subdomains-xdocreport-applib</artifactId>
- <name>Apache Isis Sub - XdocReport (applib)</name>
-
- <properties>
- <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>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.woodstox</groupId>
- <artifactId>woodstox-core</artifactId>
- </exclusion>
- <!-- circumventing convergence issues since maven-enforcer-plugin.version=3.0.0 -->
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </exclusion>
- <!-- circumventing convergence issues since maven-enforcer-plugin.version=3.0.0 -->
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- <!-- already provided via spring-boot-log4j2 -->
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml-lite</artifactId>
- </dependency>
-
- <dependency>
- <groupId>fr.opensagres.xdocreport</groupId>
- <artifactId>fr.opensagres.xdocreport.document.docx</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>fr.opensagres.xdocreport</groupId>
- <artifactId>fr.opensagres.xdocreport.template.freemarker</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>fr.opensagres.xdocreport</groupId>
- <artifactId>fr.opensagres.xdocreport.converter.docx.xwpf</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-<!-- <dependency> -->
-<!-- <groupId>fr.opensagres.xdocreport</groupId> -->
-<!-- <artifactId>org.apache.poi.xwpf.converter.pdf</artifactId> -->
-<!-- <exclusions> -->
-<!-- <exclusion> -->
-<!-- <groupId>org.osgi</groupId> -->
-<!-- <artifactId>org.osgi.core</artifactId> -->
-<!-- </exclusion> -->
-<!-- <exclusion> -->
-<!-- <groupId>org.apache.poi</groupId> -->
-<!-- <artifactId>poi-ooxml</artifactId> -->
-<!-- </exclusion> -->
-<!-- </exclusions> -->
-<!-- </dependency> -->
-<!-- <dependency> -->
-<!-- <groupId>fr.opensagres.xdocreport</groupId> -->
-<!-- <artifactId>org.apache.poi.xwpf.converter.core</artifactId> -->
-<!-- <exclusions> -->
-<!-- <exclusion> -->
-<!-- <groupId>org.osgi</groupId> -->
-<!-- <artifactId>org.osgi.core</artifactId> -->
-<!-- </exclusion> -->
-<!-- <exclusion> -->
-<!-- <groupId>org.apache.poi</groupId> -->
-<!-- <artifactId>poi-ooxml</artifactId> -->
-<!-- </exclusion> -->
-<!-- </exclusions> -->
-<!-- </dependency> -->
-
- <!-- test -->
- <dependency>
- <groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-unittestsupport-applib</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- provided -->
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <scope>provided</scope>
- </dependency>
-
-
- </dependencies>
-
-</project>
diff --git a/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/IsisModuleSubdomainsXDocReportApplib.java b/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/IsisModuleSubdomainsXDocReportApplib.java
deleted file mode 100644
index 4de755c313..0000000000
--- a/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/IsisModuleSubdomainsXDocReportApplib.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.
- */
-package org.apache.isis.subdomains.xdocreport.applib;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-import org.apache.isis.subdomains.xdocreport.applib.service.XDocReportServiceDefault;
-
-/**
- * @since 2.0 {@index}
- */
-@Configuration
-@Import({
- XDocReportServiceDefault.class
-})
-public class IsisModuleSubdomainsXDocReportApplib {
-
-}
diff --git a/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/XDocReportService.java b/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/XDocReportService.java
deleted file mode 100644
index d8cd9c3709..0000000000
--- a/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/XDocReportService.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.
- */
-package org.apache.isis.subdomains.xdocreport.applib;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @since 2.0 {@index}
- */
-public interface XDocReportService {
-
- byte[] render(byte[] templateBytes, XDocReportModel dataModel, OutputType outputType) throws IOException;
-
- enum OutputType {
- DOCX,
- PDF
- }
-
- /**
- * @since 2.0 {@index}
- */
- interface XDocReportModel {
-
- @lombok.Data
- class Data {
- private final Object obj;
- private final Class<?> cls;
- private final boolean list;
-
- public static <T> Data list(final List<T> objects, final Class<T> cls) {
- return new Data(objects, cls, true);
- }
-
- public static <T> Data object(final T object) {
- return new Data(object, object.getClass(), false);
- }
- }
- Map<String, Data> getContextData();
-
- }
-
-}
diff --git a/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceDefault.java b/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceDefault.java
deleted file mode 100644
index 91e3240fbb..0000000000
--- a/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceDefault.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * 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.
- */
-package org.apache.isis.subdomains.xdocreport.applib.service;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.Map;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.Priority;
-import javax.inject.Named;
-
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Service;
-
-import org.apache.isis.applib.annotation.PriorityPrecedence;
-import org.apache.isis.subdomains.xdocreport.applib.XDocReportService;
-
-import fr.opensagres.poi.xwpf.converter.core.IXWPFConverter;
-import fr.opensagres.poi.xwpf.converter.pdf.PdfConverter;
-import fr.opensagres.poi.xwpf.converter.pdf.PdfOptions;
-import fr.opensagres.xdocreport.core.XDocReportException;
-import fr.opensagres.xdocreport.core.io.internal.ByteArrayOutputStream;
-import fr.opensagres.xdocreport.document.IXDocReport;
-import fr.opensagres.xdocreport.document.registry.XDocReportRegistry;
-import fr.opensagres.xdocreport.template.IContext;
-import fr.opensagres.xdocreport.template.TemplateEngineKind;
-import fr.opensagres.xdocreport.template.formatter.FieldsMetadata;
-
-@Service
-@Named("isis.sub.xdocreport.XDocReportServiceDefault")
-@Priority(PriorityPrecedence.MIDPOINT)
-@Qualifier("Default")
-public class XDocReportServiceDefault implements XDocReportService {
-
- PdfOptions pdfOptions;
-
- @PostConstruct
- public void init() {
- pdfOptions = PdfOptions.create();
- }
-
- @Override
- public byte[] render(
- final byte[] templateBytes,
- final XDocReportModel dataModel,
- final OutputType outputType) throws IOException {
- try {
- final byte[] docxBytes = toDocx(templateBytes, dataModel);
-
- switch (outputType) {
- case PDF:
- return toPdf(docxBytes);
- default: // ie DOCX
- return docxBytes;
- }
-
- } catch (XDocReportException e) {
- throw new IOException(e);
- }
- }
-
-
- protected IXWPFConverter<PdfOptions> pdfConverter() {
- return PdfConverter.getInstance();
- }
-
- // -- HELPER
-
- private byte[] toDocx(final byte[] bytes, final XDocReportModel dataModel) throws IOException, XDocReportException {
- final IXDocReport report = XDocReportRegistry
- .getRegistry().loadReport(new ByteArrayInputStream(bytes), TemplateEngineKind.Freemarker);
-
- final IContext context = report.createContext();
-
- final FieldsMetadata fieldsMetadata = report.createFieldsMetadata();
-
- final Map<String, XDocReportModel.Data> contextObjects = dataModel.getContextData();
- for (final Map.Entry<String, XDocReportModel.Data> entry : contextObjects.entrySet()) {
- final XDocReportModel.Data data = entry.getValue();
- final String key = entry.getKey();
- fieldsMetadata.load(key, data.getCls(), data.isList());
- context.put(key, data.getObj());
- }
-
- final ByteArrayOutputStream baos = new ByteArrayOutputStream();
- report.process(context, baos);
-
- return baos.toByteArray();
- }
-
- private byte[] toPdf(final byte[] docxBytes) throws IOException {
-
- final XWPFDocument document = new XWPFDocument(new ByteArrayInputStream(docxBytes));
-
- final ByteArrayOutputStream baos = new ByteArrayOutputStream();
- pdfConverter().convert(document, baos, pdfOptions);
-
- return baos.toByteArray();
- }
-
-}
diff --git a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceTest.java b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceTest.java
deleted file mode 100644
index bcf60044f4..0000000000
--- a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * 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.
- */
-package org.apache.isis.subdomains.xdocreport.applib.service;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-import org.apache.isis.subdomains.xdocreport.applib.XDocReportService;
-import org.apache.isis.subdomains.xdocreport.applib.XDocReportService.OutputType;
-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.testing.unittestsupport.applib.jmocking.JUnitRuleMockery2;
-
-import fr.opensagres.xdocreport.core.io.IOUtils;
-
-public class XDocReportServiceTest {
-
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
-
- @Rule
- public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
-
- XDocReportService service;
-
- @Before
- public void setUp() throws Exception {
- service = new XDocReportServiceDefault();
- }
-
- @Test
- public void simple() throws Exception {
-
- // given
- InputStream in= new FileInputStream(new File("src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/template/Project-template.docx"));
- final byte[] templateBytes = IOUtils.toByteArray(in);
-
- Project project = new Project("XDocReport");
- List<Developer> developers = new ArrayList<>();
- developers.add(new Developer("ZERR", "Angelo", "angelo.zerr@gmail.com"));
- developers.add(new Developer("Leclercq", "Pascal", "pascal.leclercq@gmail.com"));
- final ProjectDevelopersModel dataModel = new ProjectDevelopersModel(project, developers);
-
- // when
- final byte[] docxBytes = service.render(templateBytes, dataModel, OutputType.DOCX);
-
- // then
- new File("target").mkdir(); // create the target folder if needed [gradle]
- IOUtils.write(docxBytes,new FileOutputStream(new File("target/Project.docx")));
- }
-
-}
diff --git a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate0Fields.java b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate0Fields.java
deleted file mode 100644
index 487e765329..0000000000
--- a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate0Fields.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.
- */
-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.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;
-import fr.opensagres.xdocreport.template.formatter.FieldsMetadata;
-
-public class Generate0Fields {
-
- public static void main(String[] args) throws XDocReportException,IOException {
-
- // 1) Create FieldsMetadata by setting Velocity as template engine
- FieldsMetadata fieldsMetadata = new FieldsMetadata(TemplateEngineKind.Freemarker.name());
-
- // 2) Load fields metadata from Java Class
- fieldsMetadata.load("project", Project.class);
- // Here load is called with true because model is a list of Developer.
- fieldsMetadata.load("developers", Developer.class, true);
-
-
- // 3) Generate XML fields in the file "project.fields.xml".
- // Extension *.fields.xml is very important to use it with MS Macro XDocReport.dotm
- // FieldsMetadata#saveXML is called with true to indent the XML.
- final File xmlFieldsFile = new File("target/project.fields.xml");
- fieldsMetadata.saveXML(new FileOutputStream(xmlFieldsFile), true);
- }
-
-}
diff --git a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate1Docx.java b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate1Docx.java
deleted file mode 100644
index ca04f70320..0000000000
--- a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate1Docx.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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.
- */
-package org.apache.isis.subdomains.xdocreport.applib.service.example;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-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;
-import fr.opensagres.xdocreport.document.registry.XDocReportRegistry;
-import fr.opensagres.xdocreport.template.IContext;
-import fr.opensagres.xdocreport.template.TemplateEngineKind;
-import fr.opensagres.xdocreport.template.formatter.FieldsMetadata;
-
-public class Generate1Docx {
-
- public static void main(String[] args) throws IOException,
- XDocReportException {
-
- // 1) Load Docx file by filling freemarker template engine and cache
- // it to the registry
- InputStream in= new FileInputStream(new File("src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/template/Project-template.docx"));
- IXDocReport report = XDocReportRegistry.getRegistry().loadReport(in,TemplateEngineKind.Freemarker);
-
- // 2) Create fields metadata to manage lazy loop (#forech velocity)
- // for table row.
- // 1) Create FieldsMetadata by setting freemarker as template engine
- FieldsMetadata fieldsMetadata = report.createFieldsMetadata();
-
- // 2) Load fields metadata from Java Class
- fieldsMetadata.load("project", Project.class);
- // Here load is called with true because model is a list of Developer.
- fieldsMetadata.load("developers", Developer.class, true);
-
- // 3) Create context Java model
- IContext context = report.createContext();
-
- Project project = new Project("XDocReport");
- context.put("project", project);
-
- List<Developer> developers = new ArrayList<Developer>();
- developers.add(
- new Developer("ZERR", "Angelo", "angelo.zerr@gmail.com"));
- developers.add(
- new Developer("Leclercq", "Pascal", "pascal.leclercq@gmail.com"));
- context.put("developers", developers);
-
- // 4) Generate report by merging Java model with the Docx
- OutputStream out = new FileOutputStream(new File("target/Project.docx"));
- report.process(context, out);
-
- }
-
-}
diff --git a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate2Pdf.java b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate2Pdf.java
deleted file mode 100644
index 5bd28f82ff..0000000000
--- a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate2Pdf.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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.
- */
-package org.apache.isis.subdomains.xdocreport.applib.service.example;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-
-import fr.opensagres.poi.xwpf.converter.pdf.PdfConverter;
-import fr.opensagres.poi.xwpf.converter.pdf.PdfOptions;
-import fr.opensagres.xdocreport.core.XDocReportException;
-
-public class Generate2Pdf {
-
- public static void main(final String[] args) throws IOException,
- XDocReportException {
-
- // 1) Load DOCX into XWPFDocument
- InputStream in= new FileInputStream(new File("target/Project.docx"));
- XWPFDocument document = new XWPFDocument(in);
-
- // 2) Prepare Pdf options
- PdfOptions options = PdfOptions.create();
-
- // 3) Convert XWPFDocument to Pdf
- OutputStream out = new FileOutputStream(new File("target/Project.pdf"));
- PdfConverter.getInstance().convert(document, out, options);
- }
-
-}
diff --git a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/Developer.java b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/Developer.java
deleted file mode 100644
index 6fea27560a..0000000000
--- a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/Developer.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package org.apache.isis.subdomains.xdocreport.applib.service.example.models;
-
-import lombok.Data;
-
-@Data
-public class Developer {
-
- private final String name;
- private final String lastName;
- private final String mail;
-
-}
diff --git a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/Project.java b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/Project.java
deleted file mode 100644
index f9ef2a3122..0000000000
--- a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/Project.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-package org.apache.isis.subdomains.xdocreport.applib.service.example.models;
-
-import lombok.Data;
-
-@Data
-public class Project {
-
- private final String name;
-
-}
diff --git a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/ProjectDevelopersModel.java b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/ProjectDevelopersModel.java
deleted file mode 100644
index dccbb7550f..0000000000
--- a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/ProjectDevelopersModel.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.
- */
-package org.apache.isis.subdomains.xdocreport.applib.service.example.models;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.subdomains.xdocreport.applib.XDocReportService.XDocReportModel;
-
-import lombok.Data;
-
-@Data
-public class ProjectDevelopersModel implements XDocReportModel {
-
- private final Project project;
- private final List<Developer> developers;
-
- @Override
- public Map<String, Data> getContextData() {
- return _Maps.unmodifiable(
- "project", Data.object(project),
- "developers", Data.list(developers, Developer.class));
- }
-
-}
diff --git a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/template/Project-template.docx b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/template/Project-template.docx
deleted file mode 100644
index 0cc242bb83..0000000000
Binary files a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/template/Project-template.docx and /dev/null differ
diff --git a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/template/project.fields.xml b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/template/project.fields.xml
deleted file mode 100644
index bfa64f5604..0000000000
--- a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/template/project.fields.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-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.
--->
-<fields templateEngineKind="Freemarker" >
- <description><![CDATA[]]></description>
- <field name="project.name" list="false" imageName="" syntaxKind="">
- <description><![CDATA[]]></description>
- </field>
- <field name="developers.lastName" list="true" imageName="" syntaxKind="">
- <description><![CDATA[]]></description>
- </field>
- <field name="developers.mail" list="true" imageName="" syntaxKind="">
- <description><![CDATA[]]></description>
- </field>
- <field name="developers.name" list="true" imageName="" syntaxKind="">
- <description><![CDATA[]]></description>
- </field>
-</fields>
\ No newline at end of file
diff --git a/subdomains/xdocreport/pom.xml b/subdomains/xdocreport/pom.xml
deleted file mode 100644
index 81c27365a3..0000000000
--- a/subdomains/xdocreport/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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-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/zip/adoc/antora.yml b/subdomains/zip/adoc/antora.yml
deleted file mode 100644
index 1044dbbd29..0000000000
--- a/subdomains/zip/adoc/antora.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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.
-
-name: subdomains
-version: latest
diff --git a/subdomains/zip/adoc/modules/zip/nav.adoc b/subdomains/zip/adoc/modules/zip/nav.adoc
deleted file mode 100644
index dbad73b19b..0000000000
--- a/subdomains/zip/adoc/modules/zip/nav.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-
-:Notice: 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 ag [...]
-
-include::subdomains:ROOT:partial$component-nav.adoc[]
diff --git a/subdomains/zip/adoc/modules/zip/pages/about.adoc b/subdomains/zip/adoc/modules/zip/pages/about.adoc
deleted file mode 100644
index 407b078ce4..0000000000
--- a/subdomains/zip/adoc/modules/zip/pages/about.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
-= Zip Library
-
-:Notice: 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 ag [...]
-
-WARNING: TODO
diff --git a/subdomains/zip/adoc/modules/zip/partials/module-nav.adoc b/subdomains/zip/adoc/modules/zip/partials/module-nav.adoc
deleted file mode 100644
index 72d9248fe0..0000000000
--- a/subdomains/zip/adoc/modules/zip/partials/module-nav.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-* xref:subdomains:zip:about.adoc[Zip Library]
-
-
diff --git a/subdomains/zip/applib/pom.xml b/subdomains/zip/applib/pom.xml
deleted file mode 100644
index 627bb7bf4e..0000000000
--- a/subdomains/zip/applib/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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-zip</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>isis-subdomains-zip-applib</artifactId>
- <name>Apache Isis Sub - Zip (applib)</name>
-
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains.zip.applib</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains/zip/applib</git-plugin.propertiesDir>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.commons</groupId>
- <artifactId>isis-commons</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-
-</project>
diff --git a/subdomains/zip/applib/src/main/java/org/apache/isis/subdomains/zip/applib/IsisModuleExtZip.java b/subdomains/zip/applib/src/main/java/org/apache/isis/subdomains/zip/applib/IsisModuleExtZip.java
deleted file mode 100644
index 85df36a7e5..0000000000
--- a/subdomains/zip/applib/src/main/java/org/apache/isis/subdomains/zip/applib/IsisModuleExtZip.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.
- */
-package org.apache.isis.subdomains.zip.applib;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-import org.apache.isis.subdomains.zip.applib.service.ZipServiceDefault;
-
-@Configuration
-@Import({
- ZipServiceDefault.class
-})
-public class IsisModuleExtZip {
-
-}
diff --git a/subdomains/zip/applib/src/main/java/org/apache/isis/subdomains/zip/applib/ZipService.java b/subdomains/zip/applib/src/main/java/org/apache/isis/subdomains/zip/applib/ZipService.java
deleted file mode 100644
index cbcde588ee..0000000000
--- a/subdomains/zip/applib/src/main/java/org/apache/isis/subdomains/zip/applib/ZipService.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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.
- */
-package org.apache.isis.subdomains.zip.applib;
-
-import java.io.File;
-import java.util.List;
-
-import lombok.Data;
-
-public interface ZipService {
-
- /**
- * Rather than use the name of the file (which might be temporary files, for example)
- * we explicitly provide the name to use (in the ZipEntry).
- */
- byte[] zipNamedFiles(List<FileAndName> fileAndNameList);
-
- /**
- * As per {@link #zipNamedFiles(List)},
- * but using each file's name as the zip entry (rather than providing it).
- */
- byte[] zipFiles(List<File> fileList);
-
- /**
- * Similar to {@link #zipNamedFiles(List)}, but uses simple byte[] as the input, rather than files.
- *
- * @param bytesAndNameList
- */
- byte[] zipNamedBytes(List<BytesAndName> bytesAndNameList);
-
- @Data
- public static class FileAndName {
- private final String name;
- private final File file;
- }
-
- @Data
- public static class BytesAndName {
- private final String name;
- private final byte[] bytes;
- }
-
-}
diff --git a/subdomains/zip/applib/src/main/java/org/apache/isis/subdomains/zip/applib/service/ZipServiceDefault.java b/subdomains/zip/applib/src/main/java/org/apache/isis/subdomains/zip/applib/service/ZipServiceDefault.java
deleted file mode 100644
index 47ccd0a019..0000000000
--- a/subdomains/zip/applib/src/main/java/org/apache/isis/subdomains/zip/applib/service/ZipServiceDefault.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * 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.
- */
-package org.apache.isis.subdomains.zip.applib.service;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import javax.annotation.Priority;
-import javax.inject.Named;
-
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Service;
-
-import org.apache.isis.applib.annotation.PriorityPrecedence;
-import org.apache.isis.applib.exceptions.UnrecoverableException;
-import org.apache.isis.commons.internal.base._Bytes;
-import org.apache.isis.subdomains.zip.applib.ZipService;
-
-import lombok.val;
-
-@Service
-@Named("isis.sub.zip.ZipServiceDefault")
-@Priority(PriorityPrecedence.MIDPOINT)
-@Qualifier("Default")
-public class ZipServiceDefault implements ZipService {
-
- @Override
- public byte[] zipNamedFiles(final List<FileAndName> fileAndNameList) {
-
- try {
- final ByteArrayOutputStream baos = new ByteArrayOutputStream();
- final ZipOutputStream zos = new ZipOutputStream(baos);
-
- for (val fileAndName : fileAndNameList) {
- zos.putNextEntry(new ZipEntry(fileAndName.getName()));
-
- try(val fis = new FileInputStream(fileAndName.getFile())){
- zos.write(_Bytes.of(fis));
- }
-
- zos.closeEntry();
- }
- zos.close();
- return baos.toByteArray();
- } catch (final IOException ex) {
- throw new UnrecoverableException("Unable to create zip", ex);
- }
- }
-
- @Override
- public byte[] zipFiles(final List<File> fileList) {
- return zipNamedFiles(fileList.stream()
- .map(file -> new FileAndName(file.getName(), file))
- .collect(Collectors.toList())
- );
- }
-
- @Override
- public byte[] zipNamedBytes(final List<BytesAndName> bytesAndNameList) {
-
- final byte[] bytes;
- try {
- final ByteArrayOutputStream baos = new ByteArrayOutputStream();
- final ZipOutputStream zos = new ZipOutputStream(baos);
-
- for (final BytesAndName ban : bytesAndNameList) {
- zos.putNextEntry(new ZipEntry(ban.getName()));
- zos.write(ban.getBytes());
- zos.closeEntry();
- }
- zos.close();
- bytes = baos.toByteArray();
- } catch (final IOException ex) {
- throw new UnrecoverableException("Unable to create zip", ex);
- }
- return bytes;
- }
-
-}
diff --git a/subdomains/zip/pom.xml b/subdomains/zip/pom.xml
deleted file mode 100644
index 6b3812e67f..0000000000
--- a/subdomains/zip/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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-SNAPSHOT</version>
- </parent>
-
- <artifactId>isis-subdomains-zip</artifactId>
- <name>Apache Isis Sub - Zip (parent)</name>
-
- <description>
- A domain service for Apache Isis', for zipping utilities.
- </description>
-
- <packaging>pom</packaging>
-
- <modules>
- <module>applib</module>
- </modules>
-
-</project>