Implementing CardDav (readlony) started, Milton removed due to licens…

…e costs.
micromata · Dec 3, 2024 · 2769278 · 2769278
1 parent 38b952b
commit 2769278
Show file tree

Hide file tree

Showing 32 changed files with 581 additions and 1,509 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -20,7 +20,6 @@ commons-beanutils = "1.9.4"
 commons-io = "2.16.1"
 de-micromata-merlin = "1.1.16"
 io-dropwizard-metrics-core = "4.2.26"
-io-milton-server-ent = "4.0.5.2400"
 io-spring-dependency-management = "1.1.6" # io.spring.dependency-management.gradle.plugin
 fr-opensagres-xdocreport-poi-xwpf-converter-pdf = "2.0.4"
 jakarta-activation-api = "2.1.3"
@@ -132,7 +131,6 @@ commons-io = { module = "commons-io:commons-io", version.ref = "commons-io" }
 de-micromata-merlin-core = { module = "de.micromata.merlin:merlin-core", version.ref = "de-micromata-merlin" }
 fr-opensagres-xdocrepor-poi-xwpf-converter-pdf = { module = "fr.opensagres.xdocreport:fr.opensagres.poi.xwpf.converter.pdf", version.ref = "fr-opensagres-xdocreport-poi-xwpf-converter-pdf" }
 io-dropwizard-metrics-core = { module = "io.dropwizard.metrics:metrics-core", version.ref = "io-dropwizard-metrics-core" }
-io-milton-server-ent = { module = "io.milton:milton-server-ent", version.ref = "io-milton-server-ent" }
 io-github-microutils-kotlin-logging = { module = "io.github.microutils:kotlin-logging", version.ref = "io-github-microutils-kotlin-logging" }
 jakarta-activation-api = { module = "jakarta.activation:jakarta.activation-api", version.ref = "jakarta-activation-api" }
 jakarta-annotation-api = { module = "jakarta.annotation:jakarta.annotation-api", version.ref = "jakarta-annotation-api" }

diff --git a/projectforge-application/build.gradle.kts b/projectforge-application/build.gradle.kts
@@ -132,7 +132,6 @@ dependencies {
     implementation(libs.de.micromata.merlin.core)
     implementation(libs.fr.opensagres.xdocrepor.poi.xwpf.converter.pdf)
     implementation(libs.io.dropwizard.metrics.core)
-    implementation(libs.io.milton.server.ent)
     implementation(libs.io.github.microutils.kotlin.logging)
     implementation(libs.jakarta.activation.api)
     implementation(libs.jakarta.annotation.api)

diff --git a/projectforge-application/src/main/java/org/projectforge/config/WebApplicationConfig.java b/projectforge-application/src/main/java/org/projectforge/config/WebApplicationConfig.java
@@ -24,11 +24,9 @@
 package org.projectforge.config;
 
 import org.projectforge.Constants;
-import org.projectforge.caldav.config.DAVMethodsInterceptor;
-import org.projectforge.common.EmphasizedLogSupport;
+import org.projectforge.carddav.DAVMethodsInterceptor;
 import org.projectforge.framework.configuration.PFSpringConfiguration;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;

diff --git a/projectforge-application/src/main/java/org/projectforge/config/WebXMLInitializer.java b/projectforge-application/src/main/java/org/projectforge/config/WebXMLInitializer.java
@@ -29,8 +29,7 @@
 import org.apache.wicket.protocol.http.WicketFilter;
 import org.apache.wicket.spring.SpringWebApplicationFactory;
 import org.projectforge.business.user.filter.WicketUserFilter;
-import org.projectforge.caldav.config.PFMiltonInit;
-import org.projectforge.common.EmphasizedLogSupport;
+import org.projectforge.carddav.CardDavInit;
 import org.projectforge.model.rest.RestPaths;
 import org.projectforge.rest.config.*;
 import org.projectforge.security.LoggingFilter;
@@ -60,7 +59,7 @@ public class WebXMLInitializer implements ServletContextInitializer {
     private static final String PARAM_APP_BEAN = "applicationBean";
 
     @Autowired
-    private PFMiltonInit pfMiltonInit;
+    private CardDavInit cardDavInit;
 
     @Override
     public void onStartup(ServletContext sc) throws ServletException {
@@ -73,7 +72,7 @@ public void onStartup(ServletContext sc) throws ServletException {
          */
         sc.addFilter("redirectOrphanedLinks", new OrphanedLinkFilter()).addMappingForUrlPatterns(null, false, "/*");
 
-        pfMiltonInit.init(sc);
+        cardDavInit.init(sc);
 
         boolean filterAfterInternal = false;
         RestUtils.registerFilter(sc, "loggingFilter", LoggingFilter.class, false, "/*");

diff --git a/projectforge-application/src/main/kotlin/org/projectforge/security/LoggingFilter.kt b/projectforge-application/src/main/kotlin/org/projectforge/security/LoggingFilter.kt
@@ -26,7 +26,7 @@ package org.projectforge.security
 import mu.KotlinLogging
 import org.projectforge.business.configuration.ConfigurationService
 import org.projectforge.business.configuration.ConfigurationServiceAccessor
-import org.projectforge.caldav.config.DAVMethodsInterceptor
+import org.projectforge.carddav.DAVMethodsInterceptor
 import org.projectforge.common.logging.*
 import org.projectforge.login.LoginService
 import org.projectforge.rest.utils.RequestLog

diff --git a/projectforge-caldav/build.gradle.kts b/projectforge-caldav/build.gradle.kts
@@ -7,7 +7,6 @@ dependencies {
     api(project(":projectforge-business"))
     api(project(":projectforge-rest"))
     api(libs.org.springframework.spring.webmvc)
-    api(libs.io.milton.server.ent)
     api(libs.com.googlecode.ez.vcard)
     testImplementation(libs.org.mockito.core)
 }

diff --git a/...dav/src/main/java/org/projectforge/caldav/controller/BaseDAVAuthenticationController.java b/...dav/src/main/java/org/projectforge/caldav/controller/BaseDAVAuthenticationController.java
diff --git a/projectforge-caldav/src/main/kotlin/org/projectforge/caldav/config/PFMiltonFilter.kt b/projectforge-caldav/src/main/kotlin/org/projectforge/caldav/config/PFMiltonFilter.kt
diff --git a/projectforge-caldav/src/main/kotlin/org/projectforge/caldav/config/PFMiltonInit.kt b/projectforge-caldav/src/main/kotlin/org/projectforge/caldav/config/PFMiltonInit.kt