--- a/src/main/java/org/mpi/openmind/repository/services/AbstractPersistenceService.java	Thu Aug 25 11:29:47 2016 +0200
+++ b/src/main/java/org/mpi/openmind/repository/services/AbstractPersistenceService.java	Fri Aug 26 11:42:41 2016 +0200
@@ -25,16 +25,19 @@
  */
 public abstract class AbstractPersistenceService {
 
-	private ConfigurationService configurationService;
+    private ConfigurationService configurationService;
 
 	private OwnValueGenerator ownValueGenerator;
 
 	private final static String NODE_SEQUENCE = "nodeSequence";
 
-	private static Logger logger = Logger
-			.getLogger(AbstractPersistenceService.class);
+	private static Logger logger = Logger.getLogger(AbstractPersistenceService.class);
+	
+    public static final String TRANSACTION_LOGGER = "openmind.transactionlog";
 
-	private boolean importModus = false;
+    private static Logger txLog = Logger.getLogger(TRANSACTION_LOGGER);
+
+	private boolean importMode = false;
 
 	/*
 	 * static { logger.setLevel(Level.DEBUG); PatternLayout layout = new
@@ -562,54 +565,17 @@
 
 				Entity previousEntity = previousEntityList.get(0);
 				logger.info("Saving previous entity: " + previousEntity);
-				this.savePreviousEntity(session, previousEntity);
+				this.persistEntityAsPrevious(session, previousEntity);
 			}
 		}
 		session.getTransaction().commit();
 	}
 
-	/*
-	 * public void removeEntity(Long entId, String type) {
-	 * logger.info("Deleting entity [ID=" + entId + ", type=" + type +
-	 * "]. But keeping history in DB."); Session session =
-	 * HibernateUtil.getSessionFactory().getCurrentSession();
-	 * session.getTransaction().begin();
-	 * 
-	 * if (entId != null) { List<Entity> previousEntityList =
-	 * this.getEntities(session, entId, Node.SYS_STATUS_CURRENT_VERSION, type,
-	 * null); if (previousEntityList.size() > 0) { if (previousEntityList.size()
-	 * > 1) { System.err .println(
-	 * "[PersistenceService.saveEntity] found more than one current entities!");
-	 * }
-	 * 
-	 * Entity previousEntity = previousEntityList.get(0);
-	 * logger.info("Saving previous entity: " + previousEntity);
-	 * this.savePreviousEntity(session, previousEntity); } } }
-	 */
-
-	public void savePreviousEntity(Entity entity) throws Exception {
-
-		Session session = HibernateUtil.getSessionFactory().getCurrentSession();
-		session.getTransaction().begin();
-
-		if (entity.getId() != null) {
-			List<Entity> previousEntityList = this.getEntities(session,
-					entity.getId(), Node.SYS_STATUS_CURRENT_VERSION,
-					entity.getType(), null, false);
-			if (previousEntityList.size() > 0) {
-				if (previousEntityList.size() > 1) {
-					logger.error("[PersistenceService.saveEntity] found more than one current entities!");
-				}
-				Entity previousEntity = previousEntityList.get(0);
-				logger.debug("Saving previous entity: " + previousEntity);
-				this.savePreviousEntity(session, previousEntity);
-			}
-		}
-		this.saveCurrentEntity(session, entity, null);
-		session.getTransaction().commit();
-	}
 
 	/**
+	 * Save the entity to the database.
+	 * 
+	 * Creates a new version of the entity. Runs in a transaction.
 	 * 
 	 * @param entity
 	 * @return
@@ -625,6 +591,15 @@
 
 	}
 
+	/**
+	 * Save the entity to the database using the given session.
+	 * 
+	 * Creates a new version and sets the existing entity to PREVIOUS_VERSION.
+	 * 
+	 * @param session
+	 * @param entity
+	 * @throws Exception
+	 */
 	private void saveEntity0(Session session, Entity entity) throws Exception {
 		if (entity.getId() != null) {
 			List<Entity> previousEntityList = this.getEntities(session, entity.getId(), Node.SYS_STATUS_CURRENT_VERSION, entity.getType(), null, false);
@@ -635,12 +610,23 @@
 
 				Entity previousEntity = previousEntityList.get(0);
 				logger.info("Saving previous entity: " + previousEntity);
-				this.savePreviousEntity(session, previousEntity);
+				this.persistEntityAsPrevious(session, previousEntity);
 			}
 		}
 		this.saveCurrentEntity(session, entity, null);
 	}
 
