cpee 1.3.122 → 1.3.123

data/cockpit/index.html

@@ -32,6 +32,7 @@
     <script type="text/javascript" src="lib/underscore.min.js"></script>
     <script type="text/javascript" src="lib/jquery.caret.min.js"></script>
     <script type="text/javascript" src="lib/jquery.cookie.js"></script>
+    <script type="text/javascript" src="lib/jquery.redraw.js"></script>
 
     <script type="text/javascript" src="lib/contextmenu.js"></script>
     <script type="text/javascript" src="lib/wfadaptor.js"></script>

data/cockpit/js/instance.js

@@ -312,6 +312,7 @@ function monitor_instance_dsl() {// {{{
               save_description();
               manifestation.events.click(svgid,undefined);
             };
+            $('#graphcanvas').redraw();
 
             monitor_instance_pos();
           }

data/cockpit/lib/jquery.redraw.js

@@ -0,0 +1,3 @@
+$.fn.redraw = function(){
+  $(this).parent().parent().append(' ');
+};

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.122"
+  s.version          = "1.3.123"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   s.summary          = "Preliminary release of cloud process execution engine (cpee). If you just need workflow execution, without a rest/xmpp service exposing it, then use WEEL"

data/lib/cpee/controller.rb

@@ -60,7 +60,7 @@ module CPEE
       @votes_results = {}
       @communication = {}
       @callbacks = {}
-      @instance = EmptyWorkflow.new(self,opts[:url])
+      @instance = EmptyWorkflow.new(self)
       @positions = []
       @thread = nil
       @mutex = Mutex.new
@@ -101,9 +101,18 @@ module CPEE
     attr_reader :callbacks
     attr_reader :mutex
 
+    def base_url 
+      @opts[:url]
+    end
+    def base_jid
+      @opts[:jid]
+    end
     def instance_url 
       "#{@opts[:url]}/#{@id}"
     end
+    def instance_jid
+      "#{@opts[:jid]}/#{@id}"
+    end
     def xmpp 
       @opts[:xmpp]
     end

data/server/handlerwrappers/default.rb

@@ -15,7 +15,6 @@
 class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   def initialize(arguments,endpoint=nil,position=nil,continue=nil) # {{{
     @controller = arguments[0]
-    @url = arguments[1]
     @handler_continue = continue
     @handler_endpoint = endpoint
     @handler_position = position
@@ -24,7 +23,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   end # }}}
 
   def activity_handle(passthrough, parameters) # {{{
-    @controller.notify("running/activity_calling", :instance => "#{@url}/#{@controller.id}", :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters)
+    @controller.notify("running/activity_calling", :instance => @controller.instance_url, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters)
 
     if passthrough.nil?
       params = []
@@ -32,8 +31,8 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
       (parameters[:parameters] || {}).each do |k,v|
         params <<  Riddl::Parameter::Simple.new("#{k}",CPEE::ValueHelper::generate(v))
       end
-      params << Riddl::Header.new("CPEE_BASE",@url)
-      params << Riddl::Header.new("CPEE_INSTANCE","#{@url}/#{@controller.id}")
+      params << Riddl::Header.new("CPEE_BASE",@controller.base_url)
+      params << Riddl::Header.new("CPEE_INSTANCE",@controller.instance_url)
       params << Riddl::Header.new("CPEE_CALLBACK",callback)
 
       type = parameters[:method] || 'post'
@@ -92,53 +91,52 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   end # }}}
 
   def inform_activity_done # {{{
-    @controller.notify("running/activity_done", :endpoint => @handler_endpoint, :instance => "#{@url}/#{@controller.id}", :activity => @handler_position)
+    @controller.notify("running/activity_done", :endpoint => @handler_endpoint, :instance => @controller.instance_url, :activity => @handler_position)
   end # }}}
   def inform_activity_manipulate # {{{
-    @controller.notify("running/activity_manipulating", :endpoint => @handler_endpoint, :instance => "#{@url}/#{@controller.id}", :activity => @handler_position)
+    @controller.notify("running/activity_manipulating", :endpoint => @handler_endpoint, :instance => @controller.instance_url, :activity => @handler_position)
   end # }}}
   def inform_activity_failed(err) # {{{
     puts err.message
     puts err.backtrace
