jruby_activiti 1.2.5 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f0a93eb101989b4848b8163247a7bc291af024a
-  data.tar.gz: 2206467cd0bac8c5affab560814b82a37cf8a5ee
+  metadata.gz: c6ff969809f34fc0b4cd64e28d676bf2bd266283
+  data.tar.gz: 68569faeaa5e3612a0133a3380a547bb223b4287
 SHA512:
-  metadata.gz: ab7464720bfeaea53b840e408d2dbafb1a6140b5b578661a02c7fa70a22d304af4b0ad3227280cba1198a9173d7daebfab580c694eb3e8413cc91cce5290ad15
-  data.tar.gz: 3dffa1d82d9325692cdee98c3b426614dd47596fc3f2f86d278f258c8526c6911190a964062c5961490326546fdb283fd736a5c128f7136616789b05e3a232c4
+  metadata.gz: c059cdc3e300d51768bdff4beb268ec96cd5e8e552e19a8e26e1a4be916c63737bc59fb539f92016e78e71721e20449609efec8a46813df76050fede7c125960
+  data.tar.gz: c9dbd6e9fe5942cd0718c0a25640c9155df3967912519ebda9da5539d09c0c7ce2779998e8f4c9b85c37ba13d84f59527b6bb1204b9dbcba5bb77ac94bbfe91a

data/.gitignore

@@ -13,4 +13,6 @@
 *.a
 mkmf.log
 /.jbundler/
-*.gem
+*.gem
+/java/target/
+/.mvn/

data/.ruby-version

@@ -1 +1 @@
-jruby-9.0.3.0
+jruby-9.0.4.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+## v2.0.0
+* Integrate Activiti Modeler
+* [TODO] Integrate Activiti Diagram Viewer
+* [TODO] Add Web View for models CRUD
+
+
 ## v1.0.0
 
 * Initial release

data/Jarfile

@@ -1,3 +1,8 @@
 jar 'org.activiti:activiti-engine', '~> 5.19'
 jar 'org.slf4j:slf4j-log4j12', '>= 1.7'
 jar 'com.h2database:h2', '>= 1.4'
+
+jar 'org.activiti:activiti-modeler', '~> 5.19'
+#jar 'com.fasterxml.jackson.core:jackson-databind', '2.2.3'
+#jar 'org.apache.xmlgraphics:batik-transcoder', '1.7'
+#jar 'org.apache.xmlgraphics:batik-codec', '1.7'

data/Jarfile.lock

@@ -1,25 +1,64 @@
 ---
 :runtime:
 - org.activiti:activiti-bpmn-converter:jar:5.19.0
-- org.apache.commons:commons-email:jar:1.4
+- log4j:log4j:jar:1.2.17
+- org.yaml:snakeyaml:jar:1.14
+- aopalliance:aopalliance:jar:1.0
+- org.apache.xmlgraphics:batik-svggen:jar:1.7
+- org.springframework.security:spring-security-core:jar:3.2.3.RELEASE
+- org.apache.xmlgraphics:xmlgraphics-commons:jar:1.2
+- org.apache.xmlgraphics:batik-util:jar:1.7
+- org.apache.xmlgraphics:batik-gvt:jar:1.7
+- org.apache.avalon.framework:avalon-framework-impl:jar:4.3.1
+- org.activiti:activiti-modeler:jar:5.19.0
+- org.slf4j:slf4j-log4j12:jar:1.7.13
+- org.apache.xmlgraphics:batik-parser:jar:1.7
+- xml-apis:xml-apis-ext:jar:1.3.04
+- org.apache.xmlgraphics:batik-script:jar:1.7
+- org.springframework:spring-beans:jar:4.1.5.RELEASE
+- org.apache.xmlgraphics:batik-bridge:jar:1.7
+- org.apache.avalon.framework:avalon-framework-api:jar:4.3.1
+- org.apache.xmlgraphics:batik-svg-dom:jar:1.7
 - org.activiti:activiti-bpmn-model:jar:5.19.0
 - org.activiti:activiti-engine:jar:5.19.0
-- com.sun.mail:javax.mail:jar:1.5.2
-- log4j:log4j:jar:1.2.17
+- org.springframework:spring-aop:jar:4.1.5.RELEASE
+- org.apache.xmlgraphics:batik-js:jar:1.7
+- org.springframework:spring-expression:jar:4.1.5.RELEASE
+- org.springframework.security:spring-security-config:jar:3.2.3.RELEASE
+- xml-apis:xml-apis:jar:1.3.04
+- math.geom2d:javaGeom:jar:0.11.1
+- org.apache.xmlgraphics:fop:jar:0.94
+- org.apache.xmlgraphics:batik-dom:jar:1.7
+- org.apache.commons:commons-lang3:jar:3.3.2
+- org.activiti:activiti-common-rest:jar:5.19.0
+- com.fasterxml.jackson.core:jackson-core:jar:2.2.3
+- org.activiti:activiti-json-converter:jar:5.19.0
+- org.apache.xmlgraphics:batik-codec:jar:1.7
 - org.slf4j:slf4j-api:jar:1.7.6
