diff --git a/src/main/java/org/olat/admin/sysinfo/CoreFunctionsController.java b/src/main/java/org/olat/admin/sysinfo/CoreFunctionsController.java
index 1244dbf0ba327befc9d9c1db90573eb54d084e73..26c3dbe1ecdd17a2f32c10c42d1d824d367c8b0b 100644
--- a/src/main/java/org/olat/admin/sysinfo/CoreFunctionsController.java
+++ b/src/main/java/org/olat/admin/sysinfo/CoreFunctionsController.java
@@ -21,6 +21,7 @@ package org.olat.admin.sysinfo;
import org.olat.core.CoreSpringFactory;
import org.olat.core.commons.chiefcontrollers.BaseChiefController;
+import org.olat.core.commons.services.webdav.WebDAVManager;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.form.flexible.FormItemContainer;
import org.olat.core.gui.components.form.flexible.elements.MultipleSelectionElement;
@@ -28,7 +29,6 @@ import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.WindowControl;
-import org.olat.core.servlets.WebDAVManager;
import org.olat.restapi.RestModule;
/**
diff --git a/src/main/java/org/olat/admin/user/UsermanagerUserSearchController.java b/src/main/java/org/olat/admin/user/UsermanagerUserSearchController.java
index 435bc64cdca94a5a18147db3cf4c8e1a1d7e6a56..ae2d7e54b3c0e8ea969fb29be1a5b72b04ac2c42 100644
--- a/src/main/java/org/olat/admin/user/UsermanagerUserSearchController.java
+++ b/src/main/java/org/olat/admin/user/UsermanagerUserSearchController.java
@@ -43,6 +43,8 @@ import org.olat.basesecurity.events.SingleIdentityChosenEvent;
import org.olat.core.commons.fullWebApp.popup.BaseFullWebappPopupLayoutFactory;
import org.olat.core.commons.persistence.DBFactory;
import org.olat.core.commons.persistence.PersistenceHelper;
+import org.olat.core.commons.services.webdav.WebDAVManager;
+import org.olat.core.commons.services.webdav.manager.WebDAVAuthManager;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.form.flexible.FormItem;
@@ -83,7 +85,6 @@ import org.olat.core.id.context.StateEntry;
import org.olat.core.id.context.StateMapped;
import org.olat.core.logging.AssertException;
import org.olat.core.logging.activity.ThreadLocalUserActivityLogger;
-import org.olat.core.servlets.WebDAVManager;
import org.olat.core.util.StringHelper;
import org.olat.core.util.Util;
import org.olat.core.util.mail.ContactList;
@@ -91,7 +92,6 @@ import org.olat.core.util.mail.ContactMessage;
import org.olat.core.util.resource.OresHelper;
import org.olat.login.LoginModule;
import org.olat.login.auth.AuthenticationProvider;
-import org.olat.login.auth.WebDAVAuthManager;
import org.olat.modules.co.ContactFormController;
import org.olat.user.UserInfoMainController;
import org.olat.user.UserManager;
diff --git a/src/main/java/org/olat/commons/calendar/CalendarWebDAVProvider.java b/src/main/java/org/olat/commons/calendar/CalendarWebDAVProvider.java
index 132d5cc99d14dcc79ff10bc3e7892362032c20ec..63a6f7f6d6bb972454d861b18b5ffe8ef8b697b0 100644
--- a/src/main/java/org/olat/commons/calendar/CalendarWebDAVProvider.java
+++ b/src/main/java/org/olat/commons/calendar/CalendarWebDAVProvider.java
@@ -27,8 +27,8 @@ package org.olat.commons.calendar;
import java.io.File;
+import org.olat.core.commons.services.webdav.WebDAVProvider;
import org.olat.core.id.Identity;
-import org.olat.core.util.servlets.WebDAVProvider;
import org.olat.core.util.vfs.LocalFileImpl;
import org.olat.core.util.vfs.VFSContainer;
import org.olat.core.util.vfs.VirtualContainer;
diff --git a/src/main/java/org/olat/core/commons/modules/bc/BriefcaseWebDAVProvider.java b/src/main/java/org/olat/core/commons/modules/bc/BriefcaseWebDAVProvider.java
index c45607ce133391b7c40e14505a38caceae3a7644..25679184982c971a69cfead5f9494cb01218853f 100644
--- a/src/main/java/org/olat/core/commons/modules/bc/BriefcaseWebDAVProvider.java
+++ b/src/main/java/org/olat/core/commons/modules/bc/BriefcaseWebDAVProvider.java
@@ -26,9 +26,9 @@
package org.olat.core.commons.modules.bc;
+import org.olat.core.commons.services.webdav.WebDAVProvider;
import org.olat.core.id.Identity;
import org.olat.core.manager.BasicManager;
-import org.olat.core.util.servlets.WebDAVProvider;
import org.olat.core.util.vfs.VFSContainer;
/**
*
@@ -42,7 +42,7 @@ public class BriefcaseWebDAVProvider extends BasicManager implements WebDAVProv
}
/**
- * @see org.olat.commons.servlets.util.WebDAVProvider#getContainer(org.olat.core.id.Identity)
+ * @see org.olat.core.commons.services.webdav.WebDAVProvider#getContainer(org.olat.core.id.Identity)
*/
public VFSContainer getContainer(Identity identity) {
// merge /public and /private
diff --git a/src/main/java/org/olat/core/commons/modules/bc/FolderRunController.java b/src/main/java/org/olat/core/commons/modules/bc/FolderRunController.java
index c65f33ca3805587e62a3268ab0e1ff9b97f6d44b..ba7d4d92b5ded31c8627b4552a9a1e5e36153888 100644
--- a/src/main/java/org/olat/core/commons/modules/bc/FolderRunController.java
+++ b/src/main/java/org/olat/core/commons/modules/bc/FolderRunController.java
@@ -43,6 +43,7 @@ import org.olat.core.commons.modules.bc.commands.FolderCommand;
import org.olat.core.commons.modules.bc.commands.FolderCommandFactory;
import org.olat.core.commons.modules.bc.commands.FolderCommandStatus;
import org.olat.core.commons.modules.bc.components.FolderComponent;
+import org.olat.core.commons.services.webdav.WebDAVManager;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.download.DisplayOrDownloadComponent;
@@ -66,7 +67,6 @@ import org.olat.core.logging.Tracing;
import org.olat.core.logging.activity.CoreLoggingResourceable;
import org.olat.core.logging.activity.ILoggingAction;
import org.olat.core.logging.activity.ThreadLocalUserActivityLogger;
-import org.olat.core.servlets.WebDAVManager;
import org.olat.core.util.notifications.ContextualSubscriptionController;
import org.olat.core.util.notifications.PublisherData;
import org.olat.core.util.notifications.SubscriptionContext;
diff --git a/src/main/java/org/olat/core/servlets/DefaultServlet.java b/src/main/java/org/olat/core/commons/services/webdav/DefaultServlet.java
similarity index 99%
rename from src/main/java/org/olat/core/servlets/DefaultServlet.java
rename to src/main/java/org/olat/core/commons/services/webdav/DefaultServlet.java
index 7eba3a8b115b127eadd0914bd4e31da69a7650a2..b9f38d918d6468044301302f48133bc43d990df6 100644
--- a/src/main/java/org/olat/core/servlets/DefaultServlet.java
+++ b/src/main/java/org/olat/core/commons/services/webdav/DefaultServlet.java
@@ -24,7 +24,7 @@
* <p>
*/
-package org.olat.core.servlets;
+package org.olat.core.commons.services.webdav;
/*
* ====================================================================
*
diff --git a/src/main/java/org/olat/core/servlets/SecureWebdavServlet.java b/src/main/java/org/olat/core/commons/services/webdav/SecureWebdavServlet.java
similarity index 99%
rename from src/main/java/org/olat/core/servlets/SecureWebdavServlet.java
rename to src/main/java/org/olat/core/commons/services/webdav/SecureWebdavServlet.java
index fdc2ae14b115c1706fed7f593cf1f322172ae746..c2b153ab673f7c38cc25b314e94f20261cc8606b 100644
--- a/src/main/java/org/olat/core/servlets/SecureWebdavServlet.java
+++ b/src/main/java/org/olat/core/commons/services/webdav/SecureWebdavServlet.java
@@ -24,7 +24,7 @@
* <p>
*/
-package org.olat.core.servlets;
+package org.olat.core.commons.services.webdav;
import java.io.IOException;
@@ -55,6 +55,7 @@ import javax.xml.parsers.ParserConfigurationException;
import org.apache.naming.resources.Resource;
import org.olat.core.commons.persistence.DBFactory;
+import org.olat.core.commons.services.webdav.manager.VFSDirContext;
import org.olat.core.helpers.Settings;
import org.olat.core.id.Identity;
import org.olat.core.logging.OLATRuntimeException;
@@ -66,8 +67,6 @@ import org.olat.core.util.WorkThreadInformations;
import org.olat.core.util.i18n.I18nManager;
import org.olat.core.util.servlets.DOMWriter;
import org.olat.core.util.servlets.RequestUtil;
-import org.olat.core.util.servlets.VFSDirContext;
-import org.olat.core.util.servlets.WebDAVProviderFactory;
import org.olat.core.util.servlets.XMLWriter;
import org.olat.core.util.vfs.VFSConstants;
import org.olat.core.util.vfs.VFSItem;
diff --git a/src/main/java/org/olat/core/servlets/WebDAVManager.java b/src/main/java/org/olat/core/commons/services/webdav/WebDAVManager.java
similarity index 97%
rename from src/main/java/org/olat/core/servlets/WebDAVManager.java
rename to src/main/java/org/olat/core/commons/services/webdav/WebDAVManager.java
index 7c3d95c0f675615cf3fce5ff1d45eb401cb20106..f6f9527010e0493c10bff963f3e24be9eae1dd43 100644
--- a/src/main/java/org/olat/core/servlets/WebDAVManager.java
+++ b/src/main/java/org/olat/core/commons/services/webdav/WebDAVManager.java
@@ -17,7 +17,7 @@
* frentix GmbH, http://www.frentix.com
* <p>
*/
-package org.olat.core.servlets;
+package org.olat.core.commons.services.webdav;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
diff --git a/src/main/java/org/olat/core/util/servlets/WebDAVProvider.java b/src/main/java/org/olat/core/commons/services/webdav/WebDAVProvider.java
similarity index 96%
rename from src/main/java/org/olat/core/util/servlets/WebDAVProvider.java
rename to src/main/java/org/olat/core/commons/services/webdav/WebDAVProvider.java
index 3b4dddb935cdd0e68924be817dfe2d39572004b3..010e902f966dddca2a0aa53d8c2f8802e13576e4 100644
--- a/src/main/java/org/olat/core/util/servlets/WebDAVProvider.java
+++ b/src/main/java/org/olat/core/commons/services/webdav/WebDAVProvider.java
@@ -24,7 +24,7 @@
* <p>
*/
-package org.olat.core.util.servlets;
+package org.olat.core.commons.services.webdav;
import org.olat.core.id.Identity;
import org.olat.core.util.vfs.VFSContainer;
diff --git a/src/main/java/org/olat/core/util/servlets/WebDAVProviderFactory.java b/src/main/java/org/olat/core/commons/services/webdav/WebDAVProviderFactory.java
similarity index 98%
rename from src/main/java/org/olat/core/util/servlets/WebDAVProviderFactory.java
rename to src/main/java/org/olat/core/commons/services/webdav/WebDAVProviderFactory.java
index 0aaf26c5f880c2a5a39fd9651e4fb334af286963..b55ebb6e08edbf30ab429bb42ffbce65bfdc9a2d 100644
--- a/src/main/java/org/olat/core/util/servlets/WebDAVProviderFactory.java
+++ b/src/main/java/org/olat/core/commons/services/webdav/WebDAVProviderFactory.java
@@ -24,7 +24,7 @@
* <p>
*/
-package org.olat.core.util.servlets;
+package org.olat.core.commons.services.webdav;
import java.util.HashMap;
import java.util.Iterator;
diff --git a/src/main/java/org/olat/core/util/servlets/WebDAVProviderNamedContainer.java b/src/main/java/org/olat/core/commons/services/webdav/WebDAVProviderNamedContainer.java
similarity index 97%
rename from src/main/java/org/olat/core/util/servlets/WebDAVProviderNamedContainer.java
rename to src/main/java/org/olat/core/commons/services/webdav/WebDAVProviderNamedContainer.java
index 0fcdf287267c8f091d6303801f37f9bd135f02a4..b0b130d40a1ccd8d9aee77601bc172ab280e5446 100644
--- a/src/main/java/org/olat/core/util/servlets/WebDAVProviderNamedContainer.java
+++ b/src/main/java/org/olat/core/commons/services/webdav/WebDAVProviderNamedContainer.java
@@ -17,7 +17,7 @@
* frentix GmbH, http://www.frentix.com
* <p>
*/
-package org.olat.core.util.servlets;
+package org.olat.core.commons.services.webdav;
import org.olat.core.id.Identity;
import org.olat.core.util.vfs.NamedContainerImpl;
diff --git a/src/main/java/org/olat/core/commons/services/webdav/_spring/webdavContext.xml b/src/main/java/org/olat/core/commons/services/webdav/_spring/webdavContext.xml
index a5d56282294b8b30ed7e138d40c0f683a7ab8ea9..e24e6ea68a60fe384f7f894b7eb5b94953648ffe 100644
--- a/src/main/java/org/olat/core/commons/services/webdav/_spring/webdavContext.xml
+++ b/src/main/java/org/olat/core/commons/services/webdav/_spring/webdavContext.xml
@@ -5,7 +5,7 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="webDAVManager" class="org.olat.commons.servlets.WebDAVManagerImpl" >
+ <bean id="webDAVManager" class="org.olat.core.commons.services.webdav.manager.WebDAVManagerImpl" >
<constructor-arg ref="coordinatorManager"/>
<!-- set to false to disable the WebDAV support and remove the WebDAV Link from the GUI -->
<property name="enabled" value="${webdav.links.enabled}" />
@@ -14,7 +14,7 @@
<!-- WebDAV provider factory -->
- <bean id="webdavfactory" class="org.olat.core.util.servlets.WebDAVProviderFactory" >
+ <bean id="webdavfactory" class="org.olat.core.commons.services.webdav.WebDAVProviderFactory" >
<property name="webdavProviderList">
<list>
<ref bean="webdav_briefcase"/>
diff --git a/src/main/java/org/olat/core/util/servlets/VFSDirContext.java b/src/main/java/org/olat/core/commons/services/webdav/manager/VFSDirContext.java
similarity index 99%
rename from src/main/java/org/olat/core/util/servlets/VFSDirContext.java
rename to src/main/java/org/olat/core/commons/services/webdav/manager/VFSDirContext.java
index 979078041d467ae6fc430e87516c6d6d987880b4..29cb9abb76a826b11407f15a6f591e246db67c6d 100644
--- a/src/main/java/org/olat/core/util/servlets/VFSDirContext.java
+++ b/src/main/java/org/olat/core/commons/services/webdav/manager/VFSDirContext.java
@@ -24,7 +24,7 @@
* <p>
*/
-package org.olat.core.util.servlets;
+package org.olat.core.commons.services.webdav.manager;
import java.io.IOException;
import java.io.InputStream;
diff --git a/src/main/java/org/olat/login/auth/WebDAVAuthManager.java b/src/main/java/org/olat/core/commons/services/webdav/manager/WebDAVAuthManager.java
similarity index 98%
rename from src/main/java/org/olat/login/auth/WebDAVAuthManager.java
rename to src/main/java/org/olat/core/commons/services/webdav/manager/WebDAVAuthManager.java
index a1396e10a167faa377e30a34fce47df16f931dff..bda7135b44aa4473026f175a947b24bf973d5bf2 100644
--- a/src/main/java/org/olat/login/auth/WebDAVAuthManager.java
+++ b/src/main/java/org/olat/core/commons/services/webdav/manager/WebDAVAuthManager.java
@@ -18,7 +18,7 @@
* <p>
*/
-package org.olat.login.auth;
+package org.olat.core.commons.services.webdav.manager;
import org.olat.basesecurity.Authentication;
import org.olat.basesecurity.BaseSecurityManager;
diff --git a/src/main/java/org/olat/commons/servlets/WebDAVManagerImpl.java b/src/main/java/org/olat/core/commons/services/webdav/manager/WebDAVManagerImpl.java
similarity index 93%
rename from src/main/java/org/olat/commons/servlets/WebDAVManagerImpl.java
rename to src/main/java/org/olat/core/commons/services/webdav/manager/WebDAVManagerImpl.java
index 87559b610258f21bb705420c781d4d9a5a11227b..61045c3b21c532cd1d630399841c8ae1aa3092e0 100644
--- a/src/main/java/org/olat/commons/servlets/WebDAVManagerImpl.java
+++ b/src/main/java/org/olat/core/commons/services/webdav/manager/WebDAVManagerImpl.java
@@ -23,7 +23,7 @@
* under the Apache 2.0 license as the original file.
*/
-package org.olat.commons.servlets;
+package org.olat.core.commons.services.webdav.manager;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -35,18 +35,17 @@ import javax.servlet.http.HttpServletResponse;
import org.olat.admin.user.delete.service.UserDeletionManager;
import org.olat.basesecurity.BaseSecurityManager;
import org.olat.basesecurity.BaseSecurityModule;
+import org.olat.core.commons.services.webdav.SecureWebdavServlet;
+import org.olat.core.commons.services.webdav.WebDAVManager;
import org.olat.core.id.Identity;
import org.olat.core.id.Roles;
import org.olat.core.id.User;
import org.olat.core.id.UserConstants;
-import org.olat.core.servlets.SecureWebdavServlet;
-import org.olat.core.servlets.WebDAVManager;
import org.olat.core.util.SessionInfo;
import org.olat.core.util.UserSession;
import org.olat.core.util.cache.CacheWrapper;
import org.olat.core.util.coordinate.CoordinatorManager;
import org.olat.core.util.session.UserSessionManager;
-import org.olat.login.auth.WebDAVAuthManager;
import com.oreilly.servlet.Base64Decoder;
@@ -85,7 +84,7 @@ public class WebDAVManagerImpl extends WebDAVManager {
}
/**
- * @see org.olat.commons.servlets.WebDAVManager#handleAuthentication(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+ * @see org.olat.core.commons.services.webdav.WebDAVManager#handleAuthentication(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
*/
@Override
protected boolean handleAuthentication(HttpServletRequest req, HttpServletResponse resp) {
@@ -99,7 +98,7 @@ public class WebDAVManagerImpl extends WebDAVManager {
}
/**
- * @see org.olat.commons.servlets.WebDAVManager#getUserSession(javax.servlet.http.HttpServletRequest)
+ * @see org.olat.core.commons.services.webdav.WebDAVManager#getUserSession(javax.servlet.http.HttpServletRequest)
*/
@Override
protected UserSession getUserSession(HttpServletRequest req) {
@@ -220,7 +219,7 @@ public class WebDAVManagerImpl extends WebDAVManager {
}
/**
- * @see org.olat.core.servlets.WebDAVManager#isEnabled()
+ * @see org.olat.core.commons.services.webdav.WebDAVManager#isEnabled()
*/
public boolean isEnabled() {
return enabled;
diff --git a/src/main/java/org/olat/core/util/UserSession.java b/src/main/java/org/olat/core/util/UserSession.java
index 45aaaa3b2222795697dc52eed81b5d1bf071fc6d..5e7091c5befd5eb93640e9730062844d97f911c5 100644
--- a/src/main/java/org/olat/core/util/UserSession.java
+++ b/src/main/java/org/olat/core/util/UserSession.java
@@ -103,7 +103,6 @@ public class UserSession implements HttpSessionBindingListener, GenericEventList
store = new HashMap<String,Object>(4);
nonClearedStore = new HashMap<String,Object>();
singleUserSystemBus = CoordinatorManager.getInstance().getCoordinator().createSingleUserInstance();
- sessionInfo = null;
return this;
}
diff --git a/src/main/java/org/olat/core/util/_spring/utilCorecontext.xml b/src/main/java/org/olat/core/util/_spring/utilCorecontext.xml
index c7e7c8ad03ac30f90bfb7bbb8fc5dc693f96040e..7f838337c39cbd52efe2254197a6cee6480bb9e9 100644
--- a/src/main/java/org/olat/core/util/_spring/utilCorecontext.xml
+++ b/src/main/java/org/olat/core/util/_spring/utilCorecontext.xml
@@ -169,7 +169,6 @@
<entry key="AssessmentManager" value-ref="org.olat.course.assessment.NewCachePersistingAssessmentManager" />
<entry key="GlossaryItemManager" value-ref="org.olat.core.modules.glossary.GlossaryItemManager_glossary"/>
<entry key="ProjectBrokerManager" value-ref="org.olat.course.nodes.projectbroker.service.ProjectBrokerManagerImpl_pb"/>
- <entry key="WebDAVManager" value-ref="org.olat.commons.servlets.WebDAVManagerImpl_webdav" />
</map>
</property>
</bean>
@@ -216,11 +215,6 @@
<property name="timeToIdle" value="3600" />
<property name="maxElementsInMemory" value="50" />
</bean>
- <bean id="org.olat.commons.servlets.WebDAVManagerImpl_webdav" class="org.olat.core.util.cache.CacheConfig">
- <property name="timeToLive" value="1800" />
- <property name="timeToIdle" value="300" />
- <property name="maxElementsInMemory" value="200" />
- </bean>
<bean id="org.olat.course.assessment.NewCachePersistingAssessmentManager" class="org.olat.core.util.cache.CacheConfig">
<property name="timeToLive" value="0" />
<property name="timeToIdle" value="60" />
diff --git a/src/main/java/org/olat/course/CoursefolderWebDAVProvider.java b/src/main/java/org/olat/course/CoursefolderWebDAVProvider.java
index bd9cd033717bef563c764ebd50e0b1f01d3375a8..9a1f3f062e7142f9ea0d31720ac94083454deb27 100644
--- a/src/main/java/org/olat/course/CoursefolderWebDAVProvider.java
+++ b/src/main/java/org/olat/course/CoursefolderWebDAVProvider.java
@@ -25,8 +25,8 @@
package org.olat.course;
+import org.olat.core.commons.services.webdav.WebDAVProvider;
import org.olat.core.id.Identity;
-import org.olat.core.util.servlets.WebDAVProvider;
import org.olat.core.util.vfs.VFSContainer;
/**
*
diff --git a/src/main/java/org/olat/group/GroupfoldersWebDAVProvider.java b/src/main/java/org/olat/group/GroupfoldersWebDAVProvider.java
index a3c6c0817a585b2eb9d11fa5303d8c8a8594ed91..a5086002366a91f2491e43afa6aa28eb748f3e2e 100644
--- a/src/main/java/org/olat/group/GroupfoldersWebDAVProvider.java
+++ b/src/main/java/org/olat/group/GroupfoldersWebDAVProvider.java
@@ -26,8 +26,8 @@
package org.olat.group;
import org.olat.collaboration.CollaborationManager;
+import org.olat.core.commons.services.webdav.WebDAVProvider;
import org.olat.core.id.Identity;
-import org.olat.core.util.servlets.WebDAVProvider;
import org.olat.core.util.vfs.VFSContainer;
/**
*
diff --git a/src/main/java/org/olat/modules/sharedfolder/SharedFolderWebDAVProvider.java b/src/main/java/org/olat/modules/sharedfolder/SharedFolderWebDAVProvider.java
index 395ff51882d17fdab9d4e781f1c51588abd0fcc4..5e789b6e742031f2dee65f474b7e00d462bae4ea 100644
--- a/src/main/java/org/olat/modules/sharedfolder/SharedFolderWebDAVProvider.java
+++ b/src/main/java/org/olat/modules/sharedfolder/SharedFolderWebDAVProvider.java
@@ -27,9 +27,9 @@ package org.olat.modules.sharedfolder;
import java.util.List;
+import org.olat.core.commons.services.webdav.WebDAVProvider;
import org.olat.core.id.Identity;
import org.olat.core.logging.LogDelegator;
-import org.olat.core.util.servlets.WebDAVProvider;
import org.olat.core.util.vfs.VFSContainer;
import org.olat.core.util.vfs.callbacks.ReadOnlyCallback;
import org.olat.core.util.vfs.callbacks.VFSSecurityCallback;
@@ -78,14 +78,14 @@ public class SharedFolderWebDAVProvider extends LogDelegator implements WebDAVPr
}
/**
- * @see org.olat.commons.servlets.util.WebDAVProvider#getMountPoint()
+ * @see org.olat.core.commons.services.webdav.WebDAVProvider#getMountPoint()
*/
public String getMountPoint() {
return "sharedfolders";
}
/**
- * @see org.olat.commons.servlets.util.WebDAVProvider#getContainer(org.olat.core.id.Identity)
+ * @see org.olat.core.commons.services.webdav.WebDAVProvider#getContainer(org.olat.core.id.Identity)
*/
public VFSContainer getContainer(Identity identity) {
return new SharedFolderWebDAVMergeSource(identity, publiclyReadableFolders);
diff --git a/src/main/java/org/olat/user/PersonalSettingsController.java b/src/main/java/org/olat/user/PersonalSettingsController.java
index 29a7ecf04e1ee80b0d912511bd433147f7e2649d..60adefe34bca84bc38ec00161350bec2ad8dc48b 100644
--- a/src/main/java/org/olat/user/PersonalSettingsController.java
+++ b/src/main/java/org/olat/user/PersonalSettingsController.java
@@ -33,6 +33,7 @@ import org.olat.basesecurity.BaseSecurityManager;
import org.olat.basesecurity.Constants;
import org.olat.core.CoreSpringFactory;
import org.olat.core.commons.persistence.DBFactory;
+import org.olat.core.commons.services.webdav.WebDAVManager;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.tabbedpane.TabbedPane;
@@ -46,7 +47,6 @@ import org.olat.core.id.Identity;
import org.olat.core.id.context.ContextEntry;
import org.olat.core.id.context.StateEntry;
import org.olat.core.logging.OLATSecurityException;
-import org.olat.core.servlets.WebDAVManager;
import org.olat.core.util.resource.OresHelper;
import org.olat.instantMessaging.InstantMessagingModule;
import org.olat.instantMessaging.ui.IMPreferenceController;
diff --git a/src/main/java/org/olat/user/WebDAVPasswordController.java b/src/main/java/org/olat/user/WebDAVPasswordController.java
index 440222fc1c851d48b7daad5055d9b6b8d1b75f0a..7e4c3131489797c6f3dc976bf0a4ae135c1af67a 100644
--- a/src/main/java/org/olat/user/WebDAVPasswordController.java
+++ b/src/main/java/org/olat/user/WebDAVPasswordController.java
@@ -26,6 +26,7 @@ import org.olat.basesecurity.Authentication;
import org.olat.basesecurity.BaseSecurityManager;
import org.olat.basesecurity.BaseSecurityModule;
import org.olat.core.commons.modules.bc.FolderManager;
+import org.olat.core.commons.services.webdav.manager.WebDAVAuthManager;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.form.flexible.FormItem;
import org.olat.core.gui.components.form.flexible.FormItemContainer;
@@ -41,7 +42,6 @@ import org.olat.core.gui.components.link.Link;
import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.WindowControl;
import org.olat.core.util.StringHelper;
-import org.olat.login.auth.WebDAVAuthManager;
/**
*
diff --git a/src/main/webapp-gae/WEB-INF/web.xml b/src/main/webapp-gae/WEB-INF/web.xml
index d6d855f3f40722da45591e9849eb50bcfd95243d..f06e27278c2a76267e7270fcca2f5aa49b05dc57 100644
--- a/src/main/webapp-gae/WEB-INF/web.xml
+++ b/src/main/webapp-gae/WEB-INF/web.xml
@@ -172,7 +172,7 @@
<!-- WebDAV servlet -->
<servlet>
<servlet-name>webdav</servlet-name>
- <servlet-class>org.olat.core.servlets.SecureWebdavServlet</servlet-class>
+ <servlet-class>org.olat.core.commons.services.webdav.SecureWebdavServlet</servlet-class>
<init-param>
<param-name>debug</param-name>
diff --git a/src/main/webapp-jbossas7/WEB-INF/web.xml b/src/main/webapp-jbossas7/WEB-INF/web.xml
index 833f408f7a501ddd6ae343727589de7d19fd8581..169ec723f4a28e54755e868c4cfda007c7682193 100644
--- a/src/main/webapp-jbossas7/WEB-INF/web.xml
+++ b/src/main/webapp-jbossas7/WEB-INF/web.xml
@@ -172,7 +172,7 @@
<!-- WebDAV servlet -->
<servlet>
<servlet-name>webdav</servlet-name>
- <servlet-class>org.olat.core.servlets.SecureWebdavServlet</servlet-class>
+ <servlet-class>org.olat.core.commons.services.webdav.SecureWebdavServlet</servlet-class>
<init-param>
<param-name>debug</param-name>
diff --git a/src/main/webapp-tomcat/WEB-INF/web.xml b/src/main/webapp-tomcat/WEB-INF/web.xml
index 9481d366053e03d0ccf097d10ccf6dd0915be61b..e4bffe349e0c6dde36cf7d83ec690e62b73d7cf4 100644
--- a/src/main/webapp-tomcat/WEB-INF/web.xml
+++ b/src/main/webapp-tomcat/WEB-INF/web.xml
@@ -157,7 +157,7 @@
<!-- WebDAV servlet -->
<servlet>
<servlet-name>webdav</servlet-name>
- <servlet-class>org.olat.core.servlets.SecureWebdavServlet</servlet-class>
+ <servlet-class>org.olat.core.commons.services.webdav.SecureWebdavServlet</servlet-class>
<init-param>
<param-name>debug</param-name>