Skip to content

update to condation cms 6.0.0 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thmarx merged 2 commits into from
Sep 16, 2024
Merged

update to condation cms 6.0.0 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1dc8fb5
update to condation cms 6.0.0
thmarx Sep 12, 2024
0463569
update version
Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 43 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,41 @@
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.github.thmarx.cms.modules</groupId>
<groupId>com.condation.cms.modules</groupId>
<artifactId>search-module</artifactId>
<version>1.2.1</version>
<version>2.0.0</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<module.id>search-module</module.id>
<module.name>search module</module.name>
<module.priority>NORMAL</module.priority>

<cms.version>4.18.1</cms.version>
<lucene.version>9.11.0</lucene.version>
<cms.version>6.0.0-SNAPSHOT</cms.version>
<lucene.version>9.11.1</lucene.version>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
</properties>
<inceptionYear>2024</inceptionYear>
<organization>
<name>CondationCMS</name>
<url>https://condation.com</url>
</organization>
<licenses>
<license>
<name>GPL v3</name>
<url>https://www.gnu.org/licenses/gpl-3.0.html</url>
</license>
</licenses>
<dependencies>
<dependency>
<groupId>com.github.thmarx.cms</groupId>
<groupId>com.condation.cms</groupId>
<artifactId>cms-api</artifactId>
<scope>provided</scope>
<version>${cms.version}</version>
</dependency>
<dependency>
<groupId>com.github.thmarx.cms.module.framework</groupId>
<groupId>com.condation.cms.module.framework</groupId>
<artifactId>modules-api</artifactId>
<scope>provided</scope>
<version>${cms.version}</version>
Expand Down Expand Up @@ -120,6 +131,32 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>2.4.0</version>
<configuration>
<verbose>false</verbose>
<licenseName>gpl_v3</licenseName>
</configuration>
<executions>
<execution>
<id>first</id>
<goals>
<goal>update-file-header</goal>
</goals>
<phase>process-sources</phase>
<configuration>
<licenseName>gpl_v3</licenseName>
<roots>
<root>src/main/java</root>
<root>src/resources</root>
<root>src/test</root>
</roots>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.7.1</version>
Expand Down
2 changes: 1 addition & 1 deletion .../thmarx/cms/modules/search/FileUtils.java → ...ndation/cms/modules/search/FileUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.thmarx.cms.modules.search;
package com.condation.cms.modules.search;

/*-
* #%L
Expand Down
2 changes: 1 addition & 1 deletion ...arx/cms/modules/search/IndexDocument.java → ...ion/cms/modules/search/IndexDocument.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.thmarx.cms.modules.search;
package com.condation.cms.modules.search;

/*-
* #%L
Expand Down
6 changes: 3 additions & 3 deletions ...marx/cms/modules/search/SearchEngine.java → ...tion/cms/modules/search/SearchEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.thmarx.cms.modules.search;
package com.condation.cms.modules.search;

/*-
* #%L
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...hmarx/cms/modules/search/SearchField.java → ...ation/cms/modules/search/SearchField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.thmarx.cms.modules.search;
package com.condation.cms.modules.search;

/*-
* #%L
Expand Down
2 changes: 1 addition & 1 deletion ...arx/cms/modules/search/SearchRequest.java → ...ion/cms/modules/search/SearchRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.thmarx.cms.modules.search;
package com.condation.cms.modules.search;

/*-
* #%L
Expand Down
24 changes: 12 additions & 12 deletions ...search/extension/FileIndexingVisitor.java → ...search/extension/FileIndexingVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.thmarx.cms.modules.search.extension;
package com.condation.cms.modules.search.extension;

/*-
* #%L
Expand All @@ -21,17 +21,17 @@
* <http://www.gnu.org/licenses/gpl-3.0.html>.
* #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.github.thmarx.cms.modules.search.IndexDocument;
import com.github.thmarx.cms.modules.search.SearchEngine;
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;
import java.io.IOException;
import java.nio.file.FileVisitResult;
Expand Down
10 changes: 5 additions & 5 deletions ...h/extension/SearchHttpExtensionPoint.java → ...h/extension/SearchHttpExtensionPoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.thmarx.cms.modules.search.extension;
package com.condation.cms.modules.search.extension;

/*-
* #%L
Expand All @@ -22,10 +22,10 @@
* #L%
*/

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.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.search.http.SearchHandler;
import com.condation.modules.api.annotation.Extension;
import org.eclipse.jetty.http.pathmap.PathSpec;

/**
Expand Down
22 changes: 11 additions & 11 deletions ...h/extension/SearchLifecycleExtension.java → ...h/extension/SearchLifecycleExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.thmarx.cms.modules.search.extension;
package com.condation.cms.modules.search.extension;

/*-
* #%L
Expand All @@ -21,16 +21,16 @@
* <http://www.gnu.org/licenses/gpl-3.0.html>.
* #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.github.thmarx.cms.modules.search.SearchEngine;
import com.github.thmarx.modules.api.ModuleLifeCycleExtension;
import com.github.thmarx.modules.api.annotation.Extension;
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.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;
Expand Down
10 changes: 5 additions & 5 deletions ...ms/modules/search/http/SearchHandler.java → ...ms/modules/search/http/SearchHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.thmarx.cms.modules.search.http;
package com.condation.cms.modules.search.http;

/*-
* #%L
Expand All @@ -22,10 +22,10 @@
* #L%
*/

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.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;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import java.nio.charset.StandardCharsets;
Expand Down
10 changes: 5 additions & 5 deletions ...cms/modules/search/index/SearchIndex.java → ...cms/modules/search/index/SearchIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.thmarx.cms.modules.search.index;
package com.condation.cms.modules.search.index;

/*-
* #%L
Expand All @@ -21,10 +21,10 @@
* <http://www.gnu.org/licenses/gpl-3.0.html>.
* #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;
Expand Down
2 changes: 1 addition & 1 deletion ...ms/modules/search/index/SearchResult.java → ...ms/modules/search/index/SearchResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.thmarx.cms.modules.search.index;
package com.condation.cms.modules.search.index;

/*-
* #%L
Expand Down
4 changes: 2 additions & 2 deletions ...ch/extension/FileIndexingVisitorTest.java → ...dules/search/FileIndexingVisitorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.thmarx.cms.modules.search.extension;
package com.condation.cms.modules.search;

/*-
* #%L
Expand All @@ -21,7 +21,7 @@
* <http://www.gnu.org/licenses/gpl-3.0.html>.
* #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;
Expand Down