-- org.yaml:snakeyaml:jar:1.14
-- com.fasterxml.jackson.core:jackson-databind:jar:2.2.3
+- org.springframework:spring-webmvc:jar:4.1.5.RELEASE
+- org.apache.xmlgraphics:batik-css:jar:1.7
+- org.springframework:spring-context:jar:4.1.5.RELEASE
 - org.springframework:spring-core:jar:4.1.5.RELEASE
-- commons-logging:commons-logging:jar:1.2
+- org.apache.xmlgraphics:batik-awt-util:jar:1.7
+- commons-collections:commons-collections:jar:3.2.1
+- commons-logging:commons-logging:jar:1.0.4
+- org.apache.xmlgraphics:batik-xml:jar:1.7
 - org.slf4j:jcl-over-slf4j:jar:1.7.6
-- org.activiti:activiti-process-validation:jar:5.19.0
 - org.mybatis:mybatis:jar:3.2.5
 - com.h2database:h2:jar:1.4.190
+- org.springframework:spring-web:jar:4.1.5.RELEASE
+- org.springframework.security:spring-security-crypto:jar:3.2.3.RELEASE
 - org.activiti:activiti-image-generator:jar:5.19.0
-- com.fasterxml.jackson.core:jackson-annotations:jar:2.2.3
-- joda-time:joda-time:jar:2.6
 - javax.activation:activation:jar:1.1.1
-- org.apache.commons:commons-lang3:jar:3.3.2
-- com.fasterxml.jackson.core:jackson-core:jar:2.2.3
-- org.slf4j:slf4j-log4j12:jar:1.7.12
-- org.springframework:spring-beans:jar:4.1.5.RELEASE
+- org.apache.commons:commons-email:jar:1.4
+- com.sun.mail:javax.mail:jar:1.5.2
+- org.springframework:spring-tx:jar:4.1.5.RELEASE
+- com.fasterxml.jackson.core:jackson-databind:jar:2.2.3
+- org.activiti:activiti-process-validation:jar:5.19.0
+- org.apache.xmlgraphics:batik-transcoder:jar:1.7
+- joda-time:joda-time:jar:2.6
+- com.fasterxml.jackson.core:jackson-annotations:jar:2.2.3
+- commons-io:commons-io:jar:1.1
+- org.apache.xmlgraphics:batik-anim:jar:1.7
+- org.springframework.security:spring-security-web:jar:3.2.3.RELEASE
+- org.apache.xmlgraphics:batik-ext:jar:1.7

data/README.md

@@ -1,17 +1,13 @@
 # JrubyActiviti
 
-You can directly access Activiti BPM in JRuby/Rails Application.
+Integrate Activiti BPM in JRuby/Rails, including Activiti Engine, Modeler and Diagram Viewer.
 
 ## Test Environment
-JRuby-9.0.3.0, Activiti-5.19.0
+JRuby-9.0.4.0, Activiti-5.19.0
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'jruby_activiti'
-```
+Edit your application's Gemfile, add `gem 'jruby_activiti'`, and must remove `gem 'therubyrhino'` line.
 
 Run the `bundle install` command to install it.
 
@@ -28,10 +24,14 @@ create  Jarfile
 create  log4j.properties
 create  config/activiti.cfg.xml
 create  config/initializers/jruby_activiti.rb
+route   mount JrubyActiviti::Web => '/activiti' if defined?(JrubyActiviti)
 ```
 
+Add db jar in Jarfile. Example: `jar 'com.h2database:h2', '>= 1.4'`
+
 And then execute `jbundle install`
 
+
 ## Usage
 You can access Activiti directly by using `Activiti`. For example, in a Rails controller
 
