- Added toString for debugging.

- More consistent member ordering.

modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/DeploymentEntity.java

@@ -45,6 +45,15 @@ public class DeploymentEntity implements Serializable, Deployment, PersistentObj
    */
   protected Map<Class<?>, List<Object>> deployedArtifacts;
   
+  public Object getPersistentState() {
+    // properties of this entity are immutable
+    // so always the same value is returned
+    // so never will an update be issued for a DeploymentEntity
+    return DeploymentEntity.class;
+  }
+  
+  // lazy loading /////////////////////////////////////////////////////////////
+
   public ResourceEntity getResource(String resourceName) {
     return getResources().get(resourceName);
   }
@@ -56,7 +65,6 @@ public class DeploymentEntity implements Serializable, Deployment, PersistentObj
     resources.put(resource.getName(), resource);
   }
 
-  // lazy loading /////////////////////////////////////////////////////////////
   public Map<String, ResourceEntity> getResources() {
     if (resources==null && id!=null) {
       List<ResourceEntity> resourcesList = Context
@@ -71,14 +79,7 @@ public class DeploymentEntity implements Serializable, Deployment, PersistentObj
     return resources;
   }
 
-  public Object getPersistentState() {
-    // properties of this entity are immutable
-    // so always the same value is returned
-    // so never will an update be issued for a DeploymentEntity
-    return DeploymentEntity.class;
-  }
-  
-  // Deployed artifacts manipulation //////////////////////////////////////////
+  // deployed artifacts manipulation //////////////////////////////////////////
   
   public void addDeployedArtifact(Object deployedArtifact) {
     if (deployedArtifacts == null) {
@@ -118,6 +119,14 @@ public class DeploymentEntity implements Serializable, Deployment, PersistentObj
     this.name = name;
   }
   
+  public String getCategory() {
+    return category;
+  }
+
+  public void setCategory(String category) {
+    this.category = category;
+  }
+
   public void setResources(Map<String, ResourceEntity> resources) {
     this.resources = resources;
   }
@@ -138,11 +147,12 @@ public class DeploymentEntity implements Serializable, Deployment, PersistentObj
     this.isNew = isNew;
   }
 
-  public String getCategory() {
-    return category;
-  }
+  
+  // common methods  //////////////////////////////////////////////////////////
 
-  public void setCategory(String category) {
-    this.category = category;
+  @Override
+  public String toString() {
+    return "DeploymentEntity[id=" + id + ", name=" + name + "]";
   }
+  
 }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricActivityInstanceEntity.java

@@ -49,38 +49,34 @@ public class HistoricActivityInstanceEntity extends HistoricScopeInstanceEntity
   public String getActivityId() {
     return activityId;
   }
+  public void setActivityId(String activityId) {
+    this.activityId = activityId;
+  }
+
   public String getActivityName() {
     return activityName;
   }
+  public void setActivityName(String activityName) {
+    this.activityName = activityName;
+  }
 
   public String getActivityType() {
     return activityType;
   }
+  public void setActivityType(String activityType) {
+    this.activityType = activityType;
+  }
   
   public String getExecutionId() {
     return executionId;
   }
-  
   public void setExecutionId(String executionId) {
     this.executionId = executionId;
   }
   
-  public void setActivityId(String activityId) {
-    this.activityId = activityId;
-  }
-  
-  public void setActivityName(String activityName) {
-    this.activityName = activityName;
-  }
-  
-  public void setActivityType(String activityType) {
-    this.activityType = activityType;
-  }
-
   public String getAssignee() {
     return assignee;
   }
-
   public void setAssignee(String assignee) {
     this.assignee = assignee;
   }
@@ -88,7 +84,6 @@ public class HistoricActivityInstanceEntity extends HistoricScopeInstanceEntity
   public String getTaskId() {
     return taskId;
   }
-  
   public void setTaskId(String taskId) {
     this.taskId = taskId;
   }
@@ -96,9 +91,15 @@ public class HistoricActivityInstanceEntity extends HistoricScopeInstanceEntity
   public String getCalledProcessInstanceId() {
     return calledProcessInstanceId;
   }
-  
   public void setCalledProcessInstanceId(String calledProcessInstanceId) {
     this.calledProcessInstanceId = calledProcessInstanceId;
   }
 
+  // common methods  //////////////////////////////////////////////////////////
+
+  @Override
+  public String toString() {
+    return "HistoricActivityInstanceEntity[activityId=" + activityId + ", activityName=" + activityName + "]";
+  }
+
 }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricDetailEntity.java

