From 1dc8fb5483d74399efd88c4c9286860344f0a0f1 Mon Sep 17 00:00:00 2001 From: Thorsten Marx Date: Thu, 12 Sep 2024 18:07:55 +0200 Subject: [PATCH 1/2] update to condation cms 6.0.0 --- pom.xml | 43 +++++++++++++++++-- .../cms/modules/search/FileUtils.java | 2 +- .../cms/modules/search/IndexDocument.java | 2 +- .../cms/modules/search/SearchEngine.java | 6 +-- .../cms/modules/search/SearchField.java | 2 +- .../cms/modules/search/SearchRequest.java | 2 +- .../search/extension/FileIndexingVisitor.java | 6 +-- .../extension/SearchHttpExtensionPoint.java | 4 +- .../extension/SearchLifecycleExtension.java | 4 +- .../modules/search/http/SearchHandler.java | 8 ++-- .../cms/modules/search/index/SearchIndex.java | 10 ++--- .../modules/search/index/SearchResult.java | 2 +- .../search}/FileIndexingVisitorTest.java | 2 +- 13 files changed, 65 insertions(+), 28 deletions(-) rename src/main/java/com/{github/thmarx => condation}/cms/modules/search/FileUtils.java (96%) rename src/main/java/com/{github/thmarx => condation}/cms/modules/search/IndexDocument.java (95%) rename src/main/java/com/{github/thmarx => condation}/cms/modules/search/SearchEngine.java (91%) rename src/main/java/com/{github/thmarx => condation}/cms/modules/search/SearchField.java (95%) rename src/main/java/com/{github/thmarx => condation}/cms/modules/search/SearchRequest.java (94%) rename src/main/java/com/{github/thmarx => condation}/cms/modules/search/extension/FileIndexingVisitor.java (96%) rename src/main/java/com/{github/thmarx => condation}/cms/modules/search/extension/SearchHttpExtensionPoint.java (91%) rename src/main/java/com/{github/thmarx => condation}/cms/modules/search/extension/SearchLifecycleExtension.java (96%) rename src/main/java/com/{github/thmarx => condation}/cms/modules/search/http/SearchHandler.java (91%) rename src/main/java/com/{github/thmarx => condation}/cms/modules/search/index/SearchIndex.java (97%) rename src/main/java/com/{github/thmarx => condation}/cms/modules/search/index/SearchResult.java (95%) rename src/test/java/com/{github/thmarx/cms/modules/search/extension => condation/cms/modules/search}/FileIndexingVisitorTest.java (97%) diff --git a/pom.xml b/pom.xml index d4d539f..f11f23a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.github.thmarx.cms.modules search-module - 1.2.1 + 2.0.0 jar UTF-8 @@ -12,11 +12,22 @@ search module NORMAL - 4.18.1 - 9.11.0 + 6.0.0-SNAPSHOT + 9.11.1 21 21 + 2024 + + CondationCMS + https://condation.com + + + + GPL v3 + https://www.gnu.org/licenses/gpl-3.0.html + + com.github.thmarx.cms @@ -120,6 +131,32 @@ + + 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 + + + + + maven-assembly-plugin 3.7.1 diff --git a/src/main/java/com/github/thmarx/cms/modules/search/FileUtils.java b/src/main/java/com/condation/cms/modules/search/FileUtils.java similarity index 96% rename from src/main/java/com/github/thmarx/cms/modules/search/FileUtils.java rename to src/main/java/com/condation/cms/modules/search/FileUtils.java index f20d2db..e60daea 100644 --- a/src/main/java/com/github/thmarx/cms/modules/search/FileUtils.java +++ b/src/main/java/com/condation/cms/modules/search/FileUtils.java @@ -1,4 +1,4 @@ -package com.github.thmarx.cms.modules.search; +package com.condation.cms.modules.search; /*- * #%L diff --git a/src/main/java/com/github/thmarx/cms/modules/search/IndexDocument.java b/src/main/java/com/condation/cms/modules/search/IndexDocument.java similarity index 95% rename from src/main/java/com/github/thmarx/cms/modules/search/IndexDocument.java rename to src/main/java/com/condation/cms/modules/search/IndexDocument.java index 49918d0..e43cb0a 100644 --- a/src/main/java/com/github/thmarx/cms/modules/search/IndexDocument.java +++ b/src/main/java/com/condation/cms/modules/search/IndexDocument.java @@ -1,4 +1,4 @@ -package com.github.thmarx.cms.modules.search; +package com.condation.cms.modules.search; /*- * #%L diff --git a/src/main/java/com/github/thmarx/cms/modules/search/SearchEngine.java b/src/main/java/com/condation/cms/modules/search/SearchEngine.java similarity index 91% rename from src/main/java/com/github/thmarx/cms/modules/search/SearchEngine.java rename to src/main/java/com/condation/cms/modules/search/SearchEngine.java index 4136624..57c8740 100644 --- a/src/main/java/com/github/thmarx/cms/modules/search/SearchEngine.java +++ b/src/main/java/com/condation/cms/modules/search/SearchEngine.java @@ -1,4 +1,4 @@ -package com.github.thmarx.cms.modules.search; +package com.condation.cms.modules.search; /*- * #%L @@ -22,8 +22,8 @@ * #L% */ -import com.github.thmarx.cms.modules.search.index.SearchIndex; -import com.github.thmarx.cms.modules.search.index.SearchResult; +import com.condation.cms.modules.search.index.SearchIndex; +import com.condation.cms.modules.search.index.SearchResult; import com.google.common.base.Strings; import java.io.IOException; import java.nio.file.Path; diff --git a/src/main/java/com/github/thmarx/cms/modules/search/SearchField.java b/src/main/java/com/condation/cms/modules/search/SearchField.java similarity index 95% rename from src/main/java/com/github/thmarx/cms/modules/search/SearchField.java rename to src/main/java/com/condation/cms/modules/search/SearchField.java index 8cc4a4d..0c01da7 100644 --- a/src/main/java/com/github/thmarx/cms/modules/search/SearchField.java +++ b/src/main/java/com/condation/cms/modules/search/SearchField.java @@ -1,4 +1,4 @@ -package com.github.thmarx.cms.modules.search; +package com.condation.cms.modules.search; /*- * #%L diff --git a/src/main/java/com/github/thmarx/cms/modules/search/SearchRequest.java b/src/main/java/com/condation/cms/modules/search/SearchRequest.java similarity index 94% rename from src/main/java/com/github/thmarx/cms/modules/search/SearchRequest.java rename to src/main/java/com/condation/cms/modules/search/SearchRequest.java index 0f70206..dd85927 100644 --- a/src/main/java/com/github/thmarx/cms/modules/search/SearchRequest.java +++ b/src/main/java/com/condation/cms/modules/search/SearchRequest.java @@ -1,4 +1,4 @@ -package com.github.thmarx.cms.modules.search; +package com.condation.cms.modules.search; /*- * #%L diff --git a/src/main/java/com/github/thmarx/cms/modules/search/extension/FileIndexingVisitor.java b/src/main/java/com/condation/cms/modules/search/extension/FileIndexingVisitor.java similarity index 96% rename from src/main/java/com/github/thmarx/cms/modules/search/extension/FileIndexingVisitor.java rename to src/main/java/com/condation/cms/modules/search/extension/FileIndexingVisitor.java index cf902b6..653664b 100644 --- a/src/main/java/com/github/thmarx/cms/modules/search/extension/FileIndexingVisitor.java +++ b/src/main/java/com/condation/cms/modules/search/extension/FileIndexingVisitor.java @@ -1,4 +1,4 @@ -package com.github.thmarx.cms.modules.search.extension; +package com.condation.cms.modules.search.extension; /*- * #%L @@ -30,8 +30,8 @@ import com.github.thmarx.cms.api.utils.HTTPUtil; import com.github.thmarx.cms.api.utils.PathUtil; import com.github.thmarx.cms.api.utils.SectionUtil; -import com.github.thmarx.cms.modules.search.IndexDocument; -import com.github.thmarx.cms.modules.search.SearchEngine; +import com.condation.cms.modules.search.IndexDocument; +import com.condation.cms.modules.search.SearchEngine; import com.google.common.base.Strings; import java.io.IOException; import java.nio.file.FileVisitResult; diff --git a/src/main/java/com/github/thmarx/cms/modules/search/extension/SearchHttpExtensionPoint.java b/src/main/java/com/condation/cms/modules/search/extension/SearchHttpExtensionPoint.java similarity index 91% rename from src/main/java/com/github/thmarx/cms/modules/search/extension/SearchHttpExtensionPoint.java rename to src/main/java/com/condation/cms/modules/search/extension/SearchHttpExtensionPoint.java index ada4ad9..326e3dd 100644 --- a/src/main/java/com/github/thmarx/cms/modules/search/extension/SearchHttpExtensionPoint.java +++ b/src/main/java/com/condation/cms/modules/search/extension/SearchHttpExtensionPoint.java @@ -1,4 +1,4 @@ -package com.github.thmarx.cms.modules.search.extension; +package com.condation.cms.modules.search.extension; /*- * #%L @@ -24,7 +24,7 @@ import com.github.thmarx.cms.api.extensions.HttpHandlerExtensionPoint; import com.github.thmarx.cms.api.extensions.Mapping; -import com.github.thmarx.cms.modules.search.http.SearchHandler; +import com.condation.cms.modules.search.http.SearchHandler; import com.github.thmarx.modules.api.annotation.Extension; import org.eclipse.jetty.http.pathmap.PathSpec; diff --git a/src/main/java/com/github/thmarx/cms/modules/search/extension/SearchLifecycleExtension.java b/src/main/java/com/condation/cms/modules/search/extension/SearchLifecycleExtension.java similarity index 96% rename from src/main/java/com/github/thmarx/cms/modules/search/extension/SearchLifecycleExtension.java rename to src/main/java/com/condation/cms/modules/search/extension/SearchLifecycleExtension.java index 15f2483..37eaa94 100644 --- a/src/main/java/com/github/thmarx/cms/modules/search/extension/SearchLifecycleExtension.java +++ b/src/main/java/com/condation/cms/modules/search/extension/SearchLifecycleExtension.java @@ -1,4 +1,4 @@ -package com.github.thmarx.cms.modules.search.extension; +package com.condation.cms.modules.search.extension; /*- * #%L @@ -28,7 +28,7 @@ import com.github.thmarx.cms.api.feature.features.SitePropertiesFeature; import com.github.thmarx.cms.api.module.CMSModuleContext; import com.github.thmarx.cms.api.module.CMSRequestContext; -import com.github.thmarx.cms.modules.search.SearchEngine; +import com.condation.cms.modules.search.SearchEngine; import com.github.thmarx.modules.api.ModuleLifeCycleExtension; import com.github.thmarx.modules.api.annotation.Extension; import java.io.IOException; diff --git a/src/main/java/com/github/thmarx/cms/modules/search/http/SearchHandler.java b/src/main/java/com/condation/cms/modules/search/http/SearchHandler.java similarity index 91% rename from src/main/java/com/github/thmarx/cms/modules/search/http/SearchHandler.java rename to src/main/java/com/condation/cms/modules/search/http/SearchHandler.java index 325d87a..95713d5 100644 --- a/src/main/java/com/github/thmarx/cms/modules/search/http/SearchHandler.java +++ b/src/main/java/com/condation/cms/modules/search/http/SearchHandler.java @@ -1,4 +1,4 @@ -package com.github.thmarx.cms.modules.search.http; +package com.condation.cms.modules.search.http; /*- * #%L @@ -23,9 +23,9 @@ */ import com.github.thmarx.cms.api.extensions.HttpHandler; -import com.github.thmarx.cms.modules.search.SearchEngine; -import com.github.thmarx.cms.modules.search.SearchRequest; -import com.github.thmarx.cms.modules.search.index.SearchResult; +import com.condation.cms.modules.search.SearchEngine; +import com.condation.cms.modules.search.SearchRequest; +import com.condation.cms.modules.search.index.SearchResult; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/com/github/thmarx/cms/modules/search/index/SearchIndex.java b/src/main/java/com/condation/cms/modules/search/index/SearchIndex.java similarity index 97% rename from src/main/java/com/github/thmarx/cms/modules/search/index/SearchIndex.java rename to src/main/java/com/condation/cms/modules/search/index/SearchIndex.java index f6c4fdd..38970bf 100644 --- a/src/main/java/com/github/thmarx/cms/modules/search/index/SearchIndex.java +++ b/src/main/java/com/condation/cms/modules/search/index/SearchIndex.java @@ -1,4 +1,4 @@ -package com.github.thmarx.cms.modules.search.index; +package com.condation.cms.modules.search.index; /*- * #%L @@ -21,10 +21,10 @@ * . * #L% */ -import com.github.thmarx.cms.modules.search.FileUtils; -import com.github.thmarx.cms.modules.search.IndexDocument; -import com.github.thmarx.cms.modules.search.SearchField; -import com.github.thmarx.cms.modules.search.SearchRequest; +import com.condation.cms.modules.search.FileUtils; +import com.condation.cms.modules.search.IndexDocument; +import com.condation.cms.modules.search.SearchField; +import com.condation.cms.modules.search.SearchRequest; import com.google.common.base.Strings; import java.io.IOException; import java.nio.file.Files; diff --git a/src/main/java/com/github/thmarx/cms/modules/search/index/SearchResult.java b/src/main/java/com/condation/cms/modules/search/index/SearchResult.java similarity index 95% rename from src/main/java/com/github/thmarx/cms/modules/search/index/SearchResult.java rename to src/main/java/com/condation/cms/modules/search/index/SearchResult.java index 826f0d5..8f0eb0d 100644 --- a/src/main/java/com/github/thmarx/cms/modules/search/index/SearchResult.java +++ b/src/main/java/com/condation/cms/modules/search/index/SearchResult.java @@ -1,4 +1,4 @@ -package com.github.thmarx.cms.modules.search.index; +package com.condation.cms.modules.search.index; /*- * #%L diff --git a/src/test/java/com/github/thmarx/cms/modules/search/extension/FileIndexingVisitorTest.java b/src/test/java/com/condation/cms/modules/search/FileIndexingVisitorTest.java similarity index 97% rename from src/test/java/com/github/thmarx/cms/modules/search/extension/FileIndexingVisitorTest.java rename to src/test/java/com/condation/cms/modules/search/FileIndexingVisitorTest.java index e38eab4..012499c 100644 --- a/src/test/java/com/github/thmarx/cms/modules/search/extension/FileIndexingVisitorTest.java +++ b/src/test/java/com/condation/cms/modules/search/FileIndexingVisitorTest.java @@ -1,4 +1,4 @@ -package com.github.thmarx.cms.modules.search.extension; +package com.condation.cms.modules.search; /*- * #%L From 046356940aa0d39a19d92fd6fdc561c11a736aca Mon Sep 17 00:00:00 2001 From: Thorsten Marx Date: Mon, 16 Sep 2024 10:04:24 +0200 Subject: [PATCH 2/2] update version --- pom.xml | 6 +++--- .../search/extension/FileIndexingVisitor.java | 18 +++++++++--------- .../extension/SearchHttpExtensionPoint.java | 6 +++--- .../extension/SearchLifecycleExtension.java | 18 +++++++++--------- .../cms/modules/search/http/SearchHandler.java | 2 +- .../search/FileIndexingVisitorTest.java | 2 +- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pom.xml b/pom.xml index f11f23a..58a34d8 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - com.github.thmarx.cms.modules + com.condation.cms.modules search-module 2.0.0 jar @@ -30,13 +30,13 @@ - com.github.thmarx.cms + com.condation.cms cms-api provided ${cms.version} - com.github.thmarx.cms.module.framework + com.condation.cms.module.framework modules-api provided ${cms.version} diff --git a/src/main/java/com/condation/cms/modules/search/extension/FileIndexingVisitor.java b/src/main/java/com/condation/cms/modules/search/extension/FileIndexingVisitor.java index 653664b..bb981df 100644 --- a/src/main/java/com/condation/cms/modules/search/extension/FileIndexingVisitor.java +++ b/src/main/java/com/condation/cms/modules/search/extension/FileIndexingVisitor.java @@ -21,15 +21,15 @@ * . * #L% */ -import com.github.thmarx.cms.api.Constants; -import com.github.thmarx.cms.api.content.ContentResponse; -import com.github.thmarx.cms.api.feature.features.ContentRenderFeature; -import com.github.thmarx.cms.api.feature.features.DBFeature; -import com.github.thmarx.cms.api.feature.features.SitePropertiesFeature; -import com.github.thmarx.cms.api.module.CMSModuleContext; -import com.github.thmarx.cms.api.utils.HTTPUtil; -import com.github.thmarx.cms.api.utils.PathUtil; -import com.github.thmarx.cms.api.utils.SectionUtil; +import com.condation.cms.api.Constants; +import com.condation.cms.api.content.ContentResponse; +import com.condation.cms.api.feature.features.ContentRenderFeature; +import com.condation.cms.api.feature.features.DBFeature; +import com.condation.cms.api.feature.features.SitePropertiesFeature; +import com.condation.cms.api.module.CMSModuleContext; +import com.condation.cms.api.utils.HTTPUtil; +import com.condation.cms.api.utils.PathUtil; +import com.condation.cms.api.utils.SectionUtil; import com.condation.cms.modules.search.IndexDocument; import com.condation.cms.modules.search.SearchEngine; import com.google.common.base.Strings; diff --git a/src/main/java/com/condation/cms/modules/search/extension/SearchHttpExtensionPoint.java b/src/main/java/com/condation/cms/modules/search/extension/SearchHttpExtensionPoint.java index 326e3dd..c6e7886 100644 --- a/src/main/java/com/condation/cms/modules/search/extension/SearchHttpExtensionPoint.java +++ b/src/main/java/com/condation/cms/modules/search/extension/SearchHttpExtensionPoint.java @@ -22,10 +22,10 @@ * #L% */ -import com.github.thmarx.cms.api.extensions.HttpHandlerExtensionPoint; -import com.github.thmarx.cms.api.extensions.Mapping; +import com.condation.cms.api.extensions.HttpHandlerExtensionPoint; +import com.condation.cms.api.extensions.Mapping; import com.condation.cms.modules.search.http.SearchHandler; -import com.github.thmarx.modules.api.annotation.Extension; +import com.condation.modules.api.annotation.Extension; import org.eclipse.jetty.http.pathmap.PathSpec; /** diff --git a/src/main/java/com/condation/cms/modules/search/extension/SearchLifecycleExtension.java b/src/main/java/com/condation/cms/modules/search/extension/SearchLifecycleExtension.java index 37eaa94..8c09762 100644 --- a/src/main/java/com/condation/cms/modules/search/extension/SearchLifecycleExtension.java +++ b/src/main/java/com/condation/cms/modules/search/extension/SearchLifecycleExtension.java @@ -21,16 +21,16 @@ * . * #L% */ -import com.github.thmarx.cms.api.eventbus.events.ContentChangedEvent; -import com.github.thmarx.cms.api.eventbus.events.TemplateChangedEvent; -import com.github.thmarx.cms.api.feature.features.DBFeature; -import com.github.thmarx.cms.api.feature.features.EventBusFeature; -import com.github.thmarx.cms.api.feature.features.SitePropertiesFeature; -import com.github.thmarx.cms.api.module.CMSModuleContext; -import com.github.thmarx.cms.api.module.CMSRequestContext; +import com.condation.cms.api.eventbus.events.ContentChangedEvent; +import com.condation.cms.api.eventbus.events.TemplateChangedEvent; +import com.condation.cms.api.feature.features.DBFeature; +import com.condation.cms.api.feature.features.EventBusFeature; +import com.condation.cms.api.feature.features.SitePropertiesFeature; +import com.condation.cms.api.module.CMSModuleContext; +import com.condation.cms.api.module.CMSRequestContext; import com.condation.cms.modules.search.SearchEngine; -import com.github.thmarx.modules.api.ModuleLifeCycleExtension; -import com.github.thmarx.modules.api.annotation.Extension; +import com.condation.modules.api.ModuleLifeCycleExtension; +import com.condation.modules.api.annotation.Extension; import java.io.IOException; import java.nio.file.Files; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/condation/cms/modules/search/http/SearchHandler.java b/src/main/java/com/condation/cms/modules/search/http/SearchHandler.java index 95713d5..46a74f3 100644 --- a/src/main/java/com/condation/cms/modules/search/http/SearchHandler.java +++ b/src/main/java/com/condation/cms/modules/search/http/SearchHandler.java @@ -22,7 +22,7 @@ * #L% */ -import com.github.thmarx.cms.api.extensions.HttpHandler; +import com.condation.cms.api.extensions.HttpHandler; import com.condation.cms.modules.search.SearchEngine; import com.condation.cms.modules.search.SearchRequest; import com.condation.cms.modules.search.index.SearchResult; diff --git a/src/test/java/com/condation/cms/modules/search/FileIndexingVisitorTest.java b/src/test/java/com/condation/cms/modules/search/FileIndexingVisitorTest.java index 012499c..66b93e1 100644 --- a/src/test/java/com/condation/cms/modules/search/FileIndexingVisitorTest.java +++ b/src/test/java/com/condation/cms/modules/search/FileIndexingVisitorTest.java @@ -21,7 +21,7 @@ * . * #L% */ -import com.github.thmarx.cms.api.utils.PathUtil; +import com.condation.cms.api.utils.PathUtil; import java.io.IOException; import java.nio.file.FileVisitResult; import java.nio.file.Files;