فهرست منبع

renamed filesystem layer maven modules

Sebastian Stenzel 9 سال پیش
والد
کامیت
b22ac719f2
40فایلهای تغییر یافته به همراه43 افزوده شده و 19 حذف شده
  1. 1 1
      main/filesystem-api/pom.xml
  2. 0 0
      main/filesystem-crypto/.gitignore
  3. 3 3
      main/crypto-layer/pom.xml
  4. 0 0
      main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/CryptoException.java
  5. 0 0
      main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/Cryptor.java
  6. 0 0
      main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/FilenameCryptor.java
  7. 0 0
      main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/AesKeyWrap.java
  8. 0 0
      main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/CryptorImpl.java
  9. 0 0
      main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImpl.java
  10. 0 0
      main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/KeyFile.java
  11. 0 0
      main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/Scrypt.java
  12. 0 0
      main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/TheDestroyer.java
  13. 0 0
      main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/package-info.java
  14. 0 0
      main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoFile.java
  15. 0 0
      main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoFileSystem.java
  16. 0 0
      main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoFolder.java
  17. 0 0
      main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoNode.java
  18. 0 0
      main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/package-info.java
  19. 0 0
      main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/NoCryptor.java
  20. 0 0
      main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/NoFilenameCryptor.java
  21. 0 0
      main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/CryptorImplTest.java
  22. 0 0
      main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImplTest.java
  23. 0 0
      main/filesystem-crypto/src/test/java/org/cryptomator/crypto/fs/CryptoFileSystemTest.java
  24. 0 0
      main/filesystem-crypto/src/test/java/org/cryptomator/crypto/fs/DirectoryPrinter.java
  25. 0 0
      main/filesystem-crypto/src/test/java/org/cryptomator/crypto/fs/DirectoryWalker.java
  26. 0 0
      main/filesystem-crypto/src/test/java/org/cryptomator/crypto/fs/EncryptAndShortenIntegrationTest.java
  27. 0 0
      main/filesystem-crypto/src/test/resources/log4j2.xml
  28. 1 1
      main/filesystem-inmemory/pom.xml
  29. 22 0
      main/filesystem-inmemory/src/test/resources/log4j2.xml
  30. 0 0
      main/filesystem-nameshortening/.gitignore
  31. 2 2
      main/shortening-layer/pom.xml
  32. 0 0
      main/filesystem-nameshortening/src/main/java/org/cryptomator/shortening/FilenameShortener.java
  33. 0 0
      main/filesystem-nameshortening/src/main/java/org/cryptomator/shortening/ShorteningFile.java
  34. 0 0
      main/filesystem-nameshortening/src/main/java/org/cryptomator/shortening/ShorteningFileSystem.java
  35. 0 0
      main/filesystem-nameshortening/src/main/java/org/cryptomator/shortening/ShorteningFolder.java
  36. 0 0
      main/filesystem-nameshortening/src/main/java/org/cryptomator/shortening/ShorteningNode.java
  37. 0 0
      main/filesystem-nameshortening/src/main/java/org/cryptomator/shortening/package-info.java
  38. 0 0
      main/filesystem-nameshortening/src/test/java/org/cryptomator/shortening/ShorteningFileSystemTest.java
  39. 10 8
      main/filesystem-nio/pom.xml
  40. 4 4
      main/pom.xml

+ 1 - 1
main/filesystem-api/pom.xml

@@ -12,7 +12,7 @@
 		<version>0.11.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>filesystem-api</artifactId>
-	<name>Cryptomator filesystem API</name>
+	<name>Cryptomator filesystem: API</name>
 
 	<dependencies>
 		<!-- commons -->

main/crypto-layer/.gitignore → main/filesystem-crypto/.gitignore


+ 3 - 3
main/crypto-layer/pom.xml

@@ -14,8 +14,8 @@
 		<artifactId>main</artifactId>
 		<version>0.11.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>crypto-layer</artifactId>
-	<name>Cryptomator encrypted filesystem layer</name>
+	<artifactId>filesystem-crypto</artifactId>
+	<name>Cryptomator filesystem: Encryption layer</name>
 	
 	<properties>
 		<bouncycastle.version>1.51</bouncycastle.version>