+	/**
+	 * Save the entity as (new) current version using the given session.
+	 * 
+	 * Sets system_status to CURRENT_VERSION and updates row_id, version, modification_time,
+	 * etc.
+	 * 
+	 * @param session
+	 * @param entity
+	 * @param idSequence
+	 * @throws Exception
+	 */
 	private void saveCurrentEntity(Session session, Entity entity,
 			Sequence idSequence) throws Exception {
 		Long time = System.currentTimeMillis();
@@ -654,12 +640,17 @@
 		entity.autoNormalize();
 		// generating of id, connecting rels, atts and views to the entity
 		this.prepareEntity(session, entity, idSequence);
-		this.saveEntity(session, entity);
+		this.persistEntity(session, entity);
 	}
 
 	/**
-	 * Here the modification time will be propagated from the entity to its
-	 * relations an attributes.
+	 * Update the entity to prepare it for persisting.
+	 * 
+	 * If the ID is null new IDs will be assigned for the entity and its 
+	 * attributes and relations.
+	 * The modification time is propagated from the entity to its
+	 * attributes and relations.
+	 * Own-values are normalized.
 	 * 
 	 * @param session
 	 * @param entity
@@ -772,42 +763,57 @@
 	}
 
 	/**
-	 * Saves an entity setting its system state as previous_version
+	 * Set an entities' system state to PREVIOUS_VERSION and persist it.
+	 * 
+	 * Also persists the entities' attributes and relations.
 	 * 
 	 * @param session
 	 * @param entity
 	 */
-	private void savePreviousEntity(Session session, Entity entity) {
+	private void persistEntityAsPrevious(Session session, Entity entity) {
 		entity.setSystemStatus(Node.SYS_STATUS_PREVIOUS_VERSION);
+        txLog.debug("* START save previous entity...");
+        txLog.info("save previous entity: "+entity.toEncString());
 		session.save(entity);
 		for (Attribute attribute : entity.getAttributes()) {
-            logger.debug("  saving prev entity attribute: "+attribute);
+            txLog.info("save previous entity attribute: "+attribute.toEncString());
 			session.save(attribute);
 		}
 		for (Relation rel : entity.getSourceRelations()) {
+	        txLog.info("save previous source relation: "+rel.toEncString());
 			session.save(rel);
 			for (Attribute att : rel.getAttributes()) {
-	            logger.debug("  saving prev (source)relation attribute: "+rel);
+                txLog.info("save previous source relation attribute: "+att.toEncString());
 				session.save(att);
 			}
 		}
 		for (Relation rel : entity.getTargetRelations()) {
+            txLog.info("save previous target relation: "+rel.toEncString());
 			session.save(rel);
             for (Attribute att : rel.getAttributes()) {
-                logger.debug("  saving prev (target)relation attribute: "+rel);
+                txLog.info("save previous target relation attribute: "+att.toEncString());
                 session.save(att);
             }
 		}
 		for (View view : entity.getViews()) {
 			session.save(view);
 		}
+        txLog.debug("* End ...save previous entity");
 	}
 
-	private void saveEntity(Session session, Entity entity) throws Exception {
-		logger.info("Saving current entity: " + entity);
+	/**
+	 * Persist a (current) entity and its attributes and relations.
+	 * 
+	 * @param session
+	 * @param entity
+	 * @throws Exception
+	 */
+	private void persistEntity(Session session, Entity entity) throws Exception {
+		txLog.info("* START save entity...");
+        txLog.info("save entity: "+entity.toEncString());
 		session.save(entity);
 		for (Attribute attribute : entity.getAttributes()) {
-		    logger.debug("  saving entity attribute: "+attribute);
+		    txLog.info("save entity attribute: "+attribute.toEncString());
 			session.save(attribute);
 		}
 		for (Relation rel : entity.getSourceRelations()) {
@@ -817,9 +823,10 @@
 						"Either the sourceId or the targetId was not initialized to the source relation: "
 								+ rel.getOwnValue());
 			}
+	        txLog.info("save source relation: "+rel.toEncString());
 			session.save(rel);
 			for (Attribute att : rel.getAttributes()) {
-	            logger.debug("  saving (source)relation attribute: "+att);
+	            txLog.info("save source relation attribute: "+att.toEncString());
 				session.save(att);
 			}
 		}
@@ -830,9 +837,10 @@
 						"Either the sourceId or the targetId was not initialized to the target relation: "
 								+ rel.getOwnValue());
 			}
