#219 merge content and template module

CondationCMS · Sep 4, 2024 · d50f05b · d50f05b
1 parent 4028877
commit d50f05b
Show file tree

Hide file tree

Showing 18 changed files with 46 additions and 76 deletions.
diff --git a/cms-content/pom.xml b/cms-content/pom.xml
@@ -40,5 +40,23 @@
 			<groupId>org.jsoup</groupId>
 			<artifactId>jsoup</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.freemarker</groupId>
+			<artifactId>freemarker</artifactId>
+			<version>2.3.33</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.thymeleaf</groupId>
+			<artifactId>thymeleaf</artifactId>
+			<version>3.1.2.RELEASE</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>io.pebbletemplates</groupId>
+			<artifactId>pebble</artifactId>
+			<version>3.2.2</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/cms-content/src/main/java/com/github/thmarx/cms/content/DefaultContentRenderer.java b/cms-content/src/main/java/com/github/thmarx/cms/content/DefaultContentRenderer.java
@@ -49,11 +49,11 @@
 import com.github.thmarx.cms.extensions.hooks.DBHooks;
 import com.github.thmarx.cms.extensions.hooks.TemplateHooks;
 import com.github.thmarx.cms.extensions.request.RequestExtensions;
-import com.github.thmarx.cms.template.functions.LinkFunction;
-import com.github.thmarx.cms.template.functions.list.NodeListFunctionBuilder;
-import com.github.thmarx.cms.template.functions.navigation.NavigationFunction;
-import com.github.thmarx.cms.template.functions.query.QueryFunction;
-import com.github.thmarx.cms.template.functions.taxonomy.TaxonomyFunction;
+import com.github.thmarx.cms.content.template.functions.LinkFunction;
+import com.github.thmarx.cms.content.template.functions.list.NodeListFunctionBuilder;
+import com.github.thmarx.cms.content.template.functions.navigation.NavigationFunction;
+import com.github.thmarx.cms.content.template.functions.query.QueryFunction;
+import com.github.thmarx.cms.content.template.functions.taxonomy.TaxonomyFunction;
 import com.github.thmarx.modules.api.ModuleManager;
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/...unctions/AbstractCurrentNodeFunction.java → ...unctions/AbstractCurrentNodeFunction.java b/...unctions/AbstractCurrentNodeFunction.java → ...unctions/AbstractCurrentNodeFunction.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.template.functions;
+package com.github.thmarx.cms.content.template.functions;
 
 /*-
  * #%L

diff --git a/.../cms/template/functions/LinkFunction.java → ...tent/template/functions/LinkFunction.java b/.../cms/template/functions/LinkFunction.java → ...tent/template/functions/LinkFunction.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.template.functions;
+package com.github.thmarx.cms.content.template.functions;
 
 /*-
  * #%L

diff --git a/...functions/hooks/HooksTemlateFunction.java → ...functions/hooks/HooksTemlateFunction.java b/...functions/hooks/HooksTemlateFunction.java → ...functions/hooks/HooksTemlateFunction.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.template.functions.hooks;
+package com.github.thmarx.cms.content.template.functions.hooks;
 
 /*-
  * #%L

diff --git a/...late/functions/list/NodeListFunction.java → ...late/functions/list/NodeListFunction.java b/...late/functions/list/NodeListFunction.java → ...late/functions/list/NodeListFunction.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.template.functions.list;
+package com.github.thmarx.cms.content.template.functions.list;
 
 /*-
  * #%L
@@ -32,7 +32,7 @@
 import com.github.thmarx.cms.api.feature.features.MarkdownRendererFeature;
 import com.github.thmarx.cms.api.model.ListNode;
 import com.github.thmarx.cms.api.request.RequestContext;
-import com.github.thmarx.cms.template.functions.AbstractCurrentNodeFunction;
+import com.github.thmarx.cms.content.template.functions.AbstractCurrentNodeFunction;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;

diff --git a/...nctions/list/NodeListFunctionBuilder.java → ...nctions/list/NodeListFunctionBuilder.java b/...nctions/list/NodeListFunctionBuilder.java → ...nctions/list/NodeListFunctionBuilder.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.template.functions.list;
+package com.github.thmarx.cms.content.template.functions.list;
 
 /*-
  * #%L
@@ -33,7 +33,7 @@
 import com.github.thmarx.cms.api.model.ListNode;
 import com.github.thmarx.cms.api.request.RequestContext;
 import com.github.thmarx.cms.api.utils.NodeUtil;
-import com.github.thmarx.cms.template.functions.AbstractCurrentNodeFunction;
+import com.github.thmarx.cms.content.template.functions.AbstractCurrentNodeFunction;
 import java.util.Comparator;
 import java.util.Objects;
 import java.util.function.Function;

diff --git a/...ctions/navigation/NavigationFunction.java → ...ctions/navigation/NavigationFunction.java b/...ctions/navigation/NavigationFunction.java → ...ctions/navigation/NavigationFunction.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.template.functions.navigation;
+package com.github.thmarx.cms.content.template.functions.navigation;
 
 /*-
  * #%L
@@ -35,7 +35,7 @@
 import com.github.thmarx.cms.api.request.RequestContext;
 import com.github.thmarx.cms.api.utils.NodeUtil;
 import com.github.thmarx.cms.api.utils.PathUtil;
-import com.github.thmarx.cms.template.functions.AbstractCurrentNodeFunction;
+import com.github.thmarx.cms.content.template.functions.AbstractCurrentNodeFunction;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

diff --git a/...mplate/functions/query/QueryFunction.java → ...mplate/functions/query/QueryFunction.java b/...mplate/functions/query/QueryFunction.java → ...mplate/functions/query/QueryFunction.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.template.functions.query;
+package com.github.thmarx.cms.content.template.functions.query;
 
 /*-
  * #%L
@@ -31,7 +31,7 @@
 import com.github.thmarx.cms.api.model.ListNode;
 import com.github.thmarx.cms.api.request.RequestContext;
 import com.github.thmarx.cms.filesystem.metadata.query.ExtendableQuery;
-import com.github.thmarx.cms.template.functions.AbstractCurrentNodeFunction;
+import com.github.thmarx.cms.content.template.functions.AbstractCurrentNodeFunction;
 import com.google.common.base.Strings;
 import java.util.HashMap;
 import java.util.Map;

diff --git a/.../shortcode/ShortCodeTemplateFunction.java → .../shortcode/ShortCodeTemplateFunction.java b/.../shortcode/ShortCodeTemplateFunction.java → .../shortcode/ShortCodeTemplateFunction.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.template.functions.shortcode;
+package com.github.thmarx.cms.content.template.functions.shortcode;
 
 /*-
  * #%L

diff --git a/.../functions/taxonomy/TaxonomyFunction.java → .../functions/taxonomy/TaxonomyFunction.java b/.../functions/taxonomy/TaxonomyFunction.java → .../functions/taxonomy/TaxonomyFunction.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.template.functions.taxonomy;
+package com.github.thmarx.cms.content.template.functions.taxonomy;
 
 /*-
  * #%L

diff --git a/cms-content/src/main/java/com/github/thmarx/cms/content/views/NodeResolver.java b/cms-content/src/main/java/com/github/thmarx/cms/content/views/NodeResolver.java
@@ -31,10 +31,9 @@
 import com.github.thmarx.cms.api.model.ListNode;
 import com.github.thmarx.cms.api.request.RequestContext;
 import com.github.thmarx.cms.content.views.model.View;
-import com.github.thmarx.cms.template.functions.list.NodeListFunctionBuilder;
-import com.github.thmarx.cms.template.functions.query.QueryFunction;
+import com.github.thmarx.cms.content.template.functions.list.NodeListFunctionBuilder;
+import com.github.thmarx.cms.content.template.functions.query.QueryFunction;
 import com.google.common.base.Strings;
-import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
 import lombok.RequiredArgsConstructor;

diff --git a/...ns/navigation/NavigationFunctionTest.java → ...te/navigation/NavigationFunctionTest.java b/...ns/navigation/NavigationFunctionTest.java → ...te/navigation/NavigationFunctionTest.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.template.functions.navigation;
+package com.github.thmarx.cms.content.template.navigation;
 
 /*-
  * #%L
@@ -22,6 +22,7 @@
  * #L%
  */
 
