diff --git a/wise-webapp/src/main/java/com/wisemapping/model/Collaboration.java b/wise-webapp/src/main/java/com/wisemapping/model/Collaboration.java index f33c9a95..79a06344 100644 --- a/wise-webapp/src/main/java/com/wisemapping/model/Collaboration.java +++ b/wise-webapp/src/main/java/com/wisemapping/model/Collaboration.java @@ -34,7 +34,7 @@ public class Collaboration implements Serializable { @Column(name = "role_id",unique = true,nullable = true) private CollaborationRole role; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne @JoinColumn(name="mindmap_id",nullable = false) private Mindmap mindMap; @@ -42,7 +42,7 @@ public class Collaboration implements Serializable { @JoinColumn(name="colaborator_id",nullable = false) private Collaborator collaborator; - @ManyToOne(fetch = FetchType.LAZY,cascade = CascadeType.ALL) + @ManyToOne(cascade = CascadeType.ALL) @JoinColumn(name="properties_id",nullable = false, unique = true) private CollaborationProperties collaborationProperties = new CollaborationProperties();; diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties b/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties index 1a68b72b..73ef3bed 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties @@ -1,6 +1,6 @@ -log4j.rootLogger=DEBUG, stdout, R +log4j.rootLogger=INFI, stdout, R log4j.logger.com.wisemapping=DEBUG,R -log4j.logger.org.springframework=DEBUG,R +log4j.logger.org.springframework=INFO,R log4j.logger.org.hibernate=DEBUG,R # Stdout logger �