@@ -29,7 +29,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.cryptomator</groupId>
-			<artifactId>shortening-layer</artifactId>
+			<artifactId>filesystem-nameshortening</artifactId>
 		</dependency>
 		
 		<!-- Crypto -->

main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/CryptoException.java → main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/CryptoException.java


main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/Cryptor.java → main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/Cryptor.java


main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/FilenameCryptor.java → main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/FilenameCryptor.java


main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/impl/AesKeyWrap.java → main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/AesKeyWrap.java


main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/impl/CryptorImpl.java → main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/CryptorImpl.java


main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImpl.java → main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImpl.java


main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/impl/KeyFile.java → main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/KeyFile.java


main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/impl/Scrypt.java → main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/Scrypt.java


main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/impl/TheDestroyer.java → main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/TheDestroyer.java


main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/package-info.java → main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/package-info.java


main/crypto-layer/src/main/java/org/cryptomator/crypto/fs/CryptoFile.java → main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoFile.java


main/crypto-layer/src/main/java/org/cryptomator/crypto/fs/CryptoFileSystem.java → main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoFileSystem.java


main/crypto-layer/src/main/java/org/cryptomator/crypto/fs/CryptoFolder.java → main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoFolder.java


main/crypto-layer/src/main/java/org/cryptomator/crypto/fs/CryptoNode.java → main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoNode.java


main/crypto-layer/src/main/java/org/cryptomator/crypto/fs/package-info.java → main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/package-info.java


main/crypto-layer/src/test/java/org/cryptomator/crypto/engine/NoCryptor.java → main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/NoCryptor.java


main/crypto-layer/src/test/java/org/cryptomator/crypto/engine/NoFilenameCryptor.java → main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/NoFilenameCryptor.java


main/crypto-layer/src/test/java/org/cryptomator/crypto/engine/impl/CryptorImplTest.java → main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/CryptorImplTest.java


main/crypto-layer/src/test/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImplTest.java → main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImplTest.java


main/crypto-layer/src/test/java/org/cryptomator/crypto/fs/CryptoFileSystemTest.java → main/filesystem-crypto/src/test/java/org/cryptomator/crypto/fs/CryptoFileSystemTest.java


main/crypto-layer/src/test/java/org/cryptomator/crypto/fs/DirectoryPrinter.java → main/filesystem-crypto/src/test/java/org/cryptomator/crypto/fs/DirectoryPrinter.java


main/crypto-layer/src/test/java/org/cryptomator/crypto/fs/DirectoryWalker.java → main/filesystem-crypto/src/test/java/org/cryptomator/crypto/fs/DirectoryWalker.java


main/crypto-layer/src/test/java/org/cryptomator/crypto/fs/EncryptAndShortenIntegrationTest.java → main/filesystem-crypto/src/test/java/org/cryptomator/crypto/fs/EncryptAndShortenIntegrationTest.java


main/crypto-layer/src/test/resources/log4j2.xml → main/filesystem-crypto/src/test/resources/log4j2.xml


+ 1 - 1
main/filesystem-inmemory/pom.xml

@@ -15,7 +15,7 @@
 		<version>0.11.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>filesystem-inmemory</artifactId>
-	<name>Cryptomator in-memory filesystem</name>
+	<name>Cryptomator filesystem: In-memory mock</name>
 
 	<dependencies>
 		<dependency>

+ 22 - 0
main/filesystem-inmemory/src/test/resources/log4j2.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Configuration status="WARN">
+
+	<Appenders>
+		<Console name="Console" target="SYSTEM_OUT">
+			<PatternLayout pattern="%16d %-5p [%c{1}:%L] %m%n" />
+			<ThresholdFilter level="WARN" onMatch="DENY" onMismatch="ACCEPT" />
+		</Console>
+		<Console name="StdErr" target="SYSTEM_ERR">
+			<PatternLayout pattern="%16d %-5p [%c{1}:%L] %m%n" />
+			<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY" />
+		</Console>
+	</Appenders>
+
+	<Loggers>
+		<Root level="DEBUG">
+			<AppenderRef ref="Console" />
+			<AppenderRef ref="StdErr" />
+		</Root>
+	</Loggers>
+
+</Configuration>

