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:41 UTC
[isis] 03/12: ISIS-2999: deletes subdomain/freemarker
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 61573e0f90b16da115e1607923eae15a8fd65b2f
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Apr 11 18:49:19 2022 +0100
ISIS-2999: deletes subdomain/freemarker
---
antora/playbooks/site-subdomains.yml | 3 --
antora/playbooks/site.yml | 3 --
subdomains/freemarker/adoc/antora.yml | 19 -----------
.../freemarker/adoc/modules/freemarker/nav.adoc | 4 ---
.../adoc/modules/freemarker/pages/about.adoc | 5 ---
.../modules/freemarker/partials/module-nav.adoc | 6 ----
subdomains/freemarker/applib/pom.xml | 38 ----------------------
.../IsisModuleSubdomainsFreemarkerApplib.java | 30 -----------------
subdomains/freemarker/pom.xml | 34 -------------------
subdomains/pom.xml | 7 ----
10 files changed, 149 deletions(-)
diff --git a/antora/playbooks/site-subdomains.yml b/antora/playbooks/site-subdomains.yml
index 310dad1b0d..d403f2a12a 100644
--- a/antora/playbooks/site-subdomains.yml
+++ b/antora/playbooks/site-subdomains.yml
@@ -55,9 +55,6 @@ content:
- url: .
start_path: subdomains/excel/adoc # subdomains
branches: HEAD
- - url: .
- start_path: subdomains/freemarker/adoc # subdomains
- branches: HEAD
- url: .
start_path: subdomains/settings/adoc # subdomains
branches: HEAD
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 2df6389730..324624fab1 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -232,9 +232,6 @@ content:
- url: .
start_path: subdomains/excel/adoc # subdomains
branches: HEAD
- - url: .
- start_path: subdomains/freemarker/adoc # subdomains
- branches: HEAD
- url: .
start_path: subdomains/settings/adoc # subdomains
branches: HEAD
diff --git a/subdomains/freemarker/adoc/antora.yml b/subdomains/freemarker/adoc/antora.yml
deleted file mode 100644
index 1044dbbd29..0000000000
--- a/subdomains/freemarker/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/freemarker/adoc/modules/freemarker/nav.adoc b/subdomains/freemarker/adoc/modules/freemarker/nav.adoc
deleted file mode 100644
index dbad73b19b..0000000000
--- a/subdomains/freemarker/adoc/modules/freemarker/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/freemarker/adoc/modules/freemarker/pages/about.adoc b/subdomains/freemarker/adoc/modules/freemarker/pages/about.adoc
deleted file mode 100644
index 3f10f13067..0000000000
--- a/subdomains/freemarker/adoc/modules/freemarker/pages/about.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
-= Freemarker 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/freemarker/adoc/modules/freemarker/partials/module-nav.adoc b/subdomains/freemarker/adoc/modules/freemarker/partials/module-nav.adoc
deleted file mode 100644
index d9a36ca5d1..0000000000
--- a/subdomains/freemarker/adoc/modules/freemarker/partials/module-nav.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-* xref:subdomains:freemarker:about.adoc[Freemarker Library]
-
-
diff --git a/subdomains/freemarker/applib/pom.xml b/subdomains/freemarker/applib/pom.xml
deleted file mode 100644
index 4b1d5fb85b..0000000000
--- a/subdomains/freemarker/applib/pom.xml
+++ /dev/null
@@ -1,38 +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-freemarker</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>isis-subdomains-freemarker-applib</artifactId>
- <name>Apache Isis Sub - Freemarker (applib)</name>
-
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains.freemarker.applib</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains/freemarker/applib</git-plugin.propertiesDir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/subdomains/freemarker/applib/src/main/java/org/apache/isis/subdomains/freemarker/applib/IsisModuleSubdomainsFreemarkerApplib.java b/subdomains/freemarker/applib/src/main/java/org/apache/isis/subdomains/freemarker/applib/IsisModuleSubdomainsFreemarkerApplib.java
deleted file mode 100644
index d8e29301c4..0000000000
--- a/subdomains/freemarker/applib/src/main/java/org/apache/isis/subdomains/freemarker/applib/IsisModuleSubdomainsFreemarkerApplib.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.freemarker.applib;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-@Configuration
-@Import({
-
-})
-public class IsisModuleSubdomainsFreemarkerApplib {
-
-}
diff --git a/subdomains/freemarker/pom.xml b/subdomains/freemarker/pom.xml
deleted file mode 100644
index 56f8ead57b..0000000000
--- a/subdomains/freemarker/pom.xml
+++ /dev/null
@@ -1,34 +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-freemarker</artifactId>
- <name>Apache Isis Sub - Freemarker (parent)</name>
- <description>Integrates Freemarker Library</description>
-
- <packaging>pom</packaging>
-
- <modules>
- <module>applib</module>
- </modules>
-
-
-</project>
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index 89b1588437..84667df07e 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -102,12 +102,6 @@
<version>2.0.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-freemarker-applib</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
-
<dependency>
<groupId>org.apache.isis.subdomains</groupId>
<artifactId>isis-subdomains-spring-applib</artifactId>
@@ -177,7 +171,6 @@
<module>poi</module>
<module>docx</module>
<module>excel</module>
- <module>freemarker</module>
<module>spring</module>
<module>xdocreport</module>
<module>zip</module>