From bf5988f5fe08e013e4d22f65bea4a7a215d1b39b Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Fri, 12 Feb 2016 13:01:03 +0100 Subject: [PATCH] renamed packages --- .../webdav/WebDavServletContextFactory.java | 14 +++++++------- .../webdav/filters/AcceptRangeFilter.java | 2 +- .../{ => frontend}/webdav/filters/HttpFilter.java | 2 +- .../filters/MacChunkedPutCompatibilityFilter.java | 2 +- .../webdav/filters/MkcolComplianceFilter.java | 2 +- .../webdav/filters/UriNormalizationFilter.java | 4 ++-- .../webdav/jackrabbitservlet/DavFile.java | 2 +- .../webdav/jackrabbitservlet/DavFolder.java | 2 +- .../webdav/jackrabbitservlet/DavNode.java | 2 +- .../webdav/jackrabbitservlet/DavSessionImpl.java | 2 +- .../jackrabbitservlet/DavSessionProviderImpl.java | 2 +- .../jackrabbitservlet/ExclusiveSharedLock.java | 2 +- .../ExclusiveSharedLockManager.java | 2 +- .../FilesystemResourceFactory.java | 2 +- .../jackrabbitservlet/UncheckedDavException.java | 2 +- .../webdav/jackrabbitservlet/WebDavServlet.java | 2 +- .../frontend/webdav/InMemoryWebDavServer.java | 2 +- .../frontend/webdav/NioWebDavServer.java | 2 +- .../webdav/filters/LoggingHttpFilter.java | 3 ++- .../MacChunkedPutCompatibilityFilterTest.java | 3 ++- .../filters/RecordingHttpServletRequest.java | 2 +- .../filters/RecordingHttpServletResponse.java | 2 +- .../filters/RecordingServletInputStream.java | 2 +- .../filters/RecordingServletOutputStream.java | 2 +- .../webdav/filters/UriNormalizationFilterTest.java | 7 ++++--- 25 files changed, 37 insertions(+), 34 deletions(-) rename main/frontend-webdav/src/main/java/org/cryptomator/{ => frontend}/webdav/filters/AcceptRangeFilter.java (96%) rename main/frontend-webdav/src/main/java/org/cryptomator/{ => frontend}/webdav/filters/HttpFilter.java (96%) rename main/frontend-webdav/src/main/java/org/cryptomator/{ => frontend}/webdav/filters/MacChunkedPutCompatibilityFilter.java (98%) rename main/frontend-webdav/src/main/java/org/cryptomator/{ => frontend}/webdav/filters/MkcolComplianceFilter.java (97%) rename main/frontend-webdav/src/main/java/org/cryptomator/{ => frontend}/webdav/filters/UriNormalizationFilter.java (97%) rename main/frontend-webdav/src/main/java/org/cryptomator/{ => frontend}/webdav/jackrabbitservlet/DavFile.java (98%) rename main/frontend-webdav/src/main/java/org/cryptomator/{ => frontend}/webdav/jackrabbitservlet/DavFolder.java (99%) rename main/frontend-webdav/src/main/java/org/cryptomator/{ => frontend}/webdav/jackrabbitservlet/DavNode.java (99%) rename main/frontend-webdav/src/main/java/org/cryptomator/{ => frontend}/webdav/jackrabbitservlet/DavSessionImpl.java (94%) rename main/frontend-webdav/src/main/java/org/cryptomator/{ => frontend}/webdav/jackrabbitservlet/DavSessionProviderImpl.java (95%) rename main/frontend-webdav/src/main/java/org/cryptomator/{ => frontend}/webdav/jackrabbitservlet/ExclusiveSharedLock.java (97%) rename main/frontend-webdav/src/main/java/org/cryptomator/{ => frontend}/webdav/jackrabbitservlet/ExclusiveSharedLockManager.java (99%) rename main/frontend-webdav/src/main/java/org/cryptomator/{ => frontend}/webdav/jackrabbitservlet/FilesystemResourceFactory.java (97%) rename main/frontend-webdav/src/main/java/org/cryptomator/{ => frontend}/webdav/jackrabbitservlet/UncheckedDavException.java (89%) rename main/frontend-webdav/src/main/java/org/cryptomator/{ => frontend}/webdav/jackrabbitservlet/WebDavServlet.java (98%) rename main/frontend-webdav/src/test/java/org/cryptomator/{ => frontend}/webdav/filters/LoggingHttpFilter.java (98%) rename main/frontend-webdav/src/test/java/org/cryptomator/{ => frontend}/webdav/filters/MacChunkedPutCompatibilityFilterTest.java (97%) rename main/frontend-webdav/src/test/java/org/cryptomator/{ => frontend}/webdav/filters/RecordingHttpServletRequest.java (95%) rename main/frontend-webdav/src/test/java/org/cryptomator/{ => frontend}/webdav/filters/RecordingHttpServletResponse.java (95%) rename main/frontend-webdav/src/test/java/org/cryptomator/{ => frontend}/webdav/filters/RecordingServletInputStream.java (97%) rename main/frontend-webdav/src/test/java/org/cryptomator/{ => frontend}/webdav/filters/RecordingServletOutputStream.java (97%) rename main/frontend-webdav/src/test/java/org/cryptomator/{ => frontend}/webdav/filters/UriNormalizationFilterTest.java (96%) diff --git a/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/WebDavServletContextFactory.java b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/WebDavServletContextFactory.java index 2ad16d7bb..8021556da 100644 --- a/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/WebDavServletContextFactory.java +++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/WebDavServletContextFactory.java @@ -18,13 +18,13 @@ import javax.servlet.DispatcherType; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.SystemUtils; import org.cryptomator.filesystem.Folder; -import org.cryptomator.webdav.filters.AcceptRangeFilter; -import org.cryptomator.webdav.filters.MacChunkedPutCompatibilityFilter; -import org.cryptomator.webdav.filters.MkcolComplianceFilter; -import org.cryptomator.webdav.filters.UriNormalizationFilter; -import org.cryptomator.webdav.filters.UriNormalizationFilter.ResourceTypeChecker; -import org.cryptomator.webdav.filters.UriNormalizationFilter.ResourceTypeChecker.ResourceType; -import org.cryptomator.webdav.jackrabbitservlet.WebDavServlet; +import org.cryptomator.frontend.webdav.filters.AcceptRangeFilter; +import org.cryptomator.frontend.webdav.filters.MacChunkedPutCompatibilityFilter; +import org.cryptomator.frontend.webdav.filters.MkcolComplianceFilter; +import org.cryptomator.frontend.webdav.filters.UriNormalizationFilter; +import org.cryptomator.frontend.webdav.filters.UriNormalizationFilter.ResourceTypeChecker; +import org.cryptomator.frontend.webdav.filters.UriNormalizationFilter.ResourceTypeChecker.ResourceType; +import org.cryptomator.frontend.webdav.jackrabbitservlet.WebDavServlet; import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; diff --git a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/filters/AcceptRangeFilter.java b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/filters/AcceptRangeFilter.java similarity index 96% rename from main/frontend-webdav/src/main/java/org/cryptomator/webdav/filters/AcceptRangeFilter.java rename to main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/filters/AcceptRangeFilter.java index e9162073f..4c200dd79 100644 --- a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/filters/AcceptRangeFilter.java +++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/filters/AcceptRangeFilter.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.webdav.filters; +package org.cryptomator.frontend.webdav.filters; import java.io.IOException; diff --git a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/filters/HttpFilter.java b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/filters/HttpFilter.java similarity index 96% rename from main/frontend-webdav/src/main/java/org/cryptomator/webdav/filters/HttpFilter.java rename to main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/filters/HttpFilter.java index dcbaf0e0e..9c35a669c 100644 --- a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/filters/HttpFilter.java +++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/filters/HttpFilter.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.webdav.filters; +package org.cryptomator.frontend.webdav.filters; import java.io.IOException; diff --git a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/filters/MacChunkedPutCompatibilityFilter.java b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/filters/MacChunkedPutCompatibilityFilter.java similarity index 98% rename from main/frontend-webdav/src/main/java/org/cryptomator/webdav/filters/MacChunkedPutCompatibilityFilter.java rename to main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/filters/MacChunkedPutCompatibilityFilter.java index 56db66551..144502683 100644 --- a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/filters/MacChunkedPutCompatibilityFilter.java +++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/filters/MacChunkedPutCompatibilityFilter.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.webdav.filters; +package org.cryptomator.frontend.webdav.filters; import java.io.IOException; diff --git a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/filters/MkcolComplianceFilter.java b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/filters/MkcolComplianceFilter.java similarity index 97% rename from main/frontend-webdav/src/main/java/org/cryptomator/webdav/filters/MkcolComplianceFilter.java rename to main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/filters/MkcolComplianceFilter.java index 59dd6f830..2f0116041 100644 --- a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/filters/MkcolComplianceFilter.java +++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/filters/MkcolComplianceFilter.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.webdav.filters; +package org.cryptomator.frontend.webdav.filters; import java.io.IOException; diff --git a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/filters/UriNormalizationFilter.java b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/filters/UriNormalizationFilter.java similarity index 97% rename from main/frontend-webdav/src/main/java/org/cryptomator/webdav/filters/UriNormalizationFilter.java rename to main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/filters/UriNormalizationFilter.java index 8e6c8e028..a944bfa0f 100644 --- a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/filters/UriNormalizationFilter.java +++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/filters/UriNormalizationFilter.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.webdav.filters; +package org.cryptomator.frontend.webdav.filters; import java.io.IOException; import java.net.URI; @@ -20,7 +20,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; -import org.cryptomator.webdav.filters.UriNormalizationFilter.ResourceTypeChecker.ResourceType; +import org.cryptomator.frontend.webdav.filters.UriNormalizationFilter.ResourceTypeChecker.ResourceType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/DavFile.java b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFile.java similarity index 98% rename from main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/DavFile.java rename to main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFile.java index 785ad48ec..f431ba335 100644 --- a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/DavFile.java +++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFile.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.webdav.jackrabbitservlet; +package org.cryptomator.frontend.webdav.jackrabbitservlet; import java.io.IOException; import java.nio.channels.Channels; diff --git a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/DavFolder.java b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFolder.java similarity index 99% rename from main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/DavFolder.java rename to main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFolder.java index 0534606bb..f22ca07f5 100644 --- a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/DavFolder.java +++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFolder.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.webdav.jackrabbitservlet; +package org.cryptomator.frontend.webdav.jackrabbitservlet; import java.io.IOException; import java.io.InputStream; diff --git a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/DavNode.java b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavNode.java similarity index 99% rename from main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/DavNode.java rename to main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavNode.java index 240810f03..354edb6f8 100644 --- a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/DavNode.java +++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavNode.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.webdav.jackrabbitservlet; +package org.cryptomator.frontend.webdav.jackrabbitservlet; import java.io.UncheckedIOException; import java.time.Instant; diff --git a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/DavSessionImpl.java b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavSessionImpl.java similarity index 94% rename from main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/DavSessionImpl.java rename to main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavSessionImpl.java index 3f4592a4b..356a84794 100644 --- a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/DavSessionImpl.java +++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavSessionImpl.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation ******************************************************************************/ -package org.cryptomator.webdav.jackrabbitservlet; +package org.cryptomator.frontend.webdav.jackrabbitservlet; import java.util.HashSet; diff --git a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/DavSessionProviderImpl.java b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavSessionProviderImpl.java similarity index 95% rename from main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/DavSessionProviderImpl.java rename to main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavSessionProviderImpl.java index a999ee6d7..7f626ca1a 100644 --- a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/DavSessionProviderImpl.java +++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavSessionProviderImpl.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation ******************************************************************************/ -package org.cryptomator.webdav.jackrabbitservlet; +package org.cryptomator.frontend.webdav.jackrabbitservlet; import org.apache.jackrabbit.webdav.DavException; import org.apache.jackrabbit.webdav.DavSession; diff --git a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/ExclusiveSharedLock.java b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/ExclusiveSharedLock.java similarity index 97% rename from main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/ExclusiveSharedLock.java rename to main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/ExclusiveSharedLock.java index f0a252f37..5f52a67e5 100644 --- a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/ExclusiveSharedLock.java +++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/ExclusiveSharedLock.java @@ -1,4 +1,4 @@ -package org.cryptomator.webdav.jackrabbitservlet; +package org.cryptomator.frontend.webdav.jackrabbitservlet; import org.apache.jackrabbit.webdav.DavConstants; import org.apache.jackrabbit.webdav.lock.AbstractActiveLock; diff --git a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/ExclusiveSharedLockManager.java b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/ExclusiveSharedLockManager.java similarity index 99% rename from main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/ExclusiveSharedLockManager.java rename to main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/ExclusiveSharedLockManager.java index 828820ab5..ae460070d 100644 --- a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/ExclusiveSharedLockManager.java +++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/ExclusiveSharedLockManager.java @@ -1,4 +1,4 @@ -package org.cryptomator.webdav.jackrabbitservlet; +package org.cryptomator.frontend.webdav.jackrabbitservlet; import java.util.Collection; import java.util.Collections; diff --git a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/FilesystemResourceFactory.java b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/FilesystemResourceFactory.java similarity index 97% rename from main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/FilesystemResourceFactory.java rename to main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/FilesystemResourceFactory.java index fbc08dad7..accca7915 100644 --- a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/FilesystemResourceFactory.java +++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/FilesystemResourceFactory.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.webdav.jackrabbitservlet; +package org.cryptomator.frontend.webdav.jackrabbitservlet; import org.apache.jackrabbit.webdav.DavException; import org.apache.jackrabbit.webdav.DavResource; diff --git a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/UncheckedDavException.java b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/UncheckedDavException.java similarity index 89% rename from main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/UncheckedDavException.java rename to main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/UncheckedDavException.java index 23cf01f16..6eb814362 100644 --- a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/UncheckedDavException.java +++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/UncheckedDavException.java @@ -1,4 +1,4 @@ -package org.cryptomator.webdav.jackrabbitservlet; +package org.cryptomator.frontend.webdav.jackrabbitservlet; import org.apache.jackrabbit.webdav.DavException; diff --git a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/WebDavServlet.java b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/WebDavServlet.java similarity index 98% rename from main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/WebDavServlet.java rename to main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/WebDavServlet.java index 0767d5de6..41ba9c3f7 100644 --- a/main/frontend-webdav/src/main/java/org/cryptomator/webdav/jackrabbitservlet/WebDavServlet.java +++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/WebDavServlet.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.webdav.jackrabbitservlet; +package org.cryptomator.frontend.webdav.jackrabbitservlet; import java.io.IOException; import java.net.URI; diff --git a/main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/InMemoryWebDavServer.java b/main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/InMemoryWebDavServer.java index e8c197868..fb1524dad 100644 --- a/main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/InMemoryWebDavServer.java +++ b/main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/InMemoryWebDavServer.java @@ -17,7 +17,7 @@ import javax.servlet.DispatcherType; import org.cryptomator.filesystem.FileSystem; import org.cryptomator.filesystem.WritableFile; import org.cryptomator.filesystem.inmem.InMemoryFileSystem; -import org.cryptomator.webdav.filters.LoggingHttpFilter; +import org.cryptomator.frontend.webdav.filters.LoggingHttpFilter; import org.eclipse.jetty.servlet.ServletContextHandler; public class InMemoryWebDavServer { diff --git a/main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/NioWebDavServer.java b/main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/NioWebDavServer.java index 95ea25713..6c45b22fd 100644 --- a/main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/NioWebDavServer.java +++ b/main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/NioWebDavServer.java @@ -24,7 +24,7 @@ import javax.servlet.DispatcherType; import org.cryptomator.filesystem.FileSystem; import org.cryptomator.filesystem.nio.NioFileSystem; -import org.cryptomator.webdav.filters.LoggingHttpFilter; +import org.cryptomator.frontend.webdav.filters.LoggingHttpFilter; import org.eclipse.jetty.servlet.ServletContextHandler; public class NioWebDavServer { diff --git a/main/frontend-webdav/src/test/java/org/cryptomator/webdav/filters/LoggingHttpFilter.java b/main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/filters/LoggingHttpFilter.java similarity index 98% rename from main/frontend-webdav/src/test/java/org/cryptomator/webdav/filters/LoggingHttpFilter.java rename to main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/filters/LoggingHttpFilter.java index f4f4893ed..d9443d796 100644 --- a/main/frontend-webdav/src/test/java/org/cryptomator/webdav/filters/LoggingHttpFilter.java +++ b/main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/filters/LoggingHttpFilter.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.webdav.filters; +package org.cryptomator.frontend.webdav.filters; import static java.lang.String.format; import static java.util.Arrays.asList; @@ -24,6 +24,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.cryptomator.frontend.webdav.filters.HttpFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/main/frontend-webdav/src/test/java/org/cryptomator/webdav/filters/MacChunkedPutCompatibilityFilterTest.java b/main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/filters/MacChunkedPutCompatibilityFilterTest.java similarity index 97% rename from main/frontend-webdav/src/test/java/org/cryptomator/webdav/filters/MacChunkedPutCompatibilityFilterTest.java rename to main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/filters/MacChunkedPutCompatibilityFilterTest.java index de9e79902..b7de53243 100644 --- a/main/frontend-webdav/src/test/java/org/cryptomator/webdav/filters/MacChunkedPutCompatibilityFilterTest.java +++ b/main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/filters/MacChunkedPutCompatibilityFilterTest.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.webdav.filters; +package org.cryptomator.frontend.webdav.filters; import java.io.IOException; @@ -17,6 +17,7 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.cryptomator.frontend.webdav.filters.MacChunkedPutCompatibilityFilter; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/main/frontend-webdav/src/test/java/org/cryptomator/webdav/filters/RecordingHttpServletRequest.java b/main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/filters/RecordingHttpServletRequest.java similarity index 95% rename from main/frontend-webdav/src/test/java/org/cryptomator/webdav/filters/RecordingHttpServletRequest.java rename to main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/filters/RecordingHttpServletRequest.java index a853414e1..271395180 100644 --- a/main/frontend-webdav/src/test/java/org/cryptomator/webdav/filters/RecordingHttpServletRequest.java +++ b/main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/filters/RecordingHttpServletRequest.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.webdav.filters; +package org.cryptomator.frontend.webdav.filters; import java.io.IOException; diff --git a/main/frontend-webdav/src/test/java/org/cryptomator/webdav/filters/RecordingHttpServletResponse.java b/main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/filters/RecordingHttpServletResponse.java similarity index 95% rename from main/frontend-webdav/src/test/java/org/cryptomator/webdav/filters/RecordingHttpServletResponse.java rename to main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/filters/RecordingHttpServletResponse.java index ee5b336b1..6cc264884 100644 --- a/main/frontend-webdav/src/test/java/org/cryptomator/webdav/filters/RecordingHttpServletResponse.java +++ b/main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/filters/RecordingHttpServletResponse.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.webdav.filters; +package org.cryptomator.frontend.webdav.filters; import java.io.IOException; diff --git a/main/frontend-webdav/src/test/java/org/cryptomator/webdav/filters/RecordingServletInputStream.java b/main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/filters/RecordingServletInputStream.java similarity index 97% rename from main/frontend-webdav/src/test/java/org/cryptomator/webdav/filters/RecordingServletInputStream.java rename to main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/filters/RecordingServletInputStream.java index 060e90f78..791d80eea 100644 --- a/main/frontend-webdav/src/test/java/org/cryptomator/webdav/filters/RecordingServletInputStream.java +++ b/main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/filters/RecordingServletInputStream.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.webdav.filters; +package org.cryptomator.frontend.webdav.filters; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/main/frontend-webdav/src/test/java/org/cryptomator/webdav/filters/RecordingServletOutputStream.java b/main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/filters/RecordingServletOutputStream.java similarity index 97% rename from main/frontend-webdav/src/test/java/org/cryptomator/webdav/filters/RecordingServletOutputStream.java rename to main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/filters/RecordingServletOutputStream.java index db9303162..378384dcf 100644 --- a/main/frontend-webdav/src/test/java/org/cryptomator/webdav/filters/RecordingServletOutputStream.java +++ b/main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/filters/RecordingServletOutputStream.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.webdav.filters; +package org.cryptomator.frontend.webdav.filters; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/main/frontend-webdav/src/test/java/org/cryptomator/webdav/filters/UriNormalizationFilterTest.java b/main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/filters/UriNormalizationFilterTest.java similarity index 96% rename from main/frontend-webdav/src/test/java/org/cryptomator/webdav/filters/UriNormalizationFilterTest.java rename to main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/filters/UriNormalizationFilterTest.java index d53bf9ab6..583839432 100644 --- a/main/frontend-webdav/src/test/java/org/cryptomator/webdav/filters/UriNormalizationFilterTest.java +++ b/main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/filters/UriNormalizationFilterTest.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.webdav.filters; +package org.cryptomator.frontend.webdav.filters; import java.io.IOException; @@ -16,8 +16,9 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cryptomator.webdav.filters.UriNormalizationFilter.ResourceTypeChecker; -import org.cryptomator.webdav.filters.UriNormalizationFilter.ResourceTypeChecker.ResourceType; +import org.cryptomator.frontend.webdav.filters.UriNormalizationFilter; +import org.cryptomator.frontend.webdav.filters.UriNormalizationFilter.ResourceTypeChecker; +import org.cryptomator.frontend.webdav.filters.UriNormalizationFilter.ResourceTypeChecker.ResourceType; import org.junit.Assert; import org.junit.Before; import org.junit.Test;