Commit 4f199f26 authored by Guillaume Blin's avatar Guillaume Blin

Merge branch 'hotfix-0.7.1'

parents 0f5825f8 e5eca531
......@@ -4,12 +4,12 @@
<parent>
<groupId>org.pickcellslab.pickcells</groupId>
<artifactId>pickcells-essentials</artifactId>
<version>0.7.0</version>
<version>0.7.1</version>
</parent>
<artifactId>pickcells-container</artifactId>
<version>0.7.0</version>
<version>0.7.1</version>
<packaging>jar</packaging>
<name>pickcells-container</name>
......
......@@ -55,6 +55,7 @@ import org.pickcellslab.foundationj.dbm.RootItem;
import org.pickcellslab.foundationj.dbm.Session;
import org.pickcellslab.foundationj.dbm.User;
import org.pickcellslab.foundationj.dbm.User.priviledge;
import org.pickcellslab.foundationj.dbm.meta.Meta;
import org.pickcellslab.foundationj.dbm.queries.actions.AKeyInfo;
import org.pickcellslab.foundationj.dbm.queries.actions.Updater;
import org.pickcellslab.foundationj.dbm.queries.adapters.Updatable;
......@@ -309,10 +310,17 @@ public class PickCells extends Application{
try {
if(userSession != null) {
userSession.close();
userSession = null;
currentExperiment = null;
}
Credentials cre = new Credentials(currentUser.userName(), currentUser.getAttribute(AKey.get("password", String.class)).get());
Session<?,?> session = persistence.startSession(cre, experiment);
Meta.get().setSession(session);
session.queryFactory().store()
.add(experiment, Traversers.newConstraints().fromMinDepth().toDepth(0).traverseAllLinks().includeAllNodes())
.forceUnknownId()
......@@ -441,7 +449,11 @@ public class PickCells extends Application{
Session<?,?> s =
persistence.startSession(new Credentials(
currentUser.userName(), currentUser.getAttribute(AKey.get("password", String.class)).get()), exp.get());
//We need to specify which session the MetaModel will be built from
Meta.get().setSession(s);
//If the dbPath is different update the database with the new path (must have been copied from somewhere else)
if(differ){
......
......@@ -4,12 +4,12 @@
<parent>
<groupId>org.pickcellslab.pickcells</groupId>
<artifactId>pickcells-essentials</artifactId>
<version>0.7.0</version>
<version>0.7.1</version>
</parent>
<artifactId>pickcells-coremodules</artifactId>
<version>0.7.0</version>
<version>0.7.1</version>
<packaging>jar</packaging>
<name>pickcells-coremodules</name>
......
<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">
<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.pickcellslab.pickcells</groupId>
<artifactId>pickcells-essentials</artifactId>
<version>0.7.0</version>
<version>0.7.1</version>
</parent>
<artifactId>pickcells-ioImpl</artifactId>
<version>0.7.0</version>
<version>0.7.1</version>
<packaging>jar</packaging>
<name>pickcells-ioImpl</name>
<description>Implementation of the pickcells IO interfaces using the Scifio library as dependency</description>
......
......@@ -5,13 +5,13 @@
<parent>
<groupId>org.pickcellslab.pickcells</groupId>
<artifactId>pickcells-essentials</artifactId>
<version>0.7.0</version>
<version>0.7.1</version>
</parent>
<artifactId>pickcells-provImpl</artifactId>
<version>0.7.0</version>
<version>0.7.1</version>
<packaging>jar</packaging>
<name>pickcells-provImpl</name>
<description>Implementation of the Image provider interfaces in Pickcells-img</description>
......
<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">
<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>
......@@ -9,7 +8,7 @@
</parent>
<artifactId>pickcells-essentials</artifactId>
<version>0.7.0</version>
<version>0.7.1</version>
<packaging>pom</packaging>
<name>pickcells-essentials-parent</name>
<description>Parent and Aggregator POM for building the PickCells essentials artifacts and maintaining module versions consistency</description>
......@@ -31,22 +30,22 @@
<dependency>
<groupId>org.pickcellslab.pickcells</groupId>
<artifactId>pickcells-ioImpl</artifactId>
<version>0.7.0</version>
<version>0.7.1</version>
</dependency>
<dependency>
<groupId>org.pickcellslab.pickcells</groupId>
<artifactId>pickcells-provImpl</artifactId>
<version>0.7.0</version>
<version>0.7.1</version>
</dependency>
<dependency>
<groupId>org.pickcellslab.pickcells</groupId>
<artifactId>pickcells-container</artifactId>
<version>0.7.0</version>
<version>0.7.1</version>
</dependency>
<dependency>
<groupId>org.pickcellslab.pickcells</groupId>
<artifactId>pickcells-coremodules</artifactId>
<version>0.7.0</version>
<version>0.7.1</version>
</dependency>
</dependencies>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment