jruby_activiti 2.0.5 → 2.0.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/{test/resources → config}/activiti.cfg.xml +0 -0
- data/{log4j.properties → config/log4j.properties} +0 -0
- data/config.ru +1 -1
- data/java/src/main/java/{jrubyactiviti → org/jrubyactiviti}/ModelDeployer.java +1 -1
- data/java/src/main/java/{jrubyactiviti → org/jrubyactiviti}/Modeler.java +1 -1
- data/java/src/main/java/{jrubyactiviti → org/jrubyactiviti}/ProcessDiagram.java +1 -1
- data/java/src/main/java/{jrubyactiviti → org/jrubyactiviti}/ProcessInstanceHighlights.java +1 -1
- data/java/src/main/java/{jrubyactiviti → org/jrubyactiviti}/StencilsetResource.java +1 -1
- data/lib/generators/jruby_activiti/install_generator.rb +1 -1
- data/lib/jar/jrubyactiviti-2.0.jar +0 -0
- data/lib/jruby_activiti/version.rb +1 -1
- data/lib/jruby_activiti/web.rb +7 -7
- data/lib/jruby_activiti.rb +5 -2
- data/test/instance_hights_test.rb +1 -1
- data/test/model_deployer_test.rb +1 -1
- data/test/modeler_test.rb +1 -1
- data/test/process_diagram_test.rb +2 -2
- data/test/stencilset_test.rb +1 -1
- data/test/test_helper.rb +1 -1
- data/web/views/layout.erb +1 -1
- metadata +9 -10
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a9c7f264e3bb776d31bac0cf36e1a9ded6652173
|
4
|
+
data.tar.gz: 23c474215ffb87fc1f88b030b6b29bbeaadc734b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 9e4ceecb3bb378c32f8b448118f9ddca2f90f21be34044c64a00e987767434a35aa645bc5fddd1ed2b73d700364ba6c55b7c3233696447618262a33937940a66
|
7
|
+
data.tar.gz: 9d557f19bd064038470a33316b3087bbf275890fc4cf6ae27af000639aafe5c79f425712d709f429dced3ef0d0370298d08201f2172a39a68fe421d9d9044e21
|
data/README.md
CHANGED
@@ -21,7 +21,7 @@ It will create 4 files, edit the log4j.properties, config/activiti.cfg.xml as yo
|
|
21
21
|
|
22
22
|
```
|
23
23
|
create Jarfile
|
24
|
-
create log4j.properties
|
24
|
+
create config/log4j.properties
|
25
25
|
create config/activiti.cfg.xml
|
26
26
|
create config/initializers/jruby_activiti.rb
|
27
27
|
route mount JrubyActiviti::Web => '/activiti' if defined?(JrubyActiviti)
|
File without changes
|
File without changes
|
data/config.ru
CHANGED
Binary file
|
data/lib/jruby_activiti/web.rb
CHANGED
@@ -36,24 +36,24 @@ module JrubyActiviti
|
|
36
36
|
|
37
37
|
get "/service/model/:model_id/json" do
|
38
38
|
model = Activiti::RepositoryService.createModelQuery().modelId(params['model_id']).singleResult()
|
39
|
-
modeler =
|
39
|
+
modeler = org.jrubyactiviti.Modeler.new(Activiti::RepositoryService)
|
40
40
|
modeler.show(model.getId()).to_s
|
41
41
|
end
|
42
42
|
|
43
43
|
get "/service/editor/stencilset" do
|
44
|
-
|
44
|
+
org.jrubyactiviti.StencilsetResource.getStencilset().to_s
|
45
45
|
end
|
46
46
|
|
47
47
|
put "/service/model/:model_id/save" do
|
48
48
|
model = Activiti::RepositoryService.createModelQuery().modelId(params['model_id']).singleResult()
|
49
49
|
map = Activiti::Utils.hash_to_map(params)
|
50
|
-
modeler =
|
50
|
+
modeler = org.jrubyactiviti.Modeler.new(Activiti::RepositoryService)
|
51
51
|
modeler.save(model.getId(), map)
|
52
52
|
200
|
53
53
|
end
|
54
54
|
|
55
55
|
get "/service/process-definition/:process_definition_id/diagram-layout" do
|
56
|
-
diagramer =
|
56
|
+
diagramer = org.jrubyactiviti.ProcessDiagram.new(
|
57
57
|
Activiti::RuntimeService,
|
58
58
|
Activiti::RepositoryService,
|
59
59
|
Activiti::HistoryService)
|
@@ -63,7 +63,7 @@ module JrubyActiviti
|
|
63
63
|
|
64
64
|
# seems not be used
|
65
65
|
get "/service/process-instance/:process_instance_id/diagram-layout" do
|
66
|
-
diagramer =
|
66
|
+
diagramer = org.jrubyactiviti.ProcessDiagram.new(
|
67
67
|
Activiti::RuntimeService,
|
68
68
|
Activiti::RepositoryService,
|
69
69
|
Activiti::HistoryService)
|
@@ -72,7 +72,7 @@ module JrubyActiviti
|
|
72
72
|
end
|
73
73
|
|
74
74
|
get "/service/process-instance/:process_instance_id/highlights" do
|
75
|
-
highlighter =
|
75
|
+
highlighter = org.jrubyactiviti.ProcessInstanceHighlights.new(
|
76
76
|
Activiti::RuntimeService,
|
77
77
|
Activiti::RepositoryService,
|
78
78
|
Activiti::HistoryService)
|
@@ -103,7 +103,7 @@ module JrubyActiviti
|
|
103
103
|
end
|
104
104
|
|
105
105
|
get "/models/:model_id/deploy" do
|
106
|
-
deployer =
|
106
|
+
deployer = org.jrubyactiviti.ModelDeployer.new(
|
107
107
|
Activiti::RepositoryService,
|
108
108
|
params[:model_id])
|
109
109
|
deployer.deployModel()
|
data/lib/jruby_activiti.rb
CHANGED
@@ -1,3 +1,6 @@
|
|
1
|
+
require 'java'
|
2
|
+
$CLASSPATH << "config"
|
3
|
+
|
1
4
|
require "jruby_activiti/version"
|
2
5
|
require "jruby_activiti/web"
|
3
6
|
# require File.dirname(__FILE__) + '/../java/target/jrubyactiviti-2.0.jar'
|
@@ -18,7 +21,7 @@ module JrubyActiviti
|
|
18
21
|
yield self if block_given?
|
19
22
|
self.config_path ||= "config/activiti.cfg.xml"
|
20
23
|
|
21
|
-
configuration =
|
24
|
+
configuration = org.activiti.engine.ProcessEngineConfiguration.
|
22
25
|
createProcessEngineConfigurationFromResource(self.config_path)
|
23
26
|
@engine = configuration.buildProcessEngine
|
24
27
|
self.set_activiti_const
|
@@ -39,7 +42,7 @@ module JrubyActiviti
|
|
39
42
|
|
40
43
|
module Utils
|
41
44
|
def self.hash_to_map(hash)
|
42
|
-
map =
|
45
|
+
map = java.util.HashMap.new
|
43
46
|
hash.each do |k,v|
|
44
47
|
map.put(k.to_s,v.to_s)
|
45
48
|
end
|
@@ -2,7 +2,7 @@ require 'test_helper'
|
|
2
2
|
|
3
3
|
class InstanceHightsTest < Minitest::Test
|
4
4
|
def test_instance_diagram
|
5
|
-
highlighter =
|
5
|
+
highlighter = org.jrubyactiviti.ProcessInstanceHighlights.new(
|
6
6
|
Activiti::RuntimeService,
|
7
7
|
Activiti::RepositoryService,
|
8
8
|
Activiti::HistoryService)
|
data/test/model_deployer_test.rb
CHANGED
@@ -13,7 +13,7 @@ class ModelDeployerTest < Minitest::Test
|
|
13
13
|
|
14
14
|
def test_deploy
|
15
15
|
model = create_model
|
16
|
-
deployer =
|
16
|
+
deployer = org.jrubyactiviti.ModelDeployer.new(Activiti::RepositoryService, model.getId())
|
17
17
|
|
18
18
|
assert_difference 'Activiti::RepositoryService.createProcessDefinitionQuery().count()', 1 do
|
19
19
|
deployer.deployModel()
|
data/test/modeler_test.rb
CHANGED
@@ -2,7 +2,7 @@ require 'test_helper'
|
|
2
2
|
|
3
3
|
class ProcessDiagramTest < Minitest::Test
|
4
4
|
def test_definition_diagram
|
5
|
-
diagramer =
|
5
|
+
diagramer = org.jrubyactiviti.ProcessDiagram.new(
|
6
6
|
Activiti::RuntimeService,
|
7
7
|
Activiti::RepositoryService,
|
8
8
|
Activiti::HistoryService)
|
@@ -17,7 +17,7 @@ class ProcessDiagramTest < Minitest::Test
|
|
17
17
|
end
|
18
18
|
|
19
19
|
def test_instance_diagram
|
20
|
-
diagramer =
|
20
|
+
diagramer = org.jrubyactiviti.ProcessDiagram.new(
|
21
21
|
Activiti::RuntimeService,
|
22
22
|
Activiti::RepositoryService,
|
23
23
|
Activiti::HistoryService)
|
data/test/stencilset_test.rb
CHANGED
data/test/test_helper.rb
CHANGED
data/web/views/layout.erb
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
<!doctype html>
|
2
2
|
<html>
|
3
3
|
<head>
|
4
|
-
<title
|
4
|
+
<title>Jruby Activiti</title>
|
5
5
|
<meta name="viewport" content="width=device-width,initial-scale=1.0" />
|
6
6
|
<link rel="shortcut icon" type="image/ico" href="<%= root_path %>images/favicon.ico" />
|
7
7
|
<link href="<%= root_path %>stylesheets/bootstrap.css" media="screen" rel="stylesheet" type="text/css" />
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: jruby_activiti
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.
|
4
|
+
version: 2.0.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- richfisher
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-01-
|
11
|
+
date: 2016-01-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
requirement: !ruby/object:Gem::Requirement
|
@@ -69,14 +69,16 @@ files:
|
|
69
69
|
- README.md
|
70
70
|
- Rakefile
|
71
71
|
- config.ru
|
72
|
+
- config/activiti.cfg.xml
|
73
|
+
- config/log4j.properties
|
72
74
|
- java/build.md
|
73
75
|
- java/mapping.md
|
74
76
|
- java/pom.xml
|
75
|
-
- java/src/main/java/jrubyactiviti/ModelDeployer.java
|
76
|
-
- java/src/main/java/jrubyactiviti/Modeler.java
|
77
|
-
- java/src/main/java/jrubyactiviti/ProcessDiagram.java
|
78
|
-
- java/src/main/java/jrubyactiviti/ProcessInstanceHighlights.java
|
79
|
-
- java/src/main/java/jrubyactiviti/StencilsetResource.java
|
77
|
+
- java/src/main/java/org/jrubyactiviti/ModelDeployer.java
|
78
|
+
- java/src/main/java/org/jrubyactiviti/Modeler.java
|
79
|
+
- java/src/main/java/org/jrubyactiviti/ProcessDiagram.java
|
80
|
+
- java/src/main/java/org/jrubyactiviti/ProcessInstanceHighlights.java
|
81
|
+
- java/src/main/java/org/jrubyactiviti/StencilsetResource.java
|
80
82
|
- java/src/main/resources/stencilset.json
|
81
83
|
- jruby_activiti.gemspec
|
82
84
|
- lib/generators/jruby_activiti/install_generator.rb
|
@@ -86,14 +88,12 @@ files:
|
|
86
88
|
- lib/jruby_activiti.rb
|
87
89
|
- lib/jruby_activiti/version.rb
|
88
90
|
- lib/jruby_activiti/web.rb
|
89
|
-
- log4j.properties
|
90
91
|
- test/activiti_test.rb
|
91
92
|
- test/instance_hights_test.rb
|
92
93
|
- test/model_deployer_test.rb
|
93
94
|
- test/modeler_test.rb
|
94
95
|
- test/process_diagram_test.rb
|
95
96
|
- test/resources/VacationRequest.bpmn20.xml
|
96
|
-
- test/resources/activiti.cfg.xml
|
97
97
|
- test/resources/model_example_editor_source.json
|
98
98
|
- test/resources/model_init_editor_source.json
|
99
99
|
- test/resources/model_json_xml.json
|
@@ -426,7 +426,6 @@ test_files:
|
|
426
426
|
- test/modeler_test.rb
|
427
427
|
- test/process_diagram_test.rb
|
428
428
|
- test/resources/VacationRequest.bpmn20.xml
|
429
|
-
- test/resources/activiti.cfg.xml
|
430
429
|
- test/resources/model_example_editor_source.json
|
431
430
|
- test/resources/model_init_editor_source.json
|
432
431
|
- test/resources/model_json_xml.json
|