main/shortening-layer/.gitignore → main/filesystem-nameshortening/.gitignore


+ 2 - 2
main/shortening-layer/pom.xml

@@ -14,8 +14,8 @@
 		<artifactId>main</artifactId>
 		<version>0.11.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>shortening-layer</artifactId>
-	<name>Cryptomator name shortening filesystem layer</name>
+	<artifactId>filesystem-nameshortening</artifactId>
+	<name>Cryptomator filesystem: Name shortening layer</name>
 
 	<dependencies>
 		<dependency>

main/shortening-layer/src/main/java/org/cryptomator/shortening/FilenameShortener.java → main/filesystem-nameshortening/src/main/java/org/cryptomator/shortening/FilenameShortener.java


main/shortening-layer/src/main/java/org/cryptomator/shortening/ShorteningFile.java → main/filesystem-nameshortening/src/main/java/org/cryptomator/shortening/ShorteningFile.java


main/shortening-layer/src/main/java/org/cryptomator/shortening/ShorteningFileSystem.java → main/filesystem-nameshortening/src/main/java/org/cryptomator/shortening/ShorteningFileSystem.java


main/shortening-layer/src/main/java/org/cryptomator/shortening/ShorteningFolder.java → main/filesystem-nameshortening/src/main/java/org/cryptomator/shortening/ShorteningFolder.java


main/shortening-layer/src/main/java/org/cryptomator/shortening/ShorteningNode.java → main/filesystem-nameshortening/src/main/java/org/cryptomator/shortening/ShorteningNode.java


main/shortening-layer/src/main/java/org/cryptomator/shortening/package-info.java → main/filesystem-nameshortening/src/main/java/org/cryptomator/shortening/package-info.java


main/shortening-layer/src/test/java/org/cryptomator/shortening/ShorteningFileSystemTest.java → main/filesystem-nameshortening/src/test/java/org/cryptomator/shortening/ShorteningFileSystemTest.java


+ 10 - 8
main/filesystem-nio/pom.xml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2015 Markus Kreusch This file is licensed under the terms 
-	of the MIT license. See the LICENSE.txt file for more info. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<!--
+  Copyright (c) 2015 Markus Kreusch
+  This file is licensed under the terms of the MIT license.
+  See the LICENSE.txt file for more info.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.cryptomator</groupId>
@@ -10,13 +12,15 @@
 		<version>0.11.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>filesystem-nio</artifactId>
+	<name>Cryptomator filesystem: NIO-based physical layer</name>
+	<description>FileSystem implementation to access the real file system of an operating system</description>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.cryptomator</groupId>
 			<artifactId>filesystem-api</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
@@ -29,7 +33,7 @@
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-collections4</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
@@ -44,6 +48,4 @@
 			</plugin>
 		</plugins>
 	</build>
-	<description>FileSystem implementation to access the real file system of an operating system</description>
-	<name>Cryptomator NIO Filesystem</name>
 </project>

+ 4 - 4
main/pom.xml

@@ -66,12 +66,12 @@
 			</dependency>
 			<dependency>
 				<groupId>org.cryptomator</groupId>
-				<artifactId>shortening-layer</artifactId>
+				<artifactId>filesystem-nameshortening</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.cryptomator</groupId>
-				<artifactId>crypto-layer</artifactId>
+				<artifactId>filesystem-crypto</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			
@@ -216,12 +216,12 @@
 		<module>filesystem-api</module>
 		<module>filesystem-inmemory</module>
 		<module>filesystem-nio</module>
-		<module>crypto-layer</module>
+		<module>filesystem-nameshortening</module>
+		<module>filesystem-crypto</module>
 		<module>crypto-api</module>
 		<module>crypto-aes</module>
 		<module>core</module>
 		<module>ui</module>
-		<module>shortening-layer</module>
 	</modules>
 
 	<profiles>