-    @controller.notify("running/activity_failed", :endpoint => @handler_endpoint, :instance => "#{@url}/#{@controller.id}", :activity => @handler_position, :message => err.message, :line => err.backtrace[0].match(/(.*?):(\d+):/)[2], :where => err.backtrace[0].match(/(.*?):(\d+):/)[1])
+    @controller.notify("running/activity_failed", :endpoint => @handler_endpoint, :instance => @controller.instance_url, :activity => @handler_position, :message => err.message, :line => err.backtrace[0].match(/(.*?):(\d+):/)[2], :where => err.backtrace[0].match(/(.*?):(\d+):/)[1])
   end # }}}
 
   def inform_syntax_error(err,code)# {{{
     puts err.message
     puts err.backtrace
-    @controller.notify("properties/description/error", :instance => "#{@url}/#{@controller.id}", :message => err.message)
+    @controller.notify("properties/description/error", :instance => @controller.instance_url, :message => err.message)
   end# }}}
   def inform_manipulate_change(status,dataelements,endpoints) # {{{
     unless status.nil?
       @controller.serialize_status!
-      @controller.notify("properties/status/change", :endpoint => @handler_endpoint, :instance => "#{@url}/#{@controller.id}", :activity => @handler_position, :id => status.id, :message => status.message)
+      @controller.notify("properties/status/change", :endpoint => @handler_endpoint, :instance => @controller.instance_url, :activity => @handler_position, :id => status.id, :message => status.message)
     end  
     unless dataelements.nil?
       @controller.serialize_dataelements!
-      @controller.notify("properties/dataelements/change", :endpoint => @handler_endpoint, :instance => "#{@url}/#{@controller.id}", :activity => @handler_position, :changed => dataelements)
+      @controller.notify("properties/dataelements/change", :endpoint => @handler_endpoint, :instance => @controller.instance_url, :activity => @handler_position, :changed => dataelements)
     end
     unless endpoints.nil?
       @controller.serialize_endpoints!
-      @controller.notify("properties/endpoints/change", :endpoint => @handler_endpoint, :instance => "#{@url}/#{@controller.id}", :activity => @handler_position, :changed => endpoints)
+      @controller.notify("properties/endpoints/change", :endpoint => @handler_endpoint, :instance => @controller.instance_url, :activity => @handler_position, :changed => endpoints)
     end  
   end # }}}
   def inform_position_change(ipc={}) # {{{
     @controller.serialize_positions!
-    ipc[:instance] = "#{@url}/#{@controller.id}"
-    @controller.notify("properties/position/change", ipc)
+    @controller.notify("properties/position/change", :instance => @controller.instance_url)
   end # }}}
   def inform_state_change(newstate) # {{{
     if @controller
       @controller.serialize_state!
-      @controller.notify("properties/state/change", :instance => "#{@url}/#{@controller.id}", :state => newstate)
+      @controller.notify("properties/state/change", :instance => @controller.instance_url, :state => newstate)
     end
   end # }}}
 
   def vote_sync_after # {{{
-    @controller.call_vote("running/syncing_after", :endpoint => @handler_endpoint, :instance => "#{@url}/#{@controller.id}", :activity => @handler_position)
+    @controller.call_vote("running/syncing_after", :endpoint => @handler_endpoint, :instance => @controller.instance_url, :activity => @handler_position)
   end # }}}
   def vote_sync_before(parameters=nil) # {{{
-    @controller.call_vote("running/syncing_before", :endpoint => @handler_endpoint, :instance => "#{@url}/#{@controller.id}", :activity => @handler_position)
+    @controller.call_vote("running/syncing_before", :endpoint => @handler_endpoint, :instance => @controller.instance_url, :activity => @handler_position)
   end # }}}
 
   def callback(result)
@@ -166,7 +164,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
 
     @controller.call_vote("simulating/step", 
       :endpoint => @handler_endpoint, 
-      :instance => "#{@url}/#{@controller.id}", 
+      :instance => @controller.instance_url, 
       :activity => tid, 
       :type => type, 
       :nesting => nesting,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.3.122
+  version: 1.3.123
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -126,6 +126,7 @@ files:
 - cockpit/lib/contextmenu.css
 - cockpit/lib/util.js
 - cockpit/lib/underscore.min.js
+- cockpit/lib/jquery.redraw.js
 - cockpit/lib/strftime.min.js
 - cockpit/lib/printf.js
 - cockpit/lib/jquery.min.js