projectforge-caldav -> projectforge-carddav

micromata · Dec 3, 2024 · d0aed59 · d0aed59
1 parent 8fc0c83
commit d0aed59
Show file tree

Hide file tree

Showing 20 changed files with 16 additions and 4 deletions.
diff --git a/projectforge-application/build.gradle.kts b/projectforge-application/build.gradle.kts
@@ -28,7 +28,7 @@ val kotlinCompilerDependencies = mutableListOf<String>()
 dependencies {
     implementation(project(":projectforge-wicket"))
     implementation(project(":projectforge-rest"))
-    implementation(project(":projectforge-caldav"))
+    implementation(project(":projectforge-carddav"))
     implementation(project(":projectforge-webapp"))
     implementation(project(":org.projectforge.plugins.datatransfer"))
     implementation(project(":org.projectforge.plugins.ihk"))

diff --git a/projectforge-caldav/src/main/resources/ical4j.properties b/projectforge-caldav/src/main/resources/ical4j.properties
diff --git a/projectforge-caldav/build.gradle.kts → projectforge-carddav/build.gradle.kts b/projectforge-caldav/build.gradle.kts → projectforge-carddav/build.gradle.kts
@@ -11,4 +11,4 @@ dependencies {
     testImplementation(libs.org.mockito.core)
 }
 
-description = "projectforge-caldav"
+description = "projectforge-carddav"
diff --git a/projectforge-carddav/src/main/kotlin/org/projectforge/carddav/CardDavConfig.kt b/projectforge-carddav/src/main/kotlin/org/projectforge/carddav/CardDavConfig.kt
@@ -0,0 +1,12 @@
+package org.projectforge.carddav
+
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.context.annotation.Configuration
+
+@Configuration
+open class CardDavConfig {
+
+    @Value("\${projectforge.carddav.basePath}")
+    open lateinit var basePath: String
+        protected set
+}
diff --git a/...projectforge/carddav/CardDavController.kt → ...projectforge/carddav/CardDavController.kt b/...projectforge/carddav/CardDavController.kt → ...projectforge/carddav/CardDavController.kt
diff --git a/...org/projectforge/carddav/CardDavFilter.kt → ...org/projectforge/carddav/CardDavFilter.kt b/...org/projectforge/carddav/CardDavFilter.kt → ...org/projectforge/carddav/CardDavFilter.kt
diff --git a/...n/org/projectforge/carddav/CardDavInit.kt → ...n/org/projectforge/carddav/CardDavInit.kt b/...n/org/projectforge/carddav/CardDavInit.kt → ...n/org/projectforge/carddav/CardDavInit.kt
diff --git a/...ectforge/carddav/DAVMethodsInterceptor.kt → ...ectforge/carddav/DAVMethodsInterceptor.kt b/...ectforge/carddav/DAVMethodsInterceptor.kt → ...ectforge/carddav/DAVMethodsInterceptor.kt
diff --git a/...e/carddav/controller/BaseDAVController.kt → ...e/carddav/controller/BaseDAVController.kt b/...e/carddav/controller/BaseDAVController.kt → ...e/carddav/controller/BaseDAVController.kt
diff --git a/...projectforge/carddav/model/AddressBook.kt → ...projectforge/carddav/model/AddressBook.kt b/...projectforge/carddav/model/AddressBook.kt → ...projectforge/carddav/model/AddressBook.kt
diff --git a/...org/projectforge/carddav/model/Contact.kt → ...org/projectforge/carddav/model/Contact.kt b/...org/projectforge/carddav/model/Contact.kt → ...org/projectforge/carddav/model/Contact.kt
diff --git a/...ectforge/carddav/model/ContactMetaData.kt → ...ectforge/carddav/model/ContactMetaData.kt b/...ectforge/carddav/model/ContactMetaData.kt → ...ectforge/carddav/model/ContactMetaData.kt
diff --git a/...in/org/projectforge/carddav/model/User.kt → ...in/org/projectforge/carddav/model/User.kt b/...in/org/projectforge/carddav/model/User.kt → ...in/org/projectforge/carddav/model/User.kt
diff --git a/...tforge/carddav/service/AddressDAVCache.kt → ...tforge/carddav/service/AddressDAVCache.kt b/...tforge/carddav/service/AddressDAVCache.kt → ...tforge/carddav/service/AddressDAVCache.kt
diff --git a/...ctforge/carddav/service/AddressService.kt → ...ctforge/carddav/service/AddressService.kt b/...ctforge/carddav/service/AddressService.kt → ...ctforge/carddav/service/AddressService.kt
diff --git a/...tforge/carddav/service/DavSessionCache.kt → ...tforge/carddav/service/DavSessionCache.kt b/...tforge/carddav/service/DavSessionCache.kt → ...tforge/carddav/service/DavSessionCache.kt
diff --git a/projectforge-carddav/src/main/resources/application.properties b/projectforge-carddav/src/main/resources/application.properties
@@ -0,0 +1 @@
+projectforge.carddav.basePath=/carddav
diff --git a/...e/carddav/config/CardDavControllerTest.kt → ...e/carddav/config/CardDavControllerTest.kt b/...e/carddav/config/CardDavControllerTest.kt → ...e/carddav/config/CardDavControllerTest.kt
diff --git a/...rddav/config/DAVMethodsInterceptorTest.kt → ...rddav/config/DAVMethodsInterceptorTest.kt b/...rddav/config/DAVMethodsInterceptorTest.kt → ...rddav/config/DAVMethodsInterceptorTest.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -8,7 +8,7 @@ include(":projectforge-application")
 include(":projectforge-business")
 include(":projectforge-common")
 include(":projectforge-commons-test")
-include(":projectforge-caldav")
+include(":projectforge-carddav")
 include(":projectforge-jcr")
 include(":projectforge-model")
 include(":projectforge-rest")