+import com.github.thmarx.cms.content.template.functions.navigation.NavigationFunction;
 import com.github.thmarx.cms.api.content.ContentParser;
 import com.github.thmarx.cms.api.db.Content;
 import com.github.thmarx.cms.api.db.DB;

diff --git a/...eMarkerShortCodeTemplateFunctionTest.java → ...eMarkerShortCodeTemplateFunctionTest.java b/...eMarkerShortCodeTemplateFunctionTest.java → ...eMarkerShortCodeTemplateFunctionTest.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.template.functions.shortcode;
+package com.github.thmarx.cms.content.template.shortcode;
 
 /*-
  * #%L
@@ -22,6 +22,7 @@
  * #L%
  */
 
+import com.github.thmarx.cms.content.template.functions.shortcode.ShortCodeTemplateFunction;
 import com.github.thmarx.cms.content.shortcodes.ShortCodes;
 import freemarker.template.Configuration;
 import freemarker.template.Template;

diff --git a/.../PebbleShortCodeTemplateFunctionTest.java → .../PebbleShortCodeTemplateFunctionTest.java b/.../PebbleShortCodeTemplateFunctionTest.java → .../PebbleShortCodeTemplateFunctionTest.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.template.functions.shortcode;
+package com.github.thmarx.cms.content.template.shortcode;
 
 /*-
  * #%L
@@ -22,6 +22,7 @@
  * #L%
  */
 
+import com.github.thmarx.cms.content.template.functions.shortcode.ShortCodeTemplateFunction;
 import com.github.thmarx.cms.content.shortcodes.ShortCodes;
 import io.pebbletemplates.pebble.PebbleEngine;
 import io.pebbletemplates.pebble.loader.StringLoader;

diff --git a/...ymeleafShortCodeTemplateFunctionTest.java → ...ymeleafShortCodeTemplateFunctionTest.java b/...ymeleafShortCodeTemplateFunctionTest.java → ...ymeleafShortCodeTemplateFunctionTest.java
@@ -1,4 +1,4 @@
-package com.github.thmarx.cms.template.functions.shortcode;
+package com.github.thmarx.cms.content.template.shortcode;
 
 /*-
  * #%L
@@ -22,6 +22,7 @@
  * #L%
  */
 
+import com.github.thmarx.cms.content.template.functions.shortcode.ShortCodeTemplateFunction;
 import com.github.thmarx.cms.content.shortcodes.ShortCodes;
 import java.util.Map;
 import org.assertj.core.api.Assertions;

diff --git a/cms-template/pom.xml b/cms-template/pom.xml
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,6 @@
 		<module>cms-media</module>
 		<module>cms-git</module>
 		<module>cms-sandbox</module>
-		<module>cms-template</module>
 		<module>cms-content</module>
 		<module>cms-extensions</module>
 		<module>cms-auth</module>