From 3317babe6b3eb044d240f4c87d02562735e8e257 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 29 Dec 2015 07:50:31 +0100 Subject: [PATCH] renamed package org.cryptomator.crypto.fs to org.cryptomator.filesystem.crypto (same as all other org.cryptomator.filesystem.* filesystems) [ci skip] --- .../{crypto/fs => filesystem/crypto}/CryptoFile.java | 2 +- .../{crypto/fs => filesystem/crypto}/CryptoFileSystem.java | 2 +- .../{crypto/fs => filesystem/crypto}/CryptoFolder.java | 2 +- .../{crypto/fs => filesystem/crypto}/CryptoNode.java | 2 +- .../{crypto/fs => filesystem/crypto}/CryptoReadableFile.java | 2 +- .../{crypto/fs => filesystem/crypto}/CryptoWritableFile.java | 2 +- .../{crypto/fs => filesystem/crypto}/package-info.java | 2 +- .../{crypto/fs => filesystem/crypto}/CryptoFileSystemTest.java | 2 +- .../{crypto/fs => filesystem/crypto}/DirectoryPrinter.java | 2 +- .../crypto}/EncryptAndShortenIntegrationTest.java | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) rename main/filesystem-crypto/src/main/java/org/cryptomator/{crypto/fs => filesystem/crypto}/CryptoFile.java (97%) rename main/filesystem-crypto/src/main/java/org/cryptomator/{crypto/fs => filesystem/crypto}/CryptoFileSystem.java (98%) rename main/filesystem-crypto/src/main/java/org/cryptomator/{crypto/fs => filesystem/crypto}/CryptoFolder.java (99%) rename main/filesystem-crypto/src/main/java/org/cryptomator/{crypto/fs => filesystem/crypto}/CryptoNode.java (97%) rename main/filesystem-crypto/src/main/java/org/cryptomator/{crypto/fs => filesystem/crypto}/CryptoReadableFile.java (98%) rename main/filesystem-crypto/src/main/java/org/cryptomator/{crypto/fs => filesystem/crypto}/CryptoWritableFile.java (98%) rename main/filesystem-crypto/src/main/java/org/cryptomator/{crypto/fs => filesystem/crypto}/package-info.java (95%) rename main/filesystem-crypto/src/test/java/org/cryptomator/{crypto/fs => filesystem/crypto}/CryptoFileSystemTest.java (99%) rename main/filesystem-crypto/src/test/java/org/cryptomator/{crypto/fs => filesystem/crypto}/DirectoryPrinter.java (96%) rename main/filesystem-crypto/src/test/java/org/cryptomator/{crypto/fs => filesystem/crypto}/EncryptAndShortenIntegrationTest.java (98%) diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoFile.java b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoFile.java similarity index 97% rename from main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoFile.java rename to main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoFile.java index 88f38070d..9c60ffeb8 100644 --- a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoFile.java +++ b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoFile.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.crypto.fs; +package org.cryptomator.filesystem.crypto; import java.io.UncheckedIOException; import java.time.Instant; diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoFileSystem.java b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoFileSystem.java similarity index 98% rename from main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoFileSystem.java rename to main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoFileSystem.java index a9f771954..6482505b6 100644 --- a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoFileSystem.java +++ b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoFileSystem.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.crypto.fs; +package org.cryptomator.filesystem.crypto; import java.nio.ByteBuffer; import java.util.Optional; diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoFolder.java b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoFolder.java similarity index 99% rename from main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoFolder.java rename to main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoFolder.java index f8f39124a..0ab451682 100644 --- a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoFolder.java +++ b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoFolder.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.crypto.fs; +package org.cryptomator.filesystem.crypto; import java.nio.ByteBuffer; import java.time.Instant; diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoNode.java b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoNode.java similarity index 97% rename from main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoNode.java rename to main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoNode.java index ea0a6a348..1f6777c2d 100644 --- a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoNode.java +++ b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoNode.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.crypto.fs; +package org.cryptomator.filesystem.crypto; import java.util.Optional; diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoReadableFile.java b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoReadableFile.java similarity index 98% rename from main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoReadableFile.java rename to main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoReadableFile.java index 20e78cf7f..f488b4878 100644 --- a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoReadableFile.java +++ b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoReadableFile.java @@ -1,4 +1,4 @@ -package org.cryptomator.crypto.fs; +package org.cryptomator.filesystem.crypto; import java.io.UncheckedIOException; import java.nio.ByteBuffer; diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoWritableFile.java b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoWritableFile.java similarity index 98% rename from main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoWritableFile.java rename to main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoWritableFile.java index da238cb94..5c49402e6 100644 --- a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoWritableFile.java +++ b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoWritableFile.java @@ -1,4 +1,4 @@ -package org.cryptomator.crypto.fs; +package org.cryptomator.filesystem.crypto; import java.io.UncheckedIOException; import java.nio.ByteBuffer; diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/package-info.java b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/package-info.java similarity index 95% rename from main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/package-info.java rename to main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/package-info.java index e7027fbb1..e97b4032f 100644 --- a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/package-info.java +++ b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/package-info.java @@ -11,4 +11,4 @@ * While the implementation in this package dictates the Vault directory layout, no encryption code can be found here. * All cryptographic operations are delegated to the {@link org.cryptomator.crypto.engine CryptoEngine}. */ -package org.cryptomator.crypto.fs; \ No newline at end of file +package org.cryptomator.filesystem.crypto; \ No newline at end of file diff --git a/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/fs/CryptoFileSystemTest.java b/main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/crypto/CryptoFileSystemTest.java similarity index 99% rename from main/filesystem-crypto/src/test/java/org/cryptomator/crypto/fs/CryptoFileSystemTest.java rename to main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/crypto/CryptoFileSystemTest.java index aa31362db..119240359 100644 --- a/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/fs/CryptoFileSystemTest.java +++ b/main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/crypto/CryptoFileSystemTest.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.crypto.fs; +package org.cryptomator.filesystem.crypto; import static org.cryptomator.filesystem.FileSystemVisitor.fileSystemVisitor; diff --git a/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/fs/DirectoryPrinter.java b/main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/crypto/DirectoryPrinter.java similarity index 96% rename from main/filesystem-crypto/src/test/java/org/cryptomator/crypto/fs/DirectoryPrinter.java rename to main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/crypto/DirectoryPrinter.java index 39c7dbbed..53e6b6c9b 100644 --- a/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/fs/DirectoryPrinter.java +++ b/main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/crypto/DirectoryPrinter.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.crypto.fs; +package org.cryptomator.filesystem.crypto; import static org.cryptomator.filesystem.FileSystemVisitor.fileSystemVisitor; diff --git a/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/fs/EncryptAndShortenIntegrationTest.java b/main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/crypto/EncryptAndShortenIntegrationTest.java similarity index 98% rename from main/filesystem-crypto/src/test/java/org/cryptomator/crypto/fs/EncryptAndShortenIntegrationTest.java rename to main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/crypto/EncryptAndShortenIntegrationTest.java index ddee2cda6..8bc2c38f8 100644 --- a/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/fs/EncryptAndShortenIntegrationTest.java +++ b/main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/crypto/EncryptAndShortenIntegrationTest.java @@ -1,4 +1,4 @@ -package org.cryptomator.crypto.fs; +package org.cryptomator.filesystem.crypto; import static org.cryptomator.filesystem.FileSystemVisitor.fileSystemVisitor;