renamed packages

cryptomator · Feb 12, 2016 · bf5988f · bf5988f
1 parent 3d24bc7
commit bf5988f
Show file tree

Hide file tree

Showing 25 changed files with 37 additions and 34 deletions.
diff --git a/...end-webdav/src/main/java/org/cryptomator/frontend/webdav/WebDavServletContextFactory.java b/...end-webdav/src/main/java/org/cryptomator/frontend/webdav/WebDavServletContextFactory.java
@@ -18,13 +18,13 @@
 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/...tor/webdav/filters/AcceptRangeFilter.java → ...end/webdav/filters/AcceptRangeFilter.java b/...tor/webdav/filters/AcceptRangeFilter.java → ...end/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/...ryptomator/webdav/filters/HttpFilter.java → ...r/frontend/webdav/filters/HttpFilter.java b/...ryptomator/webdav/filters/HttpFilter.java → ...r/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/...ers/MacChunkedPutCompatibilityFilter.java → ...ers/MacChunkedPutCompatibilityFilter.java b/...ers/MacChunkedPutCompatibilityFilter.java → ...ers/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/...webdav/filters/MkcolComplianceFilter.java → ...webdav/filters/MkcolComplianceFilter.java b/...webdav/filters/MkcolComplianceFilter.java → ...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/...ebdav/filters/UriNormalizationFilter.java → ...ebdav/filters/UriNormalizationFilter.java b/...ebdav/filters/UriNormalizationFilter.java → ...ebdav/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 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/...tor/webdav/jackrabbitservlet/DavFile.java → ...end/webdav/jackrabbitservlet/DavFile.java b/...tor/webdav/jackrabbitservlet/DavFile.java → ...end/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/...r/webdav/jackrabbitservlet/DavFolder.java → ...d/webdav/jackrabbitservlet/DavFolder.java b/...r/webdav/jackrabbitservlet/DavFolder.java → ...d/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/...tor/webdav/jackrabbitservlet/DavNode.java → ...end/webdav/jackrabbitservlet/DavNode.java b/...tor/webdav/jackrabbitservlet/DavNode.java → ...end/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/...dav/jackrabbitservlet/DavSessionImpl.java → ...dav/jackrabbitservlet/DavSessionImpl.java b/...dav/jackrabbitservlet/DavSessionImpl.java → ...dav/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/...rabbitservlet/DavSessionProviderImpl.java → ...rabbitservlet/DavSessionProviderImpl.java b/...rabbitservlet/DavSessionProviderImpl.java → ...rabbitservlet/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/...ackrabbitservlet/ExclusiveSharedLock.java → ...ackrabbitservlet/ExclusiveSharedLock.java b/...ackrabbitservlet/ExclusiveSharedLock.java → ...ackrabbitservlet/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/...itservlet/ExclusiveSharedLockManager.java → ...itservlet/ExclusiveSharedLockManager.java b/...itservlet/ExclusiveSharedLockManager.java → ...itservlet/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/...bitservlet/FilesystemResourceFactory.java → ...bitservlet/FilesystemResourceFactory.java b/...bitservlet/FilesystemResourceFactory.java → ...bitservlet/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/...krabbitservlet/UncheckedDavException.java → ...krabbitservlet/UncheckedDavException.java b/...krabbitservlet/UncheckedDavException.java → ...krabbitservlet/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/...bdav/jackrabbitservlet/WebDavServlet.java → ...bdav/jackrabbitservlet/WebDavServlet.java b/...bdav/jackrabbitservlet/WebDavServlet.java → ...bdav/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
@@ -17,7 +17,7 @@
 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
@@ -24,7 +24,7 @@
 
 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/...tor/webdav/filters/LoggingHttpFilter.java → ...end/webdav/filters/LoggingHttpFilter.java b/...tor/webdav/filters/LoggingHttpFilter.java → ...end/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.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/...MacChunkedPutCompatibilityFilterTest.java → ...MacChunkedPutCompatibilityFilterTest.java b/...MacChunkedPutCompatibilityFilterTest.java → ...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.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/.../filters/RecordingHttpServletRequest.java → .../filters/RecordingHttpServletRequest.java b/.../filters/RecordingHttpServletRequest.java → .../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/...filters/RecordingHttpServletResponse.java → ...filters/RecordingHttpServletResponse.java b/...filters/RecordingHttpServletResponse.java → ...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/.../filters/RecordingServletInputStream.java → .../filters/RecordingServletInputStream.java b/.../filters/RecordingServletInputStream.java → .../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/...filters/RecordingServletOutputStream.java → ...filters/RecordingServletOutputStream.java b/...filters/RecordingServletOutputStream.java → ...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/...v/filters/UriNormalizationFilterTest.java → ...v/filters/UriNormalizationFilterTest.java b/...v/filters/UriNormalizationFilterTest.java → ...v/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.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;