<mavenModuleSetBuild><action><cause><shortDescription>Started by upstream project "org.subshare" build number 110</shortDescription><upstreamBuild>110</upstreamBuild><upstreamProject>org.subshare</upstreamProject><upstreamUrl>job/org.subshare/</upstreamUrl></cause></action><action></action><action></action><action><moduleRecord><mainArtifact><artifactId>org.subshare</artifactId><canonicalName>org.subshare-0.9.0-SNAPSHOT.pom</canonicalName><fileName>pom.xml</fileName><groupId>org.subshare</groupId><md5sum>83ed006dee25a0763ed3fb5cf9bb4e24</md5sum><type>pom</type><version>0.9.0-SNAPSHOT</version></mainArtifact><parent><number>86</number><url>https://www.codewizards.co:443/jenkins/job/org.subshare.www/org.subshare$org.subshare/86/</url></parent><pomArtifact><artifactId>org.subshare</artifactId><canonicalName>org.subshare-0.9.0-SNAPSHOT.pom</canonicalName><fileName>pom.xml</fileName><groupId>org.subshare</groupId><md5sum>83ed006dee25a0763ed3fb5cf9bb4e24</md5sum><type>pom</type><version>0.9.0-SNAPSHOT</version></pomArtifact><url>https://www.codewizards.co:443/jenkins/job/org.subshare.www/org.subshare$org.subshare/86/mavenArtifacts/</url></moduleRecord><moduleRecord><mainArtifact><artifactId>org.subshare.parent</artifactId><canonicalName>org.subshare.parent-0.9.0-SNAPSHOT.pom</canonicalName><fileName>pom.xml</fileName><groupId>org.subshare</groupId><md5sum>8aeffcf7bbddec33529f6edb23e29149</md5sum><type>pom</type><version>0.9.0-SNAPSHOT</version></mainArtifact><parent><number>86</number><url>https://www.codewizards.co:443/jenkins/job/org.subshare.www/org.subshare$org.subshare.parent/86/</url></parent><pomArtifact><artifactId>org.subshare.parent</artifactId><canonicalName>org.subshare.parent-0.9.0-SNAPSHOT.pom</canonicalName><fileName>pom.xml</fileName><groupId>org.subshare</groupId><md5sum>8aeffcf7bbddec33529f6edb23e29149</md5sum><type>pom</type><version>0.9.0-SNAPSHOT</version></pomArtifact><url>https://www.codewizards.co:443/jenkins/job/org.subshare.www/org.subshare$org.subshare.parent/86/mavenArtifacts/</url></moduleRecord><moduleRecord><mainArtifact><artifactId>org.subshare.site.skin</artifactId><canonicalName>org.subshare.site.skin-0.9.0-SNAPSHOT.jar</canonicalName><fileName>org.subshare.site.skin-0.9.0-SNAPSHOT.jar</fileName><groupId>org.subshare</groupId><md5sum>fd604397d3b33c0523b758d893d0532b</md5sum><type>jar</type><version>0.9.0-SNAPSHOT</version></mainArtifact><parent><number>86</number><url>https://www.codewizards.co:443/jenkins/job/org.subshare.www/org.subshare$org.subshare.site.skin/86/</url></parent><pomArtifact><artifactId>org.subshare.site.skin</artifactId><canonicalName>org.subshare.site.skin-0.9.0-SNAPSHOT.pom</canonicalName><fileName>pom.xml</fileName><groupId>org.subshare</groupId><md5sum>e481f734a6be29d88af96651a3c42899</md5sum><type>pom</type><version>0.9.0-SNAPSHOT</version></pomArtifact><url>https://www.codewizards.co:443/jenkins/job/org.subshare.www/org.subshare$org.subshare.site.skin/86/mavenArtifacts/</url></moduleRecord></action><action></action><building>false</building><duration>63024</duration><estimatedDuration>68737</estimatedDuration><fullDisplayName>org.subshare.www #86</fullDisplayName><id>2016-06-10_19-20-20</id><keepLog>false</keepLog><number>86</number><result>SUCCESS</result><timestamp>1465579220000</timestamp><url>https://www.codewizards.co:443/jenkins/job/org.subshare.www/86/</url><builtOn></builtOn><changeSet><item><affectedPath>/trunk/org.subshare/build.gradle</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/Cryptree.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/dto/CollisionDto.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/dto/CollisionPrivateDto.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/dto/PlainHistoCryptoRepoFileDto.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/dto/jaxb/CloudStoreJaxbContextProviderImpl.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/dto/jaxb/CollisionPrivateDtoIo.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/repo/histo/HistoExporterImpl.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/repo/local/CollisionFilter.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/repo/local/CollisionPrivateFilter.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/repo/local/PlainHistoCryptoRepoFileFilter.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/repo/local/SsLocalRepoMetaData.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/filetree/repoaware/CollisionDtoSet.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/filetree/repoaware/CollisionPrivateDtoSet.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/filetree/repoaware/RepoAwareFileTreePane.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/histo/HistoCryptoRepoFileTreeItem.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/localrepo/directory/LocalRepoDirectoryPane.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/maintree/LocalRepoDirectoryMainTreeItem.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/CollisionDtoWithPlainHistoCryptoRepoFileDto.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/ResolveCollisionWizard.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/collision/CollisionData.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/collision/CollisionPane.fxgraph</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/collision/CollisionPane.fxml</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/collision/CollisionPane.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/CryptreeContext.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/CryptreeImpl.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/CryptreeNode.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/SsLocalRepoMetaDataImpl.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/dto/CollisionDtoConverter.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/dto/CollisionPrivateDtoConverter.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/CloudStorePersistenceCapableClassesProviderImpl.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/Collision.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/CollisionDao.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/CollisionPrivate.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/CollisionPrivateDao.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/HistoFrameDao.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/PlainHistoCryptoRepoFile.java</affectedPath><affectedPath>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/SsRemoteRepositoryDao.java</affectedPath><author><absoluteUrl>https://www.codewizards.co:443/jenkins/user/mn</absoluteUrl><fullName>Marco Nguitragool-Schulze</fullName></author><commitId>435</commitId><timestamp>1465576786420</timestamp><date>2016-06-10T16:39:46.420750Z</date><msg>* Refactored Collision[Dto] and introduced the encrypted counter-part CollisionPrivate[Dto].
* Made it possible to not only [un]resolve a collision, but also to set a (secret) comment.</msg><path><editType>edit</editType><file>/trunk/org.subshare/build.gradle</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/Cryptree.java</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/dto/CollisionDto.java</file></path><path><editType>add</editType><file>/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/dto/CollisionPrivateDto.java</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/dto/PlainHistoCryptoRepoFileDto.java</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/dto/jaxb/CloudStoreJaxbContextProviderImpl.java</file></path><path><editType>add</editType><file>/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/dto/jaxb/CollisionPrivateDtoIo.java</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/repo/histo/HistoExporterImpl.java</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/repo/local/CollisionFilter.java</file></path><path><editType>add</editType><file>/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/repo/local/CollisionPrivateFilter.java</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/repo/local/PlainHistoCryptoRepoFileFilter.java</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/repo/local/SsLocalRepoMetaData.java</file></path><path><editType>delete</editType><file>/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/filetree/repoaware/CollisionDtoSet.java</file></path><path><editType>add</editType><file>/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/filetree/repoaware/CollisionPrivateDtoSet.java</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/filetree/repoaware/RepoAwareFileTreePane.java</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/histo/HistoCryptoRepoFileTreeItem.java</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/localrepo/directory/LocalRepoDirectoryPane.java</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/maintree/LocalRepoDirectoryMainTreeItem.java</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/CollisionDtoWithPlainHistoCryptoRepoFileDto.java</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/ResolveCollisionWizard.java</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/collision/CollisionData.java</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/collision/CollisionPane.fxgraph</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/collision/CollisionPane.fxml</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/collision/CollisionPane.java</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/CryptreeContext.java</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/CryptreeImpl.java</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/CryptreeNode.java</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/SsLocalRepoMetaDataImpl.java</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/dto/CollisionDtoConverter.java</file></path><path><editType>add</editType><file>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/dto/CollisionPrivateDtoConverter.java</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/CloudStorePersistenceCapableClassesProviderImpl.java</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/Collision.java</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/CollisionDao.java</file></path><path><editType>add</editType><file>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/CollisionPrivate.java</file></path><path><editType>add</editType><file>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/CollisionPrivateDao.java</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/HistoFrameDao.java</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/PlainHistoCryptoRepoFile.java</file></path><path><editType>edit</editType><file>/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/SsRemoteRepositoryDao.java</file></path><revision>435</revision><user>Marco Nguitragool-Schulze</user></item><kind>svn</kind><revision><module>https://www.codewizards.co/svn/subshare/trunk/org.subshare</module><revision>435</revision></revision></changeSet><culprit><absoluteUrl>https://www.codewizards.co:443/jenkins/user/mn</absoluteUrl><fullName>Marco Nguitragool-Schulze</fullName><id>mn</id><property></property><property></property><property></property><property></property><property><insensitiveSearch>false</insensitiveSearch></property><property></property><property><address>marco@codewizards.co</address></property></culprit><mavenArtifacts><moduleRecord><mainArtifact><artifactId>org.subshare</artifactId><canonicalName>org.subshare-0.9.0-SNAPSHOT.pom</canonicalName><fileName>pom.xml</fileName><groupId>org.subshare</groupId><md5sum>83ed006dee25a0763ed3fb5cf9bb4e24</md5sum><type>pom</type><version>0.9.0-SNAPSHOT</version></mainArtifact><parent><number>86</number><url>https://www.codewizards.co:443/jenkins/job/org.subshare.www/org.subshare$org.subshare/86/</url></parent><pomArtifact><artifactId>org.subshare</artifactId><canonicalName>org.subshare-0.9.0-SNAPSHOT.pom</canonicalName><fileName>pom.xml</fileName><groupId>org.subshare</groupId><md5sum>83ed006dee25a0763ed3fb5cf9bb4e24</md5sum><type>pom</type><version>0.9.0-SNAPSHOT</version></pomArtifact><url>https://www.codewizards.co:443/jenkins/job/org.subshare.www/org.subshare$org.subshare/86/mavenArtifacts/</url></moduleRecord><moduleRecord><mainArtifact><artifactId>org.subshare.parent</artifactId><canonicalName>org.subshare.parent-0.9.0-SNAPSHOT.pom</canonicalName><fileName>pom.xml</fileName><groupId>org.subshare</groupId><md5sum>8aeffcf7bbddec33529f6edb23e29149</md5sum><type>pom</type><version>0.9.0-SNAPSHOT</version></mainArtifact><parent><number>86</number><url>https://www.codewizards.co:443/jenkins/job/org.subshare.www/org.subshare$org.subshare.parent/86/</url></parent><pomArtifact><artifactId>org.subshare.parent</artifactId><canonicalName>org.subshare.parent-0.9.0-SNAPSHOT.pom</canonicalName><fileName>pom.xml</fileName><groupId>org.subshare</groupId><md5sum>8aeffcf7bbddec33529f6edb23e29149</md5sum><type>pom</type><version>0.9.0-SNAPSHOT</version></pomArtifact><url>https://www.codewizards.co:443/jenkins/job/org.subshare.www/org.subshare$org.subshare.parent/86/mavenArtifacts/</url></moduleRecord><moduleRecord><mainArtifact><artifactId>org.subshare.site.skin</artifactId><canonicalName>org.subshare.site.skin-0.9.0-SNAPSHOT.jar</canonicalName><fileName>org.subshare.site.skin-0.9.0-SNAPSHOT.jar</fileName><groupId>org.subshare</groupId><md5sum>fd604397d3b33c0523b758d893d0532b</md5sum><type>jar</type><version>0.9.0-SNAPSHOT</version></mainArtifact><parent><number>86</number><url>https://www.codewizards.co:443/jenkins/job/org.subshare.www/org.subshare$org.subshare.site.skin/86/</url></parent><pomArtifact><artifactId>org.subshare.site.skin</artifactId><canonicalName>org.subshare.site.skin-0.9.0-SNAPSHOT.pom</canonicalName><fileName>pom.xml</fileName><groupId>org.subshare</groupId><md5sum>e481f734a6be29d88af96651a3c42899</md5sum><type>pom</type><version>0.9.0-SNAPSHOT</version></pomArtifact><url>https://www.codewizards.co:443/jenkins/job/org.subshare.www/org.subshare$org.subshare.site.skin/86/mavenArtifacts/</url></moduleRecord></mavenArtifacts><mavenVersionUsed>3.0.4</mavenVersionUsed></mavenModuleSetBuild>