From 43df3dc2f0595b1851e69fd43639f204a7274485 Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Thu, 1 Jan 2026 14:11:14 +0100 Subject: [PATCH 01/22] [prepare-major] update to major version 7.0-SNAPSHOT --- celements-mailsender/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/celements-mailsender/pom.xml b/celements-mailsender/pom.xml index 5dc5a4fc..05c8ec10 100644 --- a/celements-mailsender/pom.xml +++ b/celements-mailsender/pom.xml @@ -4,10 +4,10 @@ com.celements celements - 6.2 + 7.0-SNAPSHOT celements-mailsender - 6.1-SNAPSHOT + 7.0-SNAPSHOT Celements Mail Sender From 492aa7415630baf6693d4cad03b17baeb0e7bbc0 Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Thu, 1 Jan 2026 14:11:56 +0100 Subject: [PATCH 02/22] [prepare-major] update to major version 7.0-SNAPSHOT --- celements-rights/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/celements-rights/pom.xml b/celements-rights/pom.xml index 1f019c75..1a9e4845 100644 --- a/celements-rights/pom.xml +++ b/celements-rights/pom.xml @@ -24,17 +24,17 @@ com.celements celements - 6.0 + 7.0-SNAPSHOT 4.0.0 celements-rights - 6.1-SNAPSHOT + 7.0-SNAPSHOT Celements Rights com.celements celements-model - 6.0 + 7.0-SNAPSHOT provided From 1f3954268a77f90d4a04e65631fbde45077bf43c Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Thu, 1 Jan 2026 14:12:10 +0100 Subject: [PATCH 03/22] [prepare-major] update to major version 7.0-SNAPSHOT --- celements-scheduler/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/celements-scheduler/pom.xml b/celements-scheduler/pom.xml index 5e80a760..37a6a40c 100644 --- a/celements-scheduler/pom.xml +++ b/celements-scheduler/pom.xml @@ -25,16 +25,16 @@ com.celements celements - 6.6 + 7.0-SNAPSHOT celements-scheduler - 6.3-SNAPSHOT + 7.0-SNAPSHOT Celements Scheduler com.celements celements-model - 6.7 + 7.0-SNAPSHOT provided From 1a4d33ae371295d292b7f7028690598e3ddfbc92 Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Thu, 1 Jan 2026 14:12:41 +0100 Subject: [PATCH 04/22] [prepare-major] update to major version 7.0-SNAPSHOT --- celements-captcha/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/celements-captcha/pom.xml b/celements-captcha/pom.xml index 765a0f84..ee409588 100644 --- a/celements-captcha/pom.xml +++ b/celements-captcha/pom.xml @@ -26,23 +26,23 @@ com.celements celements - 6.0 + 7.0-SNAPSHOT 4.0.0 celements-captcha - 6.1-SNAPSHOT + 7.0-SNAPSHOT Celements captcha implementations com.celements celements-model - 6.0 + 7.0-SNAPSHOT provided com.celements celements-core - 6.0 + 7.0-SNAPSHOT provided From c3a30213b8b5e3d5a944968a6f9e5ff25e57b045 Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Thu, 1 Jan 2026 14:12:55 +0100 Subject: [PATCH 05/22] [prepare-major] update to major version 7.0-SNAPSHOT --- celements-contact/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/celements-contact/pom.xml b/celements-contact/pom.xml index 07cfa823..415c0262 100644 --- a/celements-contact/pom.xml +++ b/celements-contact/pom.xml @@ -26,23 +26,23 @@ com.celements celements - 6.0 + 7.0-SNAPSHOT 4.0.0 celements-contact - 6.1-SNAPSHOT + 7.0-SNAPSHOT Celements Core com.celements celements-model - 6.0 + 7.0-SNAPSHOT provided com.celements celements-core - 6.0 + 7.0-SNAPSHOT provided From 35badde2287e46f243f6183def4444f852f7ab8e Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Thu, 1 Jan 2026 14:13:38 +0100 Subject: [PATCH 06/22] [prepare-major] update to major version 7.0-SNAPSHOT --- celements-css/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/celements-css/pom.xml b/celements-css/pom.xml index 8c14684c..5138e208 100644 --- a/celements-css/pom.xml +++ b/celements-css/pom.xml @@ -3,23 +3,23 @@ com.celements celements - 6.0 + 7.0-SNAPSHOT 4.0.0 celements-css - 6.1-SNAPSHOT + 7.0-SNAPSHOT Webtools for css handling like inliner, minifier com.celements celements-model - 6.0 + 7.0-SNAPSHOT provided com.celements celements-core - 6.0 + 7.0-SNAPSHOT provided From 12ff142d51fce79cba92f44a3b75fac1569a0309 Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Thu, 1 Jan 2026 14:13:52 +0100 Subject: [PATCH 07/22] [prepare-major] update to major version 7.0-SNAPSHOT --- celements-cleverreach/pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/celements-cleverreach/pom.xml b/celements-cleverreach/pom.xml index cc4c579d..5bf1c5a9 100644 --- a/celements-cleverreach/pom.xml +++ b/celements-cleverreach/pom.xml @@ -24,35 +24,35 @@ com.celements celements - 6.3 + 7.0-SNAPSHOT 4.0.0 celements-cleverreach - 6.2-SNAPSHOT + 7.0-SNAPSHOT Celements connector to Clever Reach API com.celements celements-model - 6.4 + 7.0-SNAPSHOT provided com.celements celements-core - 6.13 + 7.0-SNAPSHOT provided com.celements celements-css - 6.0 + 7.0-SNAPSHOT provided com.celements celements-mailsender - 6.0 + 7.0-SNAPSHOT provided From d5ec7471c626c7d0567224753c90b00c8bb28918 Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Thu, 1 Jan 2026 14:15:01 +0100 Subject: [PATCH 08/22] [prepare-major] update to major version 7.0-SNAPSHOT --- celements-search-lucene/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/celements-search-lucene/pom.xml b/celements-search-lucene/pom.xml index 1d4fbffc..2170da2a 100644 --- a/celements-search-lucene/pom.xml +++ b/celements-search-lucene/pom.xml @@ -25,22 +25,22 @@ com.celements celements - 6.6 + 7.0-SNAPSHOT celements-search-lucene - 6.4-SNAPSHOT + 7.0-SNAPSHOT Celements Search Lucene com.celements celements-model - 6.6 + 7.0-SNAPSHOT provided com.celements celements-core - 6.14 + 7.0-SNAPSHOT provided From 4172d209a120209ca915fba85e9f8ae91e0c3922 Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Thu, 1 Jan 2026 14:58:17 +0100 Subject: [PATCH 09/22] [prepare-major] update to major version 7.0-SNAPSHOT --- celements-search/pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/celements-search/pom.xml b/celements-search/pom.xml index e41e4839..5189df93 100644 --- a/celements-search/pom.xml +++ b/celements-search/pom.xml @@ -24,23 +24,23 @@ com.celements celements - 6.6 + 7.0-SNAPSHOT 4.0.0 celements-search - 6.5-SNAPSHOT + 7.0-SNAPSHOT Celements Search com.celements celements-model - 6.7 + 7.0-SNAPSHOT provided com.celements celements-core - 6.15 + 7.0-SNAPSHOT provided @@ -51,12 +51,12 @@ com.celements celements-search-lucene - 6.3 + 7.0-SNAPSHOT com.celements celements-scheduler - 6.2 + 7.0-SNAPSHOT provided From 546e42fe47ee62315d0d503bad9f8c39a0c3a18c Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Thu, 1 Jan 2026 14:59:04 +0100 Subject: [PATCH 10/22] [prepare-major] update to major version 7.0-SNAPSHOT --- celements-calendar-gdata/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/celements-calendar-gdata/pom.xml b/celements-calendar-gdata/pom.xml index 5514ab5b..bbe0b40c 100644 --- a/celements-calendar-gdata/pom.xml +++ b/celements-calendar-gdata/pom.xml @@ -26,11 +26,11 @@ com.celements celements - 6.0-SNAPSHOT + 7.0-SNAPSHOT 4.0.0 celements-calendar-gdata - 6.0-SNAPSHOT + 7.0-SNAPSHOT Celements Calendar @@ -42,7 +42,7 @@ com.celements celements-calendar - 6.0-SNAPSHOT + 7.0-SNAPSHOT com.google.gdata From 2827092663e093815805ff11bbda7e9a377e0cf7 Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Thu, 1 Jan 2026 15:11:37 +0100 Subject: [PATCH 11/22] [prepare-major] update to major version 7.0-SNAPSHOT --- celements-webdav/pom.xml | 16 +++++++++++----- .../com/celements/webdav/SardineAdapter.java | 8 +++++--- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/celements-webdav/pom.xml b/celements-webdav/pom.xml index 8ab93571..08b14a86 100644 --- a/celements-webdav/pom.xml +++ b/celements-webdav/pom.xml @@ -24,30 +24,36 @@ com.celements celements - 6.0 + 7.0-SNAPSHOT 4.0.0 celements-webdav - 6.1-SNAPSHOT + 7.0-SNAPSHOT Celements WebDAV Client com.celements celements-xwiki-core - 6.0 + 7.0-SNAPSHOT provided com.celements celements-model - 6.0 + 7.0-SNAPSHOT provided com.celements celements-core - 6.0 + 7.0-SNAPSHOT + provided + + + com.celements + celements-user-manager + 6.3 provided diff --git a/celements-webdav/src/main/java/com/celements/webdav/SardineAdapter.java b/celements-webdav/src/main/java/com/celements/webdav/SardineAdapter.java index 0a9d5388..7326d556 100644 --- a/celements-webdav/src/main/java/com/celements/webdav/SardineAdapter.java +++ b/celements-webdav/src/main/java/com/celements/webdav/SardineAdapter.java @@ -18,8 +18,6 @@ import javax.annotation.Nullable; import javax.net.ssl.SSLContext; import javax.validation.constraints.NotNull; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriBuilderException; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.io.IOUtils; @@ -55,6 +53,9 @@ import com.github.sardine.impl.SardineException; import com.github.sardine.impl.SardineImpl; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilderException; + @Component(SardineAdapter.NAME) public class SardineAdapter implements WebDavService, Initializable { @@ -190,7 +191,8 @@ URL buildCompleteUrl(Path path) { if (checkNotNull(path).isAbsolute()) { path = Paths.get("/", baseUrl.getPath()).relativize(path); } - return UriBuilder.fromUri(baseUrl.toURI()).path(path.normalize().toString()).build().toURL(); + return UriBuilder.fromUri(baseUrl.toURI()).path(path.normalize().toString()).build() + .toURL(); } catch (URISyntaxException | UriBuilderException | MalformedURLException exc) { // this shouldn't happen since baseUrl and path are already well defined objects throw new IllegalArgumentException(MessageFormat.format("unable to build url with " From 5c23c95bba24719deb17782ed8e6c90739659a96 Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Thu, 1 Jan 2026 15:33:18 +0100 Subject: [PATCH 12/22] [prepare-major] update to major version 7.0-SNAPSHOT --- celements-layout/component/pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/celements-layout/component/pom.xml b/celements-layout/component/pom.xml index 7d3218c5..0ee8c618 100644 --- a/celements-layout/component/pom.xml +++ b/celements-layout/component/pom.xml @@ -3,29 +3,29 @@ com.celements celements - 6.6 + 7.0-SNAPSHOT 4.0.0 celements-layout - 6.5-SNAPSHOT + 7.0-SNAPSHOT Celements Layout com.celements celements-core - 6.14 + 7.0-SNAPSHOT provided com.celements celements-model - 6.6 + 7.0-SNAPSHOT provided com.celements celements-spring-security - 6.0 + 7.0-SNAPSHOT provided From 6c924ff771cefc64234a690a3639a0a626254e0d Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Thu, 1 Jan 2026 15:34:37 +0100 Subject: [PATCH 13/22] [prepare-major] update to major version 7.0-SNAPSHOT --- celements-tag/pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/celements-tag/pom.xml b/celements-tag/pom.xml index 57b02b0b..8f756d15 100644 --- a/celements-tag/pom.xml +++ b/celements-tag/pom.xml @@ -24,41 +24,41 @@ com.celements celements - 6.6 + 7.0-SNAPSHOT 4.0.0 celements-tag - 6.6-SNAPSHOT + 7.0-SNAPSHOT Celements Tags com.celements celements-xwiki-core - 6.9 + 7.0-SNAPSHOT provided com.celements celements-model - 6.6 + 7.0-SNAPSHOT provided com.celements celements-core - 6.14 + 7.0-SNAPSHOT provided com.celements celements-search - 6.3 + 7.0-SNAPSHOT provided com.celements celements-spring-security - 6.0 + 7.0-SNAPSHOT provided From 72a3b6d25f355184a3774464c0797d406123f496 Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Thu, 1 Jan 2026 15:35:25 +0100 Subject: [PATCH 14/22] [prepare-major] update to major version 7.0-SNAPSHOT --- celements-user-manager/component/pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/celements-user-manager/component/pom.xml b/celements-user-manager/component/pom.xml index 9da4003d..b3bf6e7a 100644 --- a/celements-user-manager/component/pom.xml +++ b/celements-user-manager/component/pom.xml @@ -24,41 +24,41 @@ com.celements celements - 6.6 + 7.0-SNAPSHOT 4.0.0 celements-user-manager - 6.4-SNAPSHOT + 7.0-SNAPSHOT Celements User Manager com.celements celements-model - 6.6 + 7.0-SNAPSHOT provided com.celements celements-wiki-manager - 6.1 + 7.0-SNAPSHOT provided com.celements celements-core - 6.14 + 7.0-SNAPSHOT provided com.celements celements-subsystem-migration-manager - 6.0 + 7.0-SNAPSHOT provided com.celements celements-mailsender - 6.0 + 7.0-SNAPSHOT provided From b5c2635ad7a6b1d01a06f4c66ccb2aa5361249cc Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Thu, 1 Jan 2026 16:34:02 +0100 Subject: [PATCH 15/22] [prepare-major] update to major version 7.0-SNAPSHOT --- celements-webdav/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/celements-webdav/pom.xml b/celements-webdav/pom.xml index 08b14a86..41f45076 100644 --- a/celements-webdav/pom.xml +++ b/celements-webdav/pom.xml @@ -53,7 +53,7 @@ com.celements celements-user-manager - 6.3 + 7.0-SNAPSHOT provided From a61c96ffa0af56ed690c5261158801182683e835 Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Thu, 1 Jan 2026 16:50:43 +0100 Subject: [PATCH 16/22] [prepare-major] update to major version 7.0-SNAPSHOT --- celements-layout/web-module/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/celements-layout/web-module/pom.xml b/celements-layout/web-module/pom.xml index b97f541a..523aba2b 100644 --- a/celements-layout/web-module/pom.xml +++ b/celements-layout/web-module/pom.xml @@ -26,18 +26,18 @@ com.celements celementsweb - 6.2 + 7.0-SNAPSHOT 4.0.0 celements-layout-web - 6.5-SNAPSHOT + 7.0-SNAPSHOT war Celements Layout Web com.celements celements-layout - 6.4 + 7.0-SNAPSHOT From 7419afbb49ea552d19a8229be51353dc7e98316a Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Thu, 1 Jan 2026 16:52:44 +0100 Subject: [PATCH 17/22] [prepare-major] update to major version 7.0-SNAPSHOT --- celements-user-manager/web-module/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/celements-user-manager/web-module/pom.xml b/celements-user-manager/web-module/pom.xml index 7eed29f6..348ccdab 100644 --- a/celements-user-manager/web-module/pom.xml +++ b/celements-user-manager/web-module/pom.xml @@ -26,13 +26,13 @@ com.celements celementsweb - 6.2 + 7.0-SNAPSHOT 4.0.0 celements-user-manager-web war User Manager Web-Module - 6.4-SNAPSHOT + 7.0-SNAPSHOT @@ -46,7 +46,7 @@ com.celements celements-user-manager - 6.3 + 7.0-SNAPSHOT From f1fef1eda9f7e7696b8cb839371a52182dc8f590 Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Thu, 1 Jan 2026 16:58:00 +0100 Subject: [PATCH 18/22] fix PaymentService --- .../com/celements/payment/PaymentService.java | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/celements-payment/src/main/java/com/celements/payment/PaymentService.java b/celements-payment/src/main/java/com/celements/payment/PaymentService.java index 3e095bb3..3622d06b 100644 --- a/celements-payment/src/main/java/com/celements/payment/PaymentService.java +++ b/celements-payment/src/main/java/com/celements/payment/PaymentService.java @@ -25,8 +25,6 @@ import java.util.List; import java.util.Map; -import org.hibernate.HibernateException; -import org.hibernate.Session; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xwiki.component.annotation.Component; @@ -36,7 +34,7 @@ import com.celements.model.context.ModelContext; import com.celements.payment.exception.PaymentException; import com.celements.payment.raw.PaymentRawObject; -import com.celements.web.plugin.api.CelementsWebPluginApi; +import com.celements.web.plugin.CelementsWebPlugin; import com.google.common.base.Functions; import com.google.common.collect.Lists; import com.xpn.xwiki.XWikiContext; @@ -69,9 +67,9 @@ public void executePaymentAction(Map data) { XWikiDocument actionXdoc = getXWikiContext().getWiki().getDocument(callbackDocRef, getXWikiContext()); Document actionDoc = actionXdoc.newDocument(getXWikiContext()); - CelementsWebPluginApi celementsweb = (CelementsWebPluginApi) getXWikiContext().getWiki().getPluginApi( - "celementsweb", getXWikiContext()); - celementsweb.getPlugin().executeAction(actionDoc, data, actionXdoc, getXWikiContext()); + CelementsWebPlugin celementsweb = (CelementsWebPlugin) getXWikiContext().getWiki() + .getPlugin("celementsweb", getXWikiContext()); + celementsweb.executeAction(actionDoc, data, actionXdoc, getXWikiContext()); } else { LOGGER.warn("Failed to execute payment action because Payment.CallbackActions" + " does not exist in [" + getXWikiContext().getDatabase() + "]."); @@ -84,13 +82,9 @@ public void executePaymentAction(Map data) { @Override public void storePaymentObject(final PaymentRawObject paymentObj) throws PaymentException { try { - getHibStore().executeWrite(context.getXWikiContext(), true, new HibernateCallback() { - - @Override - public Void doInHibernate(Session session) throws HibernateException { - session.saveOrUpdate(paymentObj); - return null; - } + getHibStore().executeWrite(context.getXWikiContext(), true, (HibernateCallback) session -> { + session.saveOrUpdate(paymentObj); + return null; }); LOGGER.info("storePaymentObject: '{}'", paymentObj); } catch (XWikiException xwe) { From 57bb5962f685ea652be782d0cfcd05abb3a29bdd Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Thu, 1 Jan 2026 16:58:21 +0100 Subject: [PATCH 19/22] [prepare-major] update to major version 7.0-SNAPSHOT --- celements-payment/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/celements-payment/pom.xml b/celements-payment/pom.xml index 5d33ecba..9fe9c909 100644 --- a/celements-payment/pom.xml +++ b/celements-payment/pom.xml @@ -26,23 +26,23 @@ com.celements celements - 6.0 + 7.0-SNAPSHOT 4.0.0 payment - 6.1-SNAPSHOT + 7.0-SNAPSHOT Celements Payment com.celements celements-model - 6.0 + 7.0-SNAPSHOT provided com.celements celements-core - 6.0 + 7.0-SNAPSHOT provided From 3259cd52d95c6faadb47a6e471f1bb8742de3b01 Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Thu, 1 Jan 2026 19:26:20 +0100 Subject: [PATCH 20/22] add wiki-manager --- celements-webdav/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/celements-webdav/pom.xml b/celements-webdav/pom.xml index 41f45076..32ef2155 100644 --- a/celements-webdav/pom.xml +++ b/celements-webdav/pom.xml @@ -50,6 +50,12 @@ 7.0-SNAPSHOT provided + + com.celements + celements-wiki-manager + 7.0-SNAPSHOT + provided + com.celements celements-user-manager From 0b5dd4a8172d9b1fff2f9d7de16c1a0a48af1d5a Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Thu, 1 Jan 2026 19:33:12 +0100 Subject: [PATCH 21/22] add javax.ws.rs --- celements-webdav/pom.xml | 6 ++++++ .../src/main/java/com/celements/webdav/SardineAdapter.java | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/celements-webdav/pom.xml b/celements-webdav/pom.xml index 32ef2155..80396bbe 100644 --- a/celements-webdav/pom.xml +++ b/celements-webdav/pom.xml @@ -63,6 +63,12 @@ provided + + javax.ws.rs + javax.ws.rs-api + provided + + diff --git a/celements-webdav/src/main/java/com/celements/webdav/SardineAdapter.java b/celements-webdav/src/main/java/com/celements/webdav/SardineAdapter.java index 7326d556..1855c09f 100644 --- a/celements-webdav/src/main/java/com/celements/webdav/SardineAdapter.java +++ b/celements-webdav/src/main/java/com/celements/webdav/SardineAdapter.java @@ -18,6 +18,8 @@ import javax.annotation.Nullable; import javax.net.ssl.SSLContext; import javax.validation.constraints.NotNull; +import javax.ws.rs.core.UriBuilder; +import javax.ws.rs.core.UriBuilderException; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.io.IOUtils; @@ -53,9 +55,6 @@ import com.github.sardine.impl.SardineException; import com.github.sardine.impl.SardineImpl; -import jakarta.ws.rs.core.UriBuilder; -import jakarta.ws.rs.core.UriBuilderException; - @Component(SardineAdapter.NAME) public class SardineAdapter implements WebDavService, Initializable { From 6f02a825a1488ca81111b279393e3e6d5cc5eea0 Mon Sep 17 00:00:00 2001 From: Marc Sladek Date: Sat, 10 Jan 2026 13:07:35 +0100 Subject: [PATCH 22/22] merge celements-search-lucene into celements-search --- .gitignore | 1 - celements-search-lucene/pom.xml | 103 ------------------ .../main/resources/META-INF/components.txt | 5 - celements-search/pom.xml | 56 ++++++++-- .../search/lucene/LuceneDocType.java | 0 .../lucene/index/analysis/CelAnalyzer.java | 0 .../analysis/CelementsSimpleAnalyzer.java | 0 .../index/queue/IndexQueuePriority.java | 0 .../rebuild/LuceneIndexRebuildService.java | 0 .../plugin/lucene/AbstractDocumentData.java | 0 .../plugin/lucene/AbstractIndexData.java | 0 .../xwiki/plugin/lucene/AttachmentData.java | 0 .../xpn/xwiki/plugin/lucene/DeleteData.java | 0 .../xpn/xwiki/plugin/lucene/DocumentData.java | 0 .../xpn/xwiki/plugin/lucene/IndexFields.java | 0 .../xwiki/plugin/lucene/IndexRebuilder.java | 0 .../xpn/xwiki/plugin/lucene/IndexUpdater.java | 0 .../xpn/xwiki/plugin/lucene/LucenePlugin.java | 0 .../xwiki/plugin/lucene/LucenePluginApi.java | 0 .../xpn/xwiki/plugin/lucene/SearchResult.java | 0 .../xwiki/plugin/lucene/SearchResults.java | 0 .../com/xpn/xwiki/plugin/lucene/WikiData.java | 0 .../plugin/lucene/XWikiDocumentQueue.java | 0 .../indexExtension/ILuceneIndexExtender.java | 0 .../ILuceneIndexExtensionServiceRole.java | 0 .../indexExtension/IndexExtensionField.java | 0 .../LuceneIndexExtensionService.java | 0 .../event/LuceneDocumentDeletedEvent.java | 0 .../event/LuceneDocumentDeletingEvent.java | 0 .../event/LuceneDocumentIndexedEvent.java | 0 .../event/LuceneDocumentIndexingEvent.java | 0 .../ActionExecutionEventListener.java | 0 .../ISearcherProviderRole.java | 0 .../SearchProviderDebugScriptService.java | 0 .../searcherProvider/SearcherProvider.java | 0 .../SearcherProviderManager.java | 0 .../src/main/resources/META-INF/MANIFEST.MF | 6 +- .../main/resources/META-INF/components.txt | 5 + .../plugin/lucene/AttachmentDataTest.java | 0 .../plugin/lucene/TestXWikiDocument.java | 0 .../IndexExtensionFieldTest.java | 0 .../LuceneIndexExtensionServiceTest.java | 0 .../ActionExecutionEventListenerTest.java | 0 .../SearcherProviderManagerTest.java | 0 .../SearcherProviderTest.java | 0 .../src/test/resources/html.html | 0 .../src/test/resources/msoffice97.doc | Bin .../src/test/resources/opendocument.odt | Bin .../src/test/resources/openxml.docx | Bin .../src/test/resources/pdf.pdf | Bin .../src/test/resources/txt.txt | 0 .../src/test/resources/zip.zip | Bin 52 files changed, 57 insertions(+), 119 deletions(-) delete mode 100644 celements-search-lucene/pom.xml delete mode 100644 celements-search-lucene/src/main/resources/META-INF/components.txt rename {celements-search-lucene => celements-search}/src/main/java/com/celements/search/lucene/LuceneDocType.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/celements/search/lucene/index/analysis/CelAnalyzer.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/celements/search/lucene/index/analysis/CelementsSimpleAnalyzer.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/celements/search/lucene/index/queue/IndexQueuePriority.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/celements/search/lucene/index/rebuild/LuceneIndexRebuildService.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/AbstractDocumentData.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/AbstractIndexData.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/AttachmentData.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/DeleteData.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/DocumentData.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/IndexFields.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/IndexRebuilder.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/IndexUpdater.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/LucenePlugin.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/LucenePluginApi.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResult.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResults.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/WikiData.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/XWikiDocumentQueue.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/ILuceneIndexExtender.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/ILuceneIndexExtensionServiceRole.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/IndexExtensionField.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/LuceneIndexExtensionService.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentDeletedEvent.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentDeletingEvent.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentIndexedEvent.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentIndexingEvent.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ActionExecutionEventListener.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ISearcherProviderRole.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearchProviderDebugScriptService.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProvider.java (100%) rename {celements-search-lucene => celements-search}/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderManager.java (100%) rename {celements-search-lucene => celements-search}/src/main/resources/META-INF/MANIFEST.MF (92%) rename {celements-search-lucene => celements-search}/src/test/java/com/xpn/xwiki/plugin/lucene/AttachmentDataTest.java (100%) rename {celements-search-lucene => celements-search}/src/test/java/com/xpn/xwiki/plugin/lucene/TestXWikiDocument.java (100%) rename {celements-search-lucene => celements-search}/src/test/java/com/xpn/xwiki/plugin/lucene/indexExtension/IndexExtensionFieldTest.java (100%) rename {celements-search-lucene => celements-search}/src/test/java/com/xpn/xwiki/plugin/lucene/indexExtension/LuceneIndexExtensionServiceTest.java (100%) rename {celements-search-lucene => celements-search}/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ActionExecutionEventListenerTest.java (100%) rename {celements-search-lucene => celements-search}/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderManagerTest.java (100%) rename {celements-search-lucene => celements-search}/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderTest.java (100%) rename {celements-search-lucene => celements-search}/src/test/resources/html.html (100%) rename {celements-search-lucene => celements-search}/src/test/resources/msoffice97.doc (100%) rename {celements-search-lucene => celements-search}/src/test/resources/opendocument.odt (100%) rename {celements-search-lucene => celements-search}/src/test/resources/openxml.docx (100%) rename {celements-search-lucene => celements-search}/src/test/resources/pdf.pdf (100%) rename {celements-search-lucene => celements-search}/src/test/resources/txt.txt (100%) rename {celements-search-lucene => celements-search}/src/test/resources/zip.zip (100%) diff --git a/.gitignore b/.gitignore index cd5d2338..0c3075cc 100644 --- a/.gitignore +++ b/.gitignore @@ -85,7 +85,6 @@ local.properties *.war *.nar *.ear -*.zip *.tar.gz *.rar diff --git a/celements-search-lucene/pom.xml b/celements-search-lucene/pom.xml deleted file mode 100644 index 2170da2a..00000000 --- a/celements-search-lucene/pom.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - 4.0.0 - - com.celements - celements - 7.0-SNAPSHOT - - celements-search-lucene - 7.0-SNAPSHOT - Celements Search Lucene - - - com.celements - celements-model - 7.0-SNAPSHOT - provided - - - com.celements - celements-core - 7.0-SNAPSHOT - provided - - - org.apache.lucene - lucene-core - 3.4.0 - - - org.apache.lucene - lucene-analyzers - 3.4.0 - - - org.apache.lucene - lucene-queryparser - 3.4.0 - - - commons-collections - commons-collections - - - org.apache.tika - tika-parsers - - - org.apache.pdfbox - jbig2-imageio - - - com.github.jai-imageio - jai-imageio-jpeg2000 - - - org.xerial - sqlite-jdbc - - - - - javax.servlet - javax.servlet-api - test - - - - org.apache.xmlgraphics - batik-ext - 1.7 - test - - - - - scm:git:git@github.com:celements/celements-features.git - scm:git:git@github.com:celements/celements-features.git - https://github.com/celements/celements-features/celements-search-lucene - HEAD - - diff --git a/celements-search-lucene/src/main/resources/META-INF/components.txt b/celements-search-lucene/src/main/resources/META-INF/components.txt deleted file mode 100644 index bde1c1d0..00000000 --- a/celements-search-lucene/src/main/resources/META-INF/components.txt +++ /dev/null @@ -1,5 +0,0 @@ -com.xpn.xwiki.plugin.lucene.searcherProvider.SearcherProviderManager -com.xpn.xwiki.plugin.lucene.searcherProvider.ActionExecutionEventListener -com.xpn.xwiki.plugin.lucene.indexExtension.LuceneIndexExtensionService -com.xpn.xwiki.plugin.lucene.searcherProvider.SearchProviderDebugScriptService -com.xpn.xwiki.plugin.lucene.IndexRebuilder diff --git a/celements-search/pom.xml b/celements-search/pom.xml index 5189df93..32ff04f9 100644 --- a/celements-search/pom.xml +++ b/celements-search/pom.xml @@ -43,22 +43,64 @@ 7.0-SNAPSHOT provided + + com.celements + celements-scheduler + 7.0-SNAPSHOT + provided + + + + + org.apache.lucene + lucene-core + 3.4.0 + + + org.apache.lucene + lucene-analyzers + 3.4.0 + org.apache.lucene lucene-queryparser 3.4.0 - com.celements - celements-search-lucene - 7.0-SNAPSHOT + commons-collections + commons-collections - com.celements - celements-scheduler - 7.0-SNAPSHOT - provided + org.apache.tika + tika-parsers + + + org.apache.pdfbox + jbig2-imageio + + + com.github.jai-imageio + jai-imageio-jpeg2000 + + + org.xerial + sqlite-jdbc + + + + + javax.servlet + javax.servlet-api + test + + + + org.apache.xmlgraphics + batik-ext + 1.7 + test + scm:git:git@github.com:celements/celements-features.git diff --git a/celements-search-lucene/src/main/java/com/celements/search/lucene/LuceneDocType.java b/celements-search/src/main/java/com/celements/search/lucene/LuceneDocType.java similarity index 100% rename from celements-search-lucene/src/main/java/com/celements/search/lucene/LuceneDocType.java rename to celements-search/src/main/java/com/celements/search/lucene/LuceneDocType.java diff --git a/celements-search-lucene/src/main/java/com/celements/search/lucene/index/analysis/CelAnalyzer.java b/celements-search/src/main/java/com/celements/search/lucene/index/analysis/CelAnalyzer.java similarity index 100% rename from celements-search-lucene/src/main/java/com/celements/search/lucene/index/analysis/CelAnalyzer.java rename to celements-search/src/main/java/com/celements/search/lucene/index/analysis/CelAnalyzer.java diff --git a/celements-search-lucene/src/main/java/com/celements/search/lucene/index/analysis/CelementsSimpleAnalyzer.java b/celements-search/src/main/java/com/celements/search/lucene/index/analysis/CelementsSimpleAnalyzer.java similarity index 100% rename from celements-search-lucene/src/main/java/com/celements/search/lucene/index/analysis/CelementsSimpleAnalyzer.java rename to celements-search/src/main/java/com/celements/search/lucene/index/analysis/CelementsSimpleAnalyzer.java diff --git a/celements-search-lucene/src/main/java/com/celements/search/lucene/index/queue/IndexQueuePriority.java b/celements-search/src/main/java/com/celements/search/lucene/index/queue/IndexQueuePriority.java similarity index 100% rename from celements-search-lucene/src/main/java/com/celements/search/lucene/index/queue/IndexQueuePriority.java rename to celements-search/src/main/java/com/celements/search/lucene/index/queue/IndexQueuePriority.java diff --git a/celements-search-lucene/src/main/java/com/celements/search/lucene/index/rebuild/LuceneIndexRebuildService.java b/celements-search/src/main/java/com/celements/search/lucene/index/rebuild/LuceneIndexRebuildService.java similarity index 100% rename from celements-search-lucene/src/main/java/com/celements/search/lucene/index/rebuild/LuceneIndexRebuildService.java rename to celements-search/src/main/java/com/celements/search/lucene/index/rebuild/LuceneIndexRebuildService.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/AbstractDocumentData.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/AbstractDocumentData.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/AbstractDocumentData.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/AbstractDocumentData.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/AbstractIndexData.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/AbstractIndexData.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/AbstractIndexData.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/AbstractIndexData.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/AttachmentData.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/AttachmentData.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/AttachmentData.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/AttachmentData.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/DeleteData.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/DeleteData.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/DeleteData.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/DeleteData.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/DocumentData.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/DocumentData.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/DocumentData.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/DocumentData.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/IndexFields.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/IndexFields.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/IndexFields.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/IndexFields.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/IndexRebuilder.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/IndexRebuilder.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/IndexRebuilder.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/IndexRebuilder.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/IndexUpdater.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/IndexUpdater.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/IndexUpdater.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/IndexUpdater.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/LucenePlugin.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/LucenePlugin.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/LucenePlugin.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/LucenePlugin.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/LucenePluginApi.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/LucenePluginApi.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/LucenePluginApi.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/LucenePluginApi.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResult.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResult.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResult.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResult.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResults.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResults.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResults.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResults.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/WikiData.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/WikiData.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/WikiData.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/WikiData.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/XWikiDocumentQueue.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/XWikiDocumentQueue.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/XWikiDocumentQueue.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/XWikiDocumentQueue.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/ILuceneIndexExtender.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/ILuceneIndexExtender.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/ILuceneIndexExtender.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/ILuceneIndexExtender.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/ILuceneIndexExtensionServiceRole.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/ILuceneIndexExtensionServiceRole.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/ILuceneIndexExtensionServiceRole.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/ILuceneIndexExtensionServiceRole.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/IndexExtensionField.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/IndexExtensionField.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/IndexExtensionField.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/IndexExtensionField.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/LuceneIndexExtensionService.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/LuceneIndexExtensionService.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/LuceneIndexExtensionService.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/indexExtension/LuceneIndexExtensionService.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentDeletedEvent.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentDeletedEvent.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentDeletedEvent.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentDeletedEvent.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentDeletingEvent.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentDeletingEvent.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentDeletingEvent.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentDeletingEvent.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentIndexedEvent.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentIndexedEvent.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentIndexedEvent.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentIndexedEvent.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentIndexingEvent.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentIndexingEvent.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentIndexingEvent.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/observation/event/LuceneDocumentIndexingEvent.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ActionExecutionEventListener.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ActionExecutionEventListener.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ActionExecutionEventListener.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ActionExecutionEventListener.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ISearcherProviderRole.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ISearcherProviderRole.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ISearcherProviderRole.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ISearcherProviderRole.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearchProviderDebugScriptService.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearchProviderDebugScriptService.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearchProviderDebugScriptService.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearchProviderDebugScriptService.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProvider.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProvider.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProvider.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProvider.java diff --git a/celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderManager.java b/celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderManager.java similarity index 100% rename from celements-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderManager.java rename to celements-search/src/main/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderManager.java diff --git a/celements-search-lucene/src/main/resources/META-INF/MANIFEST.MF b/celements-search/src/main/resources/META-INF/MANIFEST.MF similarity index 92% rename from celements-search-lucene/src/main/resources/META-INF/MANIFEST.MF rename to celements-search/src/main/resources/META-INF/MANIFEST.MF index 5e949512..254272e1 100644 --- a/celements-search-lucene/src/main/resources/META-INF/MANIFEST.MF +++ b/celements-search/src/main/resources/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ -Manifest-Version: 1.0 -Class-Path: - +Manifest-Version: 1.0 +Class-Path: + diff --git a/celements-search/src/main/resources/META-INF/components.txt b/celements-search/src/main/resources/META-INF/components.txt index 4fdbaf4a..66e37763 100644 --- a/celements-search/src/main/resources/META-INF/components.txt +++ b/celements-search/src/main/resources/META-INF/components.txt @@ -1,3 +1,8 @@ +com.xpn.xwiki.plugin.lucene.searcherProvider.SearcherProviderManager +com.xpn.xwiki.plugin.lucene.searcherProvider.ActionExecutionEventListener +com.xpn.xwiki.plugin.lucene.indexExtension.LuceneIndexExtensionService +com.xpn.xwiki.plugin.lucene.searcherProvider.SearchProviderDebugScriptService +com.xpn.xwiki.plugin.lucene.IndexRebuilder com.celements.search.lucene.LuceneSearchService com.celements.search.lucene.LuceneSearchScriptService com.celements.search.web.classes.WebSearchClassConfig diff --git a/celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/AttachmentDataTest.java b/celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/AttachmentDataTest.java similarity index 100% rename from celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/AttachmentDataTest.java rename to celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/AttachmentDataTest.java diff --git a/celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/TestXWikiDocument.java b/celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/TestXWikiDocument.java similarity index 100% rename from celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/TestXWikiDocument.java rename to celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/TestXWikiDocument.java diff --git a/celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/indexExtension/IndexExtensionFieldTest.java b/celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/indexExtension/IndexExtensionFieldTest.java similarity index 100% rename from celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/indexExtension/IndexExtensionFieldTest.java rename to celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/indexExtension/IndexExtensionFieldTest.java diff --git a/celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/indexExtension/LuceneIndexExtensionServiceTest.java b/celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/indexExtension/LuceneIndexExtensionServiceTest.java similarity index 100% rename from celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/indexExtension/LuceneIndexExtensionServiceTest.java rename to celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/indexExtension/LuceneIndexExtensionServiceTest.java diff --git a/celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ActionExecutionEventListenerTest.java b/celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ActionExecutionEventListenerTest.java similarity index 100% rename from celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ActionExecutionEventListenerTest.java rename to celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/ActionExecutionEventListenerTest.java diff --git a/celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderManagerTest.java b/celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderManagerTest.java similarity index 100% rename from celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderManagerTest.java rename to celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderManagerTest.java diff --git a/celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderTest.java b/celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderTest.java similarity index 100% rename from celements-search-lucene/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderTest.java rename to celements-search/src/test/java/com/xpn/xwiki/plugin/lucene/searcherProvider/SearcherProviderTest.java diff --git a/celements-search-lucene/src/test/resources/html.html b/celements-search/src/test/resources/html.html similarity index 100% rename from celements-search-lucene/src/test/resources/html.html rename to celements-search/src/test/resources/html.html diff --git a/celements-search-lucene/src/test/resources/msoffice97.doc b/celements-search/src/test/resources/msoffice97.doc similarity index 100% rename from celements-search-lucene/src/test/resources/msoffice97.doc rename to celements-search/src/test/resources/msoffice97.doc diff --git a/celements-search-lucene/src/test/resources/opendocument.odt b/celements-search/src/test/resources/opendocument.odt similarity index 100% rename from celements-search-lucene/src/test/resources/opendocument.odt rename to celements-search/src/test/resources/opendocument.odt diff --git a/celements-search-lucene/src/test/resources/openxml.docx b/celements-search/src/test/resources/openxml.docx similarity index 100% rename from celements-search-lucene/src/test/resources/openxml.docx rename to celements-search/src/test/resources/openxml.docx diff --git a/celements-search-lucene/src/test/resources/pdf.pdf b/celements-search/src/test/resources/pdf.pdf similarity index 100% rename from celements-search-lucene/src/test/resources/pdf.pdf rename to celements-search/src/test/resources/pdf.pdf diff --git a/celements-search-lucene/src/test/resources/txt.txt b/celements-search/src/test/resources/txt.txt similarity index 100% rename from celements-search-lucene/src/test/resources/txt.txt rename to celements-search/src/test/resources/txt.txt diff --git a/celements-search-lucene/src/test/resources/zip.zip b/celements-search/src/test/resources/zip.zip similarity index 100% rename from celements-search-lucene/src/test/resources/zip.zip rename to celements-search/src/test/resources/zip.zip