Merged web-application-context.xml from 5.1 tag, removing currently unused...

Merged web-application-context.xml from 5.1 tag, removing currently unused template processor + fixed casting bug

modules/activiti-webapp-rest/src/main/java/org/activiti/rest/builder/process/ProcessInstanceJSONConverter.java

@@ -15,8 +15,7 @@ package org.activiti.rest.builder.process;
 
 import java.util.List;
 
-import org.activiti.engine.impl.pvm.runtime.ExecutionImpl;
-import org.activiti.engine.impl.runtime.ExecutionEntity;
+import org.activiti.engine.impl.pvm.PvmProcessInstance;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.rest.builder.JSONConverter;
 import org.activiti.rest.util.JSONUtil;
@@ -41,8 +40,8 @@ public class ProcessInstanceJSONConverter implements JSONConverter<ProcessInstan
   }
   
   private void addActiveActivityNames(ProcessInstance processInstance, JSONObject object) throws JSONException {
-    if(processInstance instanceof ExecutionEntity) {      
-      List<String> activeActivities = ((ExecutionImpl) processInstance).findActiveActivityIds();
+    if(processInstance instanceof PvmProcessInstance) {      
+      List<String> activeActivities = ((PvmProcessInstance) processInstance).findActiveActivityIds();
       JSONArray activityNames =JSONUtil.putNewArray(object, "activityNames");
       for (String activity : activeActivities) {
         activityNames.put(activity);

modules/activiti-webapp-rest/src/main/webapp/WEB-INF/web-application-context.xml

@@ -53,12 +53,12 @@
   </bean>
   
   <!-- Plug in custom template processor based on JSONObjects -->
-  <bean id="jsonObjectTemplateProcessor" class="org.activiti.rest.builder.JSONTemplateProcessor">
+  <!--bean id="jsonObjectTemplateProcessor" class="org.activiti.rest.builder.JSONTemplateProcessor">
       <property name="templateProcessorRegistry" ref="webscripts.web.templateregistry" />
       <property name="defaultEncoding" value="UTF-8" />
       <property name="templateNamePrefix" value="org/activiti/rest/api/" />
       <property name="indentFactor" value="2" />
-  </bean>
+  </bean-->
 
   <!--
     Java backed webscripts needs to be registered.