@@ -25,7 +25,7 @@ import org.activiti.engine.impl.db.PersistentObject;
 /**
  * @author Tom Baeyens
  */
-public class HistoricDetailEntity implements HistoricDetail, PersistentObject, Serializable {
+public abstract class HistoricDetailEntity implements HistoricDetail, PersistentObject, Serializable {
 
   private static final long serialVersionUID = 1L;
   
@@ -57,51 +57,39 @@ public class HistoricDetailEntity implements HistoricDetail, PersistentObject, S
   public void setId(String id) {
     this.id = id;
   }
-
   
   public String getProcessInstanceId() {
     return processInstanceId;
   }
-
-  
   public void setProcessInstanceId(String processInstanceId) {
     this.processInstanceId = processInstanceId;
   }
 
-  
-  public String getExecutionId() {
-    return executionId;
-  }
-
-  
-  public void setExecutionId(String executionId) {
-    this.executionId = executionId;
-  }
-
-  
   public String getActivityInstanceId() {
     return activityInstanceId;
   }
-
-  
   public void setActivityInstanceId(String activityInstanceId) {
     this.activityInstanceId = activityInstanceId;
   }
 
-  public Date getTime() {
-    return time;
-  }
-  
-  public void setTime(Date time) {
-    this.time = time;
-  }
-
-  
   public String getTaskId() {
     return taskId;
   }
-
   public void setTaskId(String taskId) {
     this.taskId = taskId;
   }
+
+  public String getExecutionId() {
+    return executionId;
+  }
+  public void setExecutionId(String executionId) {
+    this.executionId = executionId;
+  }
+
+  public Date getTime() {
+    return time;
+  }
+  public void setTime(Date time) {
+    this.time = time;
+  }
 }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricProcessInstanceEntity.java

@@ -67,32 +67,43 @@ public class HistoricProcessInstanceEntity extends HistoricScopeInstanceEntity i
   public String getEndActivityId() {
     return endActivityId;
   }
+  public void setEndActivityId(String endActivityId) {
+    this.endActivityId = endActivityId;
+  }
+
   public String getBusinessKey() {
     return businessKey;
   }
   public void setBusinessKey(String businessKey) {
     this.businessKey = businessKey;
   }
-  public void setEndActivityId(String endActivityId) {
-    this.endActivityId = endActivityId;
-  }
+  
   public String getStartUserId() {
     return startUserId;
   }
   public void setStartUserId(String startUserId) {
     this.startUserId = startUserId;
   }
+  
   public String getStartActivityId() {
     return startActivityId;
   }
   public void setStartActivityId(String startUserId) {
     this.startActivityId = startUserId;
   }
+  
   public String getSuperProcessInstanceId() {
-	return superProcessInstanceId;
+    return superProcessInstanceId;
   }
   public void setSuperProcessInstanceId(String superProcessInstanceId) {
-	this.superProcessInstanceId = superProcessInstanceId;
+    this.superProcessInstanceId = superProcessInstanceId;
+  }
+
+  // common methods  //////////////////////////////////////////////////////////
+
+  @Override
+  public String toString() {
+    return "HistoricProcessInstanceEntity[superProcessInstanceId=" + superProcessInstanceId + "]";
   }
   
 }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/PropertyEntity.java

@@ -72,4 +72,12 @@ public class PropertyEntity implements PersistentObject, HasRevision, Serializab
   public int getRevisionNext() {
     return revision+1;
   }
+
+  // common methods  //////////////////////////////////////////////////////////
+
+  @Override
+  public String toString() {
+    return "PropertyEntity[name=" + name + ", value=" + value + "]";
+  }
+
 }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ResourceEntity.java

@@ -78,4 +78,11 @@ public class ResourceEntity implements Serializable, PersistentObject {
   public boolean isGenerated() {
     return generated;
   }
+  
+  // common methods  //////////////////////////////////////////////////////////
+
+  @Override
+  public String toString() {
+    return "ResourceEntity[id=" + id + ", name=" + name + "]";
+  }
 }