ACT-251 ACT-258 ACT-267 added improved form history search capabilities and...

ACT-251 ACT-258 ACT-267 added improved form history search capabilities and moved method getDeployedProcessDefinition to impl

modules/activiti-engine/src/main/java/org/activiti/engine/RepositoryService.java

@@ -64,9 +64,6 @@ public interface RepositoryService {
   /** Query process definitions. */
   ProcessDefinitionQuery createProcessDefinitionQuery();
   
-  /** exposes a fully deployed process definition for introspection purposes. */
-  ReadOnlyProcessDefinition getDeployedProcessDefinition(String processDefinitionId);
-  
   /** Query process definitions. */
   DeploymentQuery createDeploymentQuery();
 }

modules/activiti-engine/src/main/java/org/activiti/engine/history/HistoricDetailQuery.java

@@ -27,6 +27,9 @@ public interface HistoricDetailQuery extends Query<HistoricDetailQuery, Historic
    * {@link ProcessInstance) ids and {@link HistoricProcessInstance} ids match. */
   HistoricDetailQuery processInstanceId(String processInstanceId);
 
+  /** Only select historic variable updates associated to the given {@link HistoricActivityInstance activity instance}. */
+  HistoricDetailQuery activityId(String activityId);
+
   /** Only select {@link HistoricFormProperty}s. */
   HistoricDetailQuery onlyFormProperties();
 

modules/activiti-engine/src/main/java/org/activiti/engine/impl/HistoricDetailQueryImpl.java

@@ -30,6 +30,7 @@ import org.activiti.engine.query.QueryProperty;
 public class HistoricDetailQueryImpl extends AbstractQuery<HistoricDetailQuery, HistoricDetail> implements HistoricDetailQuery {
 
   protected String processInstanceId;
+  protected String activityId;
   protected String type;
   protected HistoricDetailQueryProperty orderProperty;
 
@@ -45,6 +46,11 @@ public class HistoricDetailQueryImpl extends AbstractQuery<HistoricDetailQuery,
     return this;
   }
 
+  public HistoricDetailQuery activityId(String activityId) {
+    this.activityId = activityId;
+    return this;
+  }
+
   public HistoricDetailQuery onlyFormProperties() {
     this.type = "FormProperty";
     return this;

modules/activiti-engine/src/main/java/org/activiti/engine/impl/el/ExpressionManager.java

@@ -52,8 +52,7 @@ public class ExpressionManager {
   
   
   public ExpressionManager() {
-    // Use the ExpressionFactoryImpl in activiti-juel, with parametrised method expressions
-    // enabled
+    // Use the ExpressionFactoryImpl in activiti build in version of juel, with parametrised method expressions enabled
     expressionFactory = new ExpressionFactoryImpl();
   }
 

modules/activiti-engine/src/main/resources/org/activiti/db/ibatis/history.mapping.xml

@@ -319,6 +319,9 @@
       <if test="processInstanceId != null">
         HD.PROC_INST_ID_ = #{processInstanceId}
       </if>
+      <if test="activityId != null">
+        HD.ACT_INST_ID_ = #{activityId}
+      </if>
       <if test="type != null">
         and HD.TYPE_ = #{type}
       </if>

modules/activiti-engine/src/test/java/org/activiti/engine/test/db/ProcessDefinitionPersistenceTest.java

@@ -16,6 +16,7 @@ package org.activiti.engine.test.db;
 import java.util.Collections;
 import java.util.List;
 
+import org.activiti.engine.impl.RepositoryServiceImpl;
 import org.activiti.engine.impl.pvm.PvmActivity;
 import org.activiti.engine.impl.pvm.PvmTransition;
 import org.activiti.engine.impl.pvm.ReadOnlyProcessDefinition;
@@ -52,7 +53,7 @@ public class ProcessDefinitionPersistenceTest extends ActivitiInternalTestCase {
       .deploy()
       .getId();
   
-    ReadOnlyProcessDefinition processDefinition = repositoryService.getDeployedProcessDefinition("processOne:1");
+    ReadOnlyProcessDefinition processDefinition = ((RepositoryServiceImpl)repositoryService).getDeployedProcessDefinition("processOne:1");
     
     assertEquals("processOne:1", processDefinition.getId());
     assertEquals("Process One", processDefinition.getProperty("name"));