diff --git a/pom.xml b/pom.xml
index e86200f..c93cd47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,9 +3,9 @@
4.0.0
- com.github.thmarx.cms.modules
+ com.condation.cms.modules
forms-module
- 1.2.0
+ 2.0.0
jar
UTF-8
@@ -14,16 +14,27 @@
forms module
NORMAL
- 4.5.0
+ 6.0.0-SNAPSHOT
21
21
+ 2024
+
+ CondationCMS
+ https://condation.com
+
+
+
+ GPL v3
+ https://www.gnu.org/licenses/gpl-3.0.html
+
+
org.simplejavamail
simple-java-mail
- 8.5.1
+ 8.11.2
org.slf4j
@@ -34,7 +45,7 @@
net.logicsquad
nanocaptcha
- 1.5
+ 2.1
org.slf4j
@@ -55,13 +66,13 @@
com.google.code.gson
gson
- 2.10.1
+ 2.11.0
org.junit.jupiter
junit-jupiter
- 5.10.1
+ 5.11.0
test
@@ -79,19 +90,19 @@
org.assertj
assertj-core
- 3.24.2
+ 3.26.3
test
- com.github.thmarx.cms
+ com.condation.cms
cms-api
${cms.version}
provided
- com.github.thmarx.cms.module.framework
+ com.condation.cms.module.framework
modules-api
${cms.version}
provided
@@ -99,7 +110,7 @@
org.projectlombok
lombok
- 1.18.30
+ 1.18.34
provided
@@ -107,7 +118,7 @@
maven-assembly-plugin
- 3.6.0
+ 3.7.1
src/main/assembly/assembly.xml
@@ -122,7 +133,33 @@
-
+
+
+ org.codehaus.mojo
+ license-maven-plugin
+ 2.4.0
+
+ false
+ gpl_v3
+
+
+
+ first
+
+ update-file-header
+
+ process-sources
+
+ gpl_v3
+
+ src/main/java
+ src/resources
+ src/test
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/github/thmarx/cms/modules/forms/FormHandlingException.java b/src/main/java/com/condation/cms/modules/forms/FormHandlingException.java
similarity index 94%
rename from src/main/java/com/github/thmarx/cms/modules/forms/FormHandlingException.java
rename to src/main/java/com/condation/cms/modules/forms/FormHandlingException.java
index 37ccb04..9244ea5 100644
--- a/src/main/java/com/github/thmarx/cms/modules/forms/FormHandlingException.java
+++ b/src/main/java/com/condation/cms/modules/forms/FormHandlingException.java
@@ -1,10 +1,10 @@
-package com.github.thmarx.cms.modules.forms;
+package com.condation.cms.modules.forms;
/*-
* #%L
* forms-module
* %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -22,6 +22,7 @@
* #L%
*/
+
import java.util.Optional;
/**
diff --git a/src/main/java/com/github/thmarx/cms/modules/forms/FormsConfig.java b/src/main/java/com/condation/cms/modules/forms/FormsConfig.java
similarity index 95%
rename from src/main/java/com/github/thmarx/cms/modules/forms/FormsConfig.java
rename to src/main/java/com/condation/cms/modules/forms/FormsConfig.java
index 10af5d0..fc9e943 100644
--- a/src/main/java/com/github/thmarx/cms/modules/forms/FormsConfig.java
+++ b/src/main/java/com/condation/cms/modules/forms/FormsConfig.java
@@ -1,10 +1,10 @@
-package com.github.thmarx.cms.modules.forms;
+package com.condation.cms.modules.forms;
/*-
* #%L
* forms-module
* %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -22,6 +22,7 @@
* #L%
*/
+
import java.util.List;
import java.util.Optional;
import lombok.Data;
diff --git a/src/main/java/com/github/thmarx/cms/modules/forms/FormsHandling.java b/src/main/java/com/condation/cms/modules/forms/FormsHandling.java
similarity index 96%
rename from src/main/java/com/github/thmarx/cms/modules/forms/FormsHandling.java
rename to src/main/java/com/condation/cms/modules/forms/FormsHandling.java
index 7eec31f..7b526e6 100644
--- a/src/main/java/com/github/thmarx/cms/modules/forms/FormsHandling.java
+++ b/src/main/java/com/condation/cms/modules/forms/FormsHandling.java
@@ -1,10 +1,10 @@
-package com.github.thmarx.cms.modules.forms;
+package com.condation.cms.modules.forms;
/*-
* #%L
* forms-module
* %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -22,6 +22,7 @@
* #L%
*/
+
import java.util.function.Function;
import lombok.extern.slf4j.Slf4j;
import org.simplejavamail.email.EmailBuilder;
diff --git a/src/main/java/com/github/thmarx/cms/modules/forms/FormsHttpHandlerExtension.java b/src/main/java/com/condation/cms/modules/forms/FormsHttpHandlerExtension.java
similarity index 70%
rename from src/main/java/com/github/thmarx/cms/modules/forms/FormsHttpHandlerExtension.java
rename to src/main/java/com/condation/cms/modules/forms/FormsHttpHandlerExtension.java
index 8994c82..406585c 100644
--- a/src/main/java/com/github/thmarx/cms/modules/forms/FormsHttpHandlerExtension.java
+++ b/src/main/java/com/condation/cms/modules/forms/FormsHttpHandlerExtension.java
@@ -1,10 +1,10 @@
-package com.github.thmarx.cms.modules.forms;
+package com.condation.cms.modules.forms;
/*-
* #%L
* forms-module
* %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -22,13 +22,14 @@
* #L%
*/
-import com.github.thmarx.cms.api.extensions.HttpHandlerExtensionPoint;
-import com.github.thmarx.cms.api.extensions.Mapping;
-import com.github.thmarx.cms.modules.forms.handler.AjaxCaptchaValidationHandler;
-import com.github.thmarx.cms.modules.forms.handler.GenerateCaptchaHandler;
-import com.github.thmarx.cms.modules.forms.handler.AjaxSubmitFormHandler;
-import com.github.thmarx.cms.modules.forms.handler.SubmitFormHandler;
-import com.github.thmarx.modules.api.annotation.Extension;
+
+import com.condation.cms.api.extensions.HttpHandlerExtensionPoint;
+import com.condation.cms.api.extensions.Mapping;
+import com.condation.cms.modules.forms.handler.AjaxCaptchaValidationHandler;
+import com.condation.cms.modules.forms.handler.GenerateCaptchaHandler;
+import com.condation.cms.modules.forms.handler.AjaxSubmitFormHandler;
+import com.condation.cms.modules.forms.handler.SubmitFormHandler;
+import com.condation.modules.api.annotation.Extension;
import org.eclipse.jetty.http.pathmap.PathSpec;
/**
diff --git a/src/main/java/com/github/thmarx/cms/modules/forms/FormsLifecycleExtension.java b/src/main/java/com/condation/cms/modules/forms/FormsLifecycleExtension.java
similarity index 84%
rename from src/main/java/com/github/thmarx/cms/modules/forms/FormsLifecycleExtension.java
rename to src/main/java/com/condation/cms/modules/forms/FormsLifecycleExtension.java
index debbb75..510cb46 100644
--- a/src/main/java/com/github/thmarx/cms/modules/forms/FormsLifecycleExtension.java
+++ b/src/main/java/com/condation/cms/modules/forms/FormsLifecycleExtension.java
@@ -1,10 +1,10 @@
-package com.github.thmarx.cms.modules.forms;
+package com.condation.cms.modules.forms;
/*-
* #%L
* forms-module
* %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -22,13 +22,14 @@
* #L%
*/
+
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
-import com.github.thmarx.cms.api.feature.features.DBFeature;
-import com.github.thmarx.cms.api.module.CMSModuleContext;
-import com.github.thmarx.cms.api.module.CMSRequestContext;
-import com.github.thmarx.modules.api.ModuleLifeCycleExtension;
-import com.github.thmarx.modules.api.annotation.Extension;
+import com.condation.cms.api.feature.features.DBFeature;
+import com.condation.cms.api.module.CMSModuleContext;
+import com.condation.cms.api.module.CMSRequestContext;
+import com.condation.modules.api.ModuleLifeCycleExtension;
+import com.condation.modules.api.annotation.Extension;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
diff --git a/src/main/java/com/github/thmarx/cms/modules/forms/FormsTemplateModelExtensionPoint.java b/src/main/java/com/condation/cms/modules/forms/FormsTemplateModelExtensionPoint.java
similarity index 68%
rename from src/main/java/com/github/thmarx/cms/modules/forms/FormsTemplateModelExtensionPoint.java
rename to src/main/java/com/condation/cms/modules/forms/FormsTemplateModelExtensionPoint.java
index c93b444..f58dc46 100644
--- a/src/main/java/com/github/thmarx/cms/modules/forms/FormsTemplateModelExtensionPoint.java
+++ b/src/main/java/com/condation/cms/modules/forms/FormsTemplateModelExtensionPoint.java
@@ -1,10 +1,10 @@
-package com.github.thmarx.cms.modules.forms;
+package com.condation.cms.modules.forms;
/*-
* #%L
* forms-module
* %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -22,10 +22,13 @@
* #L%
*/
-import com.github.thmarx.cms.api.extensions.TemplateModelExtendingExtentionPoint;
-import com.github.thmarx.cms.api.template.TemplateEngine;
-import com.github.thmarx.cms.modules.forms.template.FormsTemplateModel;
-import com.github.thmarx.modules.api.annotation.Extension;
+
+import com.condation.cms.api.extensions.TemplateModelExtendingExtentionPoint;
+import com.condation.cms.api.template.TemplateEngine;
+import com.condation.cms.api.extensions.TemplateModelExtendingExtentionPoint;
+import com.condation.cms.modules.forms.template.FormsTemplateModel;
+import com.condation.modules.api.annotation.Extension;
+import com.condation.modules.api.annotation.Extension;
/**
*
diff --git a/src/main/java/com/github/thmarx/cms/modules/forms/handler/AjaxCaptchaValidationHandler.java b/src/main/java/com/condation/cms/modules/forms/handler/AjaxCaptchaValidationHandler.java
similarity index 90%
rename from src/main/java/com/github/thmarx/cms/modules/forms/handler/AjaxCaptchaValidationHandler.java
rename to src/main/java/com/condation/cms/modules/forms/handler/AjaxCaptchaValidationHandler.java
index 2349f0a..dab482f 100644
--- a/src/main/java/com/github/thmarx/cms/modules/forms/handler/AjaxCaptchaValidationHandler.java
+++ b/src/main/java/com/condation/cms/modules/forms/handler/AjaxCaptchaValidationHandler.java
@@ -1,10 +1,10 @@
-package com.github.thmarx.cms.modules.forms.handler;
+package com.condation.cms.modules.forms.handler;
/*-
* #%L
* forms-module
* %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -22,8 +22,9 @@
* #L%
*/
-import com.github.thmarx.cms.api.extensions.HttpHandler;
-import com.github.thmarx.cms.modules.forms.FormsLifecycleExtension;
+
+import com.condation.cms.api.extensions.HttpHandler;
+import com.condation.cms.modules.forms.FormsLifecycleExtension;
import com.google.gson.Gson;
import java.nio.charset.StandardCharsets;
import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/com/github/thmarx/cms/modules/forms/handler/AjaxSubmitFormHandler.java b/src/main/java/com/condation/cms/modules/forms/handler/AjaxSubmitFormHandler.java
similarity index 91%
rename from src/main/java/com/github/thmarx/cms/modules/forms/handler/AjaxSubmitFormHandler.java
rename to src/main/java/com/condation/cms/modules/forms/handler/AjaxSubmitFormHandler.java
index be6bb79..25b86e5 100644
--- a/src/main/java/com/github/thmarx/cms/modules/forms/handler/AjaxSubmitFormHandler.java
+++ b/src/main/java/com/condation/cms/modules/forms/handler/AjaxSubmitFormHandler.java
@@ -1,10 +1,10 @@
-package com.github.thmarx.cms.modules.forms.handler;
+package com.condation.cms.modules.forms.handler;
/*-
* #%L
* forms-module
* %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -22,8 +22,9 @@
* #L%
*/
-import com.github.thmarx.cms.api.extensions.HttpHandler;
-import com.github.thmarx.cms.modules.forms.FormsLifecycleExtension;
+
+import com.condation.cms.api.extensions.HttpHandler;
+import com.condation.cms.modules.forms.FormsLifecycleExtension;
import com.google.gson.Gson;
import java.nio.charset.StandardCharsets;
import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/com/github/thmarx/cms/modules/forms/handler/GenerateCaptchaHandler.java b/src/main/java/com/condation/cms/modules/forms/handler/GenerateCaptchaHandler.java
similarity index 91%
rename from src/main/java/com/github/thmarx/cms/modules/forms/handler/GenerateCaptchaHandler.java
rename to src/main/java/com/condation/cms/modules/forms/handler/GenerateCaptchaHandler.java
index 0ceea79..9161b86 100644
--- a/src/main/java/com/github/thmarx/cms/modules/forms/handler/GenerateCaptchaHandler.java
+++ b/src/main/java/com/condation/cms/modules/forms/handler/GenerateCaptchaHandler.java
@@ -1,10 +1,10 @@
-package com.github.thmarx.cms.modules.forms.handler;
+package com.condation.cms.modules.forms.handler;
/*-
* #%L
* forms-module
* %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -22,9 +22,10 @@
* #L%
*/
-import com.github.thmarx.cms.api.extensions.HttpHandler;
-import com.github.thmarx.cms.api.utils.HTTPUtil;
-import com.github.thmarx.cms.modules.forms.FormsLifecycleExtension;
+
+import com.condation.cms.api.extensions.HttpHandler;
+import com.condation.cms.api.utils.HTTPUtil;
+import com.condation.cms.modules.forms.FormsLifecycleExtension;
import java.io.ByteArrayOutputStream;
import java.nio.ByteBuffer;
import java.util.List;
diff --git a/src/main/java/com/github/thmarx/cms/modules/forms/handler/SubmitFormHandler.java b/src/main/java/com/condation/cms/modules/forms/handler/SubmitFormHandler.java
similarity index 94%
rename from src/main/java/com/github/thmarx/cms/modules/forms/handler/SubmitFormHandler.java
rename to src/main/java/com/condation/cms/modules/forms/handler/SubmitFormHandler.java
index c141011..9efe42a 100644
--- a/src/main/java/com/github/thmarx/cms/modules/forms/handler/SubmitFormHandler.java
+++ b/src/main/java/com/condation/cms/modules/forms/handler/SubmitFormHandler.java
@@ -1,10 +1,10 @@
-package com.github.thmarx.cms.modules.forms.handler;
+package com.condation.cms.modules.forms.handler;
/*-
* #%L
* forms-module
* %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -21,10 +21,11 @@
* .
* #L%
*/
-import com.github.thmarx.cms.api.extensions.HttpHandler;
-import com.github.thmarx.cms.modules.forms.FormHandlingException;
-import com.github.thmarx.cms.modules.forms.FormsHandling;
-import com.github.thmarx.cms.modules.forms.FormsLifecycleExtension;
+
+import com.condation.cms.api.extensions.HttpHandler;
+import com.condation.cms.modules.forms.FormHandlingException;
+import com.condation.cms.modules.forms.FormsHandling;
+import com.condation.cms.modules.forms.FormsLifecycleExtension;
import com.google.common.base.Strings;
import com.google.gson.Gson;
import java.nio.charset.StandardCharsets;
diff --git a/src/main/java/com/github/thmarx/cms/modules/forms/template/FormsTemplateModel.java b/src/main/java/com/condation/cms/modules/forms/template/FormsTemplateModel.java
similarity index 86%
rename from src/main/java/com/github/thmarx/cms/modules/forms/template/FormsTemplateModel.java
rename to src/main/java/com/condation/cms/modules/forms/template/FormsTemplateModel.java
index b02c113..1c1addd 100644
--- a/src/main/java/com/github/thmarx/cms/modules/forms/template/FormsTemplateModel.java
+++ b/src/main/java/com/condation/cms/modules/forms/template/FormsTemplateModel.java
@@ -1,10 +1,10 @@
-package com.github.thmarx.cms.modules.forms.template;
+package com.condation.cms.modules.forms.template;
/*-
* #%L
* forms-module
* %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -22,7 +22,8 @@
* #L%
*/
-import com.github.thmarx.cms.modules.forms.utils.StringUtil;
+
+import com.condation.cms.modules.forms.utils.StringUtil;
/**
*
diff --git a/src/main/java/com/github/thmarx/cms/modules/forms/utils/StringUtil.java b/src/main/java/com/condation/cms/modules/forms/utils/StringUtil.java
similarity index 93%
rename from src/main/java/com/github/thmarx/cms/modules/forms/utils/StringUtil.java
rename to src/main/java/com/condation/cms/modules/forms/utils/StringUtil.java
index 317f2aa..7fcd8e4 100644
--- a/src/main/java/com/github/thmarx/cms/modules/forms/utils/StringUtil.java
+++ b/src/main/java/com/condation/cms/modules/forms/utils/StringUtil.java
@@ -1,10 +1,10 @@
-package com.github.thmarx.cms.modules.forms.utils;
+package com.condation.cms.modules.forms.utils;
/*-
* #%L
* forms-module
* %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -22,6 +22,7 @@
* #L%
*/
+
import java.util.Random;
/**
diff --git a/src/test/java/com/github/thmarx/cms/modules/forms/CaptchaTest.java b/src/test/java/com/condation/cms/modules/forms/CaptchaTest.java
similarity index 94%
rename from src/test/java/com/github/thmarx/cms/modules/forms/CaptchaTest.java
rename to src/test/java/com/condation/cms/modules/forms/CaptchaTest.java
index f30f0f9..5f8816a 100644
--- a/src/test/java/com/github/thmarx/cms/modules/forms/CaptchaTest.java
+++ b/src/test/java/com/condation/cms/modules/forms/CaptchaTest.java
@@ -1,10 +1,10 @@
-package com.github.thmarx.cms.modules.forms;
+package com.condation.cms.modules.forms;
/*-
* #%L
* forms-module
* %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -22,6 +22,7 @@
* #L%
*/
+
import java.io.File;
import java.io.IOException;
import javax.imageio.ImageIO;
diff --git a/src/test/java/com/github/thmarx/cms/modules/forms/MailTest.java b/src/test/java/com/condation/cms/modules/forms/MailTest.java
similarity index 96%
rename from src/test/java/com/github/thmarx/cms/modules/forms/MailTest.java
rename to src/test/java/com/condation/cms/modules/forms/MailTest.java
index 5de21b0..2fe16f0 100644
--- a/src/test/java/com/github/thmarx/cms/modules/forms/MailTest.java
+++ b/src/test/java/com/condation/cms/modules/forms/MailTest.java
@@ -1,10 +1,10 @@
-package com.github.thmarx.cms.modules.forms;
+package com.condation.cms.modules.forms;
/*-
* #%L
* forms-module
* %%
- * Copyright (C) 2023 Marx-Software
+ * Copyright (C) 2024 CondationCMS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -23,6 +23,7 @@
*/
+
import com.icegreen.greenmail.util.GreenMail;
import com.icegreen.greenmail.util.ServerSetupTest;
import org.assertj.core.api.Assertions;