Merge branch 'master' of github.com:Activiti/Activiti

modules/activiti-bpmn-converter/pom.xml

@@ -17,6 +17,9 @@
     <activiti.artifact>
       org.activiti.bpmn.converter
     </activiti.artifact>
+    <activiti.osgi.export.additional>
+      org.activiti.bpmn.constants
+    </activiti.osgi.export.additional>
   </properties>
 
   <build>

modules/activiti-camel/src/main/java/org/activiti/camel/ActivitiComponent.java

@@ -12,13 +12,13 @@
  */
 package org.activiti.camel;
 
+import java.util.Map;
+
 import org.activiti.engine.RuntimeService;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.impl.DefaultComponent;
 
-import java.util.Map;
-
 public class ActivitiComponent extends DefaultComponent {
 
   private RuntimeService runtimeService;
@@ -43,7 +43,6 @@ public class ActivitiComponent extends DefaultComponent {
   @Override
   protected Endpoint createEndpoint(String s, String s1, Map<String, Object> stringObjectMap) throws Exception {
     ActivitiEndpoint ae = new ActivitiEndpoint(s, getCamelContext(), runtimeService);
-    //setProperties(ae, stringObjectMap);
     return ae;
   }
 }

modules/activiti-camel/src/main/java/org/activiti/camel/ActivitiEndpoint.java

@@ -30,7 +30,9 @@ public class ActivitiEndpoint extends DefaultEndpoint {
   private boolean copyVariablesFromProperties = false;
 
   public ActivitiEndpoint(String uri, CamelContext camelContext, RuntimeService runtimeService) {
-    super(uri, camelContext);
+    super();
+    setCamelContext(camelContext);
+    setEndpointUri(uri);
     this.runtimeService = runtimeService;
   }
 

modules/activiti-camel/src/main/java/org/activiti/camel/CamelBehaviour.java

@@ -39,10 +39,8 @@ public class CamelBehaviour extends BpmnActivityBehavior implements ActivityBeha
     ae.process(ex);
     execution.setVariables(ExchangeUtils.prepareVariables(ex, ae));
     performDefaultOutgoingBehavior(execution);
-
   }
 
-
   private ActivitiEndpoint createEndpoint(ActivityExecution execution) {
     String uri = "activiti://" + getProcessName(execution) + ":" + execution.getActivity().getId();
     return getEndpoint(getContext(execution), uri);

modules/activiti-camel/src/test/java/org/activiti/camel/route/SampleCamelRoute.java

@@ -20,16 +20,17 @@ public class SampleCamelRoute extends RouteBuilder {
     @Override
     public void configure() throws Exception {
 
-        from("activiti:camelProcess:serviceTask1").setBody().property("var1").
-                to("mock:service1").setProperty("var2").constant("var2")
-          .setBody().properties();
+      from("activiti:camelProcess:serviceTask1").setBody().property("var1")
+        .to("mock:service1").setProperty("var2").constant("var2")
+        .setBody().properties();
 
-      from("activiti:camelProcess:serviceTask2?copyVariablesToBody=true").to("mock:service2");
+      from("activiti:camelProcess:serviceTask2?copyVariablesToBody=true")
+        .to("mock:service2");
 
 
-        from("direct:start").to("activiti:camelProcess");
+      from("direct:start").to("activiti:camelProcess");
 
-        from("direct:receive").to("activiti:camelProcess:receive");
+      from("direct:receive").to("activiti:camelProcess:receive");
 
     }
 }

modules/activiti-rest/src/main/java/org/activiti/rest/api/process/ProcessDefinitionDiagramResource.java

@@ -16,9 +16,6 @@ public class ProcessDefinitionDiagramResource extends SecuredResource {
 
 	@Get
 	public InputRepresentation getDiagram() {
-		if (authenticate() == false)
-			return null;
-
 		String processDefinitionId = (String) getRequest().getAttributes().get("processDefinitionId");
 
 		if (processDefinitionId == null) {

modules/activiti-rest/src/main/java/org/activiti/rest/api/process/ProcessInstanceDiagramResource.java

@@ -37,23 +37,21 @@ public class ProcessInstanceDiagramResource extends SecuredResource {
   
   @Get
   public InputRepresentation getInstanceDiagram() {
-    if(authenticate() == false) return null;
-    
     String processInstanceId = (String) getRequest().getAttributes().get("processInstanceId");
     
     if(processInstanceId == null) {
       throw new ActivitiIllegalArgumentException("No process instance id provided");
     }
 
-    ExecutionEntity pi =
-        (ExecutionEntity) ActivitiUtil.getRuntimeService().createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+    ExecutionEntity pi = (ExecutionEntity) ActivitiUtil.getRuntimeService().createProcessInstanceQuery()
+        .processInstanceId(processInstanceId).singleResult();
 
     if (pi == null) {
       throw new ActivitiObjectNotFoundException("Process instance with id" + processInstanceId + " could not be found", ProcessInstance.class);
     }
 
-    ProcessDefinitionEntity pde = (ProcessDefinitionEntity) ((RepositoryServiceImpl) ActivitiUtil.getRepositoryService())
-        .getDeployedProcessDefinition(pi.getProcessDefinitionId());
+    ProcessDefinitionEntity pde = (ProcessDefinitionEntity) ((RepositoryServiceImpl) 
+        ActivitiUtil.getRepositoryService()).getDeployedProcessDefinition(pi.getProcessDefinitionId());
 
     if (pde != null && pde.isGraphicalNotationDefined()) {
       BpmnModel bpmnModel = ActivitiUtil.getRepositoryService().getBpmnModel(pde.getId());

pom.xml

@@ -41,9 +41,8 @@
     <activiti.osgi.private.pkg>${activiti.artifact}*.impl</activiti.osgi.private.pkg>
     -->
     <activiti.osgi.export.pkg>
-      ${activiti.artifact},
-      ${activiti.osgi.export.additional},
-      *
+      ${activiti.artifact}*,
+      ${activiti.osgi.export.additional}
     </activiti.osgi.export.pkg>
     <activiti.osgi.private.pkg></activiti.osgi.private.pkg>
     <activiti.osgi.version>version=${project.version}</activiti.osgi.version>

userguide/src/en/chapters/ch12-Explorer.xml

@@ -41,6 +41,34 @@
     </itemizedlist> 
   </para>
   
+  <section>
+  
+    <title>Process diagram</title>
+    
+    <para>
+      The Explorer includes functionality to dynamically generate an overview of a process definition using the <ulink url="http://raphaeljs.com/">Raphaël</ulink> Javascript framework.
+      This process image can only be generated when the process definition XML contains BPMN DI information. When there's no BPMN DI information in the process definition XML and the deployment contains a process definition image, that image will be shown.
+      <mediaobject><imageobject><imagedata align="center" fileref="images/explorer.process.definition.image.png"/></imageobject></mediaobject>
+    </para>
+    <para>
+      When you don't want to use the Javascript process definition overview you can disable it in the ui.properties file
+      <programlisting>
+        activiti.ui.jsdiagram = false
+      </programlisting>
+    </para>
+    <para>
+      In addition to showing the process diagram in the Explorer it's also easy to include the process diagram anywhere you want.
+      The following URL will show the process definition image, based on a process definition id: 
+      <programlisting>
+        http://localhost:8080/activiti-explorer/diagram-viewer/index.html?processDefinitionId=reviewSaledLead:1:36
+      </programlisting>
+      It's also possible to show the current state of a process instance by adding a processInstanceId request parameter like this: 
+      <programlisting>
+        http://localhost:8080/activiti-explorer/diagram-viewer/index.html?processDefinitionId=reviewSaledLead:1:36&amp;processInstanceId=41
+      </programlisting>
+    </para>
+  </section>
+  
   <section>
   
     <title>Tasks</title>