+            txLog.info("save target relation: "+rel.toEncString());
 			session.save(rel);
             for (Attribute att : rel.getAttributes()) {
-                logger.debug("  saving (target)relation attribute: "+att);
+                txLog.info("save target relation attribute: "+att.toEncString());
                 session.save(att);
             }
 		}
@@ -840,15 +848,15 @@
 		// Call of ownValue Generator.
 		// TODO: the method should be used always? what would happen if the
 		// ownValue returns null?
-		if (!isImportModus()) {
-			String ownValue = this.getOwnValueGenerator().generateOwnValue(
-					entity, session);
+		if (!isImportMode()) {
+			String ownValue = this.getOwnValueGenerator().generateOwnValue(entity, session);
 			if (StringUtils.isNotEmpty(ownValue)) {
 				entity.setOwnValue(ownValue);
 				entity.autoNormalize();
 				session.save(entity);
 			}
 		}
+        txLog.debug("* ...END save entity");
 	}
 
 	public OwnValueGenerator getOwnValueGenerator() {
@@ -861,7 +869,7 @@
 
 	/**
 	 * <p>
-	 * Returns entities with their corresponded contain.
+	 * Returns entities with their corresponding contents.
 	 * </p>
 	 * 
 	 * @param session
@@ -927,7 +935,7 @@
 
 	/**
 	 * <p>
-	 * Returns entities with their corresponded contain.
+	 * Returns entities with their corresponding content.
 	 * </p>
 	 * 
 	 * @param id
@@ -1055,7 +1063,10 @@
 			entity.setSourceRelations(new ArrayList<Relation>());
 			entity.setTargetRelations(new ArrayList<Relation>());
 
-            // FIXME: getNodes finds all attributes if id=null!
+            /*
+             * Danger: getNodes finds all attributes in the db and tries to attach them to 
+             * this entity if id=null!
+             */
             if (entity.getId() == null) {
                 logger.error("Entity with id=null! Abort loading attributes.");
                 return entity;
@@ -1080,7 +1091,10 @@
 				} else if (node instanceof Relation) {
 					Relation rel = (Relation) node;
 					// new attr for relations
-					// FIXME: getNodes finds all attributes if id=null!
+		            /*
+		             * Danger: getNodes finds all attributes in the db and tries to attach them to 
+		             * this relation if id=null!
+		             */
 		            if (rel.getId() == null) {
 		                logger.error("Relation with id=null! Abort loading attributes.");
 		                continue;
@@ -1101,8 +1115,7 @@
 				} else if (node instanceof View) {
 					entity.getViews().add((View) node);
 				} else {
-					throw new IllegalArgumentException("Invalid node found: "
-							+ node);
+					throw new IllegalArgumentException("Invalid node found: " + node);
 				}
 			}
 
@@ -1123,7 +1136,10 @@
 				if (node instanceof Relation) {
 					Relation rel = (Relation) node;
 					// new attr for relations
-		            // FIXME: getNodes finds all attributes if id=null!
+		            /*
+		             * Danger: getNodes finds all attributes in the db and tries to attach them to 
+		             * this relation if id=null!
+		             */
 		            if (rel.getId() == null) {
 		                logger.error("Relation with id=null! Abort loading attributes.");
 		                continue;
@@ -1433,12 +1449,12 @@
 		this.configurationService = configurationService;
 	}
 
-	public boolean isImportModus() {
-		return importModus;
+	public boolean isImportMode() {
+		return importMode;
 	}
 
 	public void setImportModus(boolean importModus) {
-		this.importModus = importModus;
+		this.importMode = importModus;
 	}
 
 	// #################################################################