@@ -50,8 +50,20 @@ Activiti::RepositoryService.createDeployment().
   deploy()
 ```
 
-## Warning
-Do not create Activiti Engine in a Rails application repeatedly. Otherwise you will get exception `log writing failed. Bad file descriptor - Bad file descriptor`
+## Enable Activiti Modeler and Diagram Viewer in Rails
+visit `localhost:3000/activiti`
+
+Modeler
+`/activiti/modeler.html?modelId=your_model_id`
+
+View Process Definition in Diagram Viewer
+`/activiti/diagram-viewer/index.html?processDefinitionId=v1`
+
+View Process Instance in Diagram Viewer
+`/activiti/diagram-viewer/index.html?processDefinitionId=v1&processInstanceId=v2`
+
+## Known Issue
+`org.activiti:activiti-modeler` includes `org.apache.xmlgraphics:batik-transcoder`, that depends on outdated `org.mozilla:rhino`, which conflicts with rubygem `therubyrhino`. So you must to install `nodejs` in your machine and comment `gem 'therubyrhino'` in `Gemfile`.
 
 ## Thanks
 Inspired by https://github.com/boberetezeke/jruby-activiti

data/java/build.md

@@ -0,0 +1,3 @@
+```
+mvn package
+```

data/java/mapping.md

@@ -0,0 +1,20 @@
+Modeler.java
+  save => org.activiti.rest.editor.model.ModelSaveRestResource.saveModel
+  	add initialize funciton
+  	relace MultiValueMap with HashMap
+  	replace getFirst with get
+  show => org.activiti.rest.editor.model.ModelEditorJsonRestResource.getEditorJson
+  	add initialize funciton
+
+
+StencilsetResource.java
+  getStencilset => org.activiti.rest.editor.main.StencilsetRestResource.getStencilset
+
+
+ProcessDiagram.java => org.activiti.rest.diagram.services.BaseProcessDefinitionDiagramLayoutResource
+  add initialize funciton
+
+
+
+public/editor-app/app-cfg.js
+  from `'contextRoot' : '/activiti-explorer/service'` to `'contextRoot' : 'service'`

data/java/pom.xml

@@ -0,0 +1,30 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>richfisher</groupId>
+  <artifactId>jrubyactiviti</artifactId>
+  <version>2.0</version>
+  <packaging>jar</packaging>
+
+  <name>Maven Quick Start Archetype</name>
+  <url>http://maven.apache.org</url>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.activiti</groupId>
+      <artifactId>activiti-engine</artifactId>
+      <version>5.19.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.activiti</groupId>
+      <artifactId>activiti-modeler</artifactId>
+      <version>5.19.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.activiti</groupId>
+      <artifactId>activiti-diagram-rest</artifactId>
+      <version>5.19.0</version>
+    </dependency>
+  </dependencies>
+</project>

data/java/src/main/java/jrubyactiviti/Modeler.java

@@ -0,0 +1,95 @@
+package jrubyactiviti;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.util.HashMap;
+
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.repository.Model;
+import org.apache.batik.transcoder.TranscoderInput;
+import org.apache.batik.transcoder.TranscoderOutput;
+import org.apache.batik.transcoder.image.PNGTranscoder;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import org.apache.commons.lang3.StringUtils;
+
+public class Modeler {
+  final String MODEL_ID = "modelId";
+  final String MODEL_NAME = "name";
+  final String MODEL_REVISION = "revision";
+  final String MODEL_DESCRIPTION = "description";
+
+  private RepositoryService repositoryService;
+  private ObjectMapper objectMapper;
+
+  public Modeler(RepositoryService repositoryService) {
+    this.repositoryService = repositoryService;
+    this.objectMapper = new ObjectMapper();
+  }
+
+  public void save(String modelId, HashMap<String, String> values) {
+    try {
+      Model model = repositoryService.getModel(modelId);
+      
+      ObjectNode modelJson = (ObjectNode) objectMapper.readTree(model.getMetaInfo());
+      
+      modelJson.put(MODEL_NAME, values.get("name"));
+      modelJson.put(MODEL_DESCRIPTION, values.get("description"));
+      model.setMetaInfo(modelJson.toString());
+      model.setName(values.get("name"));
+      
+      repositoryService.saveModel(model);
+      
+      repositoryService.addModelEditorSource(model.getId(), values.get("json_xml").getBytes("utf-8"));
+      
+      InputStream svgStream = new ByteArrayInputStream(values.get("svg_xml").getBytes("utf-8"));
+      TranscoderInput input = new TranscoderInput(svgStream);
+      
+      PNGTranscoder transcoder = new PNGTranscoder();
+      // Setup output
+      ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+      TranscoderOutput output = new TranscoderOutput(outStream);
+      
+      // Do the transformation
+      transcoder.transcode(input, output);
+      final byte[] result = outStream.toByteArray();
+      repositoryService.addModelEditorSourceExtra(model.getId(), result);
+      outStream.close();
+    } catch (Exception e) {
+      System.out.println("Error saving model"+e);
+      // LOGGER.error("Error saving model", e);
+      throw new ActivitiException("Error saving model", e);
+    }
+  }
+
+  public ObjectNode show(String modelId) {
+    ObjectNode modelNode = null;
+    
+    Model model = repositoryService.getModel(modelId);
+      
+    if (model != null) {
+      try {
+        if (StringUtils.isNotEmpty(model.getMetaInfo())) {
+          modelNode = (ObjectNode) objectMapper.readTree(model.getMetaInfo());
+        } else {
+          modelNode = objectMapper.createObjectNode();
+          modelNode.put(MODEL_NAME, model.getName());
+        }
+        modelNode.put(MODEL_ID, model.getId());
+        ObjectNode editorJsonNode = (ObjectNode) objectMapper.readTree(
+            new String(repositoryService.getModelEditorSource(model.getId()), "utf-8"));
+        modelNode.put("model", editorJsonNode);
+        
+      } catch (Exception e) {
+        System.out.println("Error creating model JSON"+e);
+        // LOGGER.error("Error creating model JSON", e);
+        throw new ActivitiException("Error creating model JSON", e);
+      }
+    }
+    return modelNode;
+  }
+}