Skip to content

Commit

Permalink
renamed filesystem layer maven modules
Browse files Browse the repository at this point in the history
  • Loading branch information
Sebastian Stenzel committed Dec 17, 2015
1 parent 25eed3d commit b22ac71
Show file tree
Hide file tree
Showing 40 changed files with 43 additions and 19 deletions.
2 changes: 1 addition & 1 deletion main/filesystem-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions main/crypto-layer/pom.xml → main/filesystem-crypto/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -29,7 +29,7 @@
</dependency>
<dependency>
<groupId>org.cryptomator</groupId>
<artifactId>shortening-layer</artifactId>
<artifactId>filesystem-nameshortening</artifactId>
</dependency>

<!-- Crypto -->
Expand Down
2 changes: 1 addition & 1 deletion main/filesystem-inmemory/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
22 changes: 22 additions & 0 deletions main/filesystem-inmemory/src/test/resources/log4j2.xml
Original file line number Diff line number Diff line change
@@ -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>
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
18 changes: 10 additions & 8 deletions main/filesystem-nio/pom.xml
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
<?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>
<artifactId>main</artifactId>
<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>
Expand All @@ -29,7 +33,7 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
Expand All @@ -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>
8 changes: 4 additions & 4 deletions main/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit b22ac71

Please sign in to comment.