cpee 1.3.175 → 1.3.176

data/lib/cpee/handler_notifications.rb

@@ -18,7 +18,7 @@ class NotificationsHandler < Riddl::Utils::Notifications::Producer::HandlerBase
   end
   def ws_close
     @data.unserialize_notifications!(:del,@key)
-    @data.notify('properties/handlers/change', :instance => @data.instance)
+    @data.notify('handler/change', :instance => @data.instance)
   end
   def ws_message(data)
     begin
@@ -34,14 +34,14 @@ class NotificationsHandler < Riddl::Utils::Notifications::Producer::HandlerBase
 
   def create
     @data.unserialize_notifications!(:cre,@key)
-    @data.notify('properties/handlers/change', :instance => @data.instance)
+    @data.notify('handler/change', :instance => @data.instance)
   end
   def delete
     @data.unserialize_notifications!(:del,@key)
-    @data.notify('properties/handlers/change', :instance => @data.instance)
+    @data.notify('handler/change', :instance => @data.instance)
   end
   def update
     @data.unserialize_notifications!(:upd,@key)
-    @data.notify('properties/handlers/change', :instance => @data.instance)
+    @data.notify('handler/change', :instance => @data.instance)
   end
 end

data/lib/cpee/handler_properties.rb

@@ -17,7 +17,7 @@ class PropertiesHandler < Riddl::Utils::Properties::HandlerBase
     case @property
       when 'handlerwrapper'
         @data.unserialize_handlerwrapper!
-        @data.notify('properties/handlerwrapper/change', :instance => @data.instance)
+        @data.notify('handlerwrapper/change', :instance => @data.instance)
       when 'description'
         nots = @data.unserialize_description!
         nots.uniq.each do |noti|
@@ -25,17 +25,17 @@ class PropertiesHandler < Riddl::Utils::Properties::HandlerBase
         end
       when 'endpoints'
         @data.unserialize_endpoints!
-        @data.notify('properties/endpoints/change', :instance => @data.instance)
+        @data.notify('endpoints/change', :instance => @data.instance)
       when 'dataelements'
         @data.unserialize_dataelements!
-        @data.notify('properties/dataelements/change', :instance => @data.instance)
+        @data.notify('dataelements/change', :instance => @data.instance)
       when 'attributes'
         @data.unserialize_attributes!
       when 'positions'  
         @data.unserialize_positions!
-        @data.notify('properties/position/change', :instance => @data.instance)
+        @data.notify('position/change', :instance => @data.instance)
       when 'transformation'  
-        @data.notify('properties/transformation/change', :instance => @data.instance)
+        @data.notify('transformation/change', :instance => @data.instance)
       when 'state'  
         @data.unserialize_state!
       else

data/lib/cpee/implementation.rb

@@ -84,7 +84,7 @@ module CPEE
       callback = @r[2]
       controller[id].mutex.synchronize do
         if controller[id].callbacks.has_key?(callback)
-          controller[id].callbacks[callback].callback(@p)
+          controller[id].callbacks[callback].callback(@p,@h)
         end
       end  
     end

data/server/handlerwrappers/default.rb

@@ -23,8 +23,9 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   end # }}}
 
   def activity_handle(passthrough, parameters) # {{{
-    @controller.notify("running/activity_calling", :instance => @controller.instance, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters)
+    @controller.notify("activity/calling", :instance => @controller.instance, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters)
 
+    result = []
     if passthrough.nil?
       params = []
       callback = Digest::MD5.hexdigest(Kernel::rand().to_s)
@@ -53,21 +54,17 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
 
       status, result, headers = client.request type => params
       raise "Could not #{parameters[:method] || 'post'} #{@handler_endpoint}" if status != 200
-      result = simplify_result(result)
 
       if headers["CPEE_CALLBACK"] && headers["CPEE_CALLBACK"] == 'true'
         @controller.callbacks[callback] = CPEE::Callback.new("callback activity: #{@handler_position}",self,:callback,nil,nil,:http)
         @handler_passthrough = callback
-        return
+      else
+        callback result
       end
     else
       @controller.callbacks[passthrough] = CPEE::Callback.new("callback activity: #{@handler_position}",self,:callback,nil,nil,:http)
       @handler_passthrough = passthrough
-      return
     end
-
-    @handler_returnValue = result
-    @handler_continue.continue
   end # }}}
 
   def activity_result_status # {{{
@@ -92,51 +89,51 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   end # }}}
 
   def inform_activity_done # {{{
-    @controller.notify("running/activity_done", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position)
+    @controller.notify("activity/done", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position)
   end # }}}
   def inform_activity_manipulate # {{{
-    @controller.notify("running/activity_manipulating", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position)
+    @controller.notify("activity/manipulating", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position)
   end # }}}
   def inform_activity_failed(err) # {{{
     puts err.message
     puts err.backtrace
-    @controller.notify("running/activity_failed", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position, :message => err.message, :line => err.backtrace[0].match(/(.*?):(\d+):/)[2], :where => err.backtrace[0].match(/(.*?):(\d+):/)[1])
+    @controller.notify("activity/failed", :endpoint => @handler_endpoint, :instance => @controller.instance, :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)# {{{
-    @controller.notify("properties/description/error", :instance => @controller.instance, :message => err.message)
+    @controller.notify("description/error", :instance => @controller.instance, :message => err.message)
   end# }}}
   def inform_manipulate_change(status,changed_dataelements,changed_endpoints,dataelements,endpoints) # {{{
     unless status.nil?
       @controller.serialize_status!
-      @controller.notify("properties/status/change", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position, :id => status.id, :message => status.message)
+      @controller.notify("status/change", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position, :id => status.id, :message => status.message)
     end  
-    unless dataelements.nil?
+    unless changed_dataelements.nil?
       @controller.serialize_dataelements!
-      @controller.notify("properties/dataelements/change", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position, :changed => changed_dataelements)
+      @controller.notify("dataelements/change", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position, :changed => changed_dataelements)
     end
-    unless endpoints.nil?
+    unless changed_endpoints.nil?
       @controller.serialize_endpoints!
-      @controller.notify("properties/endpoints/change", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position, :changed => changed_endpoints)
+      @controller.notify("endpoints/change", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position, :changed => changed_endpoints)
     end  
   end # }}}
   def inform_position_change(ipc={}) # {{{
     @controller.serialize_positions!
     ipc[:instance] = @controller.instance
-    @controller.notify("properties/position/change", ipc)
+    @controller.notify("position/change", ipc)
   end # }}}
   def inform_state_change(newstate) # {{{
     if @controller
       @controller.serialize_state!
-      @controller.notify("properties/state/change", :instance => @controller.instance, :state => newstate)
+      @controller.notify("state/change", :instance => @controller.instance, :state => newstate)
     end
   end # }}}
 
   def vote_sync_after # {{{
-    @controller.call_vote("running/syncing_after", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position)
+    @controller.call_vote("activity/syncing_after", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position)
   end # }}}
   def vote_sync_before(parameters=nil) # {{{
-    @controller.call_vote("running/syncing_before", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position)
+    @controller.call_vote("activity/syncing_before", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position)
   end # }}}
 
   def simplify_result(result)
@@ -158,12 +155,20 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     result
   end
 
-  def callback(result)
+  def callback(result=nil,options={})
     result = simplify_result(result)
-    @handler_returnValue = result
-    @controller.callbacks.delete(@handler_passthrough)
-    @handler_passthrough = nil
-    @handler_continue.continue
+    if options['CPEE_UPDATE'] 
+      @handler_returnValue = result
+      if options['CPEE_UPDATE_STATUS']
+        @controller.notify("activity/status", :instance => @controller.instance, :activity => @handler_position, :endpoint => @handler_endpoint, :status => options['CPEE_UPDATE_STATUS'])
+      end
+      @handler_continue.continue WEEL::Signal::Again
+    else
+      @controller.callbacks.delete(@handler_passthrough)
+      @handler_returnValue = result
+      @handler_passthrough = nil
+      @handler_continue.continue
+    end
   end
 
    def simulate(type,nesting,tid,parent,parameters={}) #{{{

data/server/handlerwrappers/soap.rb

@@ -26,7 +26,7 @@ class SOAPHandlerWrapper < 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("activity/calling", :instance => "#{@url}/#{@controller.id}", :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters)
 
     if passthrough.nil?
       callback = Digest::MD5.hexdigest(Kernel::rand().to_s)
@@ -92,56 +92,56 @@ class SOAPHandlerWrapper < WEEL::HandlerWrapperBase
   end # }}}
 
   def inform_activity_done # {{{
-    @controller.notify("running/activity_done", :endpoint => @handler_endpoint, :instance => "#{@url}/#{@controller.id}", :activity => @handler_position)
+    @controller.notify("activity/done", :endpoint => @handler_endpoint, :instance => "#{@url}/#{@controller.id}", :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("activity/manipulating", :endpoint => @handler_endpoint, :instance => "#{@url}/#{@controller.id}", :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("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])
   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("description/error", :instance => "#{@url}/#{@controller.id}", :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("status/change", :endpoint => @handler_endpoint, :instance => "#{@url}/#{@controller.id}", :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("dataelements/change", :endpoint => @handler_endpoint, :instance => "#{@url}/#{@controller.id}", :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("endpoints/change", :endpoint => @handler_endpoint, :instance => "#{@url}/#{@controller.id}", :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("position/change", ipc)
   end # }}}
   def inform_state_change(newstate) # {{{
     if @controller
       @controller.serialize_state!
-      @controller.notify("properties/state/change", :instance => "#{@url}/#{@controller.id}", :state => newstate)
+      @controller.notify("state/change", :instance => "#{@url}/#{@controller.id}", :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("activity/syncing_after", :endpoint => @handler_endpoint, :instance => "#{@url}/#{@controller.id}", :activity => @handler_position)
   end # }}}
   def vote_sync_before # {{{
-    @controller.call_vote("running/syncing_before", :endpoint => @handler_endpoint, :instance => "#{@url}/#{@controller.id}", :activity => @handler_position)
+    @controller.call_vote("activity/syncing_before", :endpoint => @handler_endpoint, :instance => "#{@url}/#{@controller.id}", :activity => @handler_position)
   end # }}}
 
-  def callback(result)
+  def callback(result=nil,options={})
     @handler_returnValue = result
     @controller.callbacks.delete(@handler_passthrough)
     @handler_passthrough = nil

data/server/instances/1/properties.xml

@@ -1,90 +1,65 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
-  <info>Enter info here</info>
-  <state>ready</state>
+  <info>asd</info>
+  <state>stopped</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <positions/>
+  <positions>
+    <a1>after</a1>
+  </positions>
   <dataelements>
-    <persons>3</persons>
-    <card>Visa_12345</card>
-    <airline>null</airline>
-    <hotels>[]</hotels>
-    <from>Vienna</from>
-    <to>Prague</to>
-    <costs>0</costs>
+    <x/>
   </dataelements>
   <endpoints>
-    <bookAir>http://gruppe.wst.univie.ac.at/~mangler/services/airline.php</bookAir>
-    <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
-    <approve>http://gruppe.wst.univie.ac.at/~mangler/services/approval.php</approve>
+    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
   </endpoints>
-  <dsl>call :a1, :bookAir, { :method =&gt; "post", :parameters =&gt; { :from =&gt; data.from, :to =&gt; data.to, :persons =&gt; data.persons } }, &lt;&lt;-end 
-  data.airline = result.value('id')
-    data.costs += result.value('costs').to_f
-    status.update 1, 'Hotel'
-end
-parallel do
-  loop pre_test{data.persons &gt; 0} do
-    parallel_branch data.persons do |p|
-      call :a2, :bookHotel, { :method =&gt; "post", :parameters =&gt; { :to =&gt; data.to } }, &lt;&lt;-end 
-        data.hotels &lt;&lt; result.value('id')
-          data.costs += result.value('costs').to_f
-      end
-    end
-    manipulate :a3, &lt;&lt;-end 
-      data.persons -= 1
-    end
+  <dsl>parallel do
+  parallel_branch do
+    call :a4, :timeout, { :label =&gt; nil, :method =&gt; "post", :parameters =&gt; { :timeout =&gt; a } }
   end
-end
-choose do
-  alternative data.costs &gt; 700 do
-    call :a4, :approve, { :method =&gt; "post", :parameters =&gt; { :costs =&gt; data.costs } }
+  parallel_branch do
+    call :a5, :timeout, { :label =&gt; nil, :method =&gt; "post", :parameters =&gt; { :timeout =&gt; a } }
   end
 end
+call :a2, :timeout, { :label =&gt; nil, :method =&gt; "post", :parameters =&gt; { :timeout =&gt; b } }, &lt;&lt;-end 
+data.x += "a2,"
+end
 </dsl>
   <dslx>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="bookAir">
-        <parameters>
-          <method>post</method>
-          <parameters>
-            <from>data.from</from>
-            <to>data.to</to>
-            <persons>data.persons</persons>
-          </parameters>
-        </parameters>
-        <manipulate output="result">  data.airline = result.value('id')
-    data.costs += result.value('costs').to_f
-    status.update 1, 'Hotel'</manipulate>
-      </call>
-      <parallel>
-        <loop pre_test="data.persons &gt; 0">
-          <parallel_branch pass="data.persons" local="p">
-            <call id="a2" endpoint="bookHotel">
+      <!--{{{-->
+      <parallel svg-label="">
+        <parallel_branch svg-label="">
+          <call id="a4" endpoint="timeout" svg-label="">
+            <parameters>
+              <label/>
+              <method>post</method>
               <parameters>
-                <method>post</method>
-                <parameters>
-                  <to>data.to</to>
-                </parameters>
+                <timeout>a</timeout>
               </parameters>
-              <manipulate output="result">        data.hotels &lt;&lt; result.value('id')
-          data.costs += result.value('costs').to_f</manipulate>
-            </call>
-          </parallel_branch>
-          <manipulate id="a3">      data.persons -= 1</manipulate>
-        </loop>
-      </parallel>
-      <choose>
-        <alternative condition="data.costs &gt; 700">
-          <call id="a4" endpoint="approve">
+            </parameters>
+          </call>
+        </parallel_branch>
+        <parallel_branch svg-label="">
+          <call id="a5" endpoint="timeout" svg-label="">
             <parameters>
+              <label/>
               <method>post</method>
               <parameters>
-                <costs>data.costs</costs>
+                <timeout>a</timeout>
               </parameters>
             </parameters>
           </call>
-        </alternative>
-      </choose>
+        </parallel_branch>
+      </parallel>
+      <call id="a2" endpoint="timeout">
+        <parameters>
+          <label/>
+          <method>post</method>
+          <parameters>
+            <timeout>b</timeout>
+          </parameters>
+        </parameters>
+        <manipulate>data.x += "a2,"</manipulate>
+      </call>
     </description>
   </dslx>
   <status>
@@ -93,48 +68,41 @@ end
   </status>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <call id="a1" endpoint="bookAir">
-        <parameters>
-          <method>post</method>
-          <parameters>
-            <from>data.from</from>
-            <to>data.to</to>
-            <persons>data.persons</persons>
-          </parameters>
-        </parameters>
-        <manipulate output="result">  data.airline = result.value('id')
-    data.costs += result.value('costs').to_f
-    status.update 1, 'Hotel'</manipulate>
-      </call>
-      <parallel>
-        <loop pre_test="data.persons &gt; 0">
-          <parallel_branch pass="data.persons" local="p">
-            <call id="a2" endpoint="bookHotel">
+      <!--{{{-->
+      <parallel svg-label="">
+        <parallel_branch svg-label="">
+          <call id="a4" endpoint="timeout" svg-label="">
+            <parameters>
+              <label/>
+              <method>post</method>
               <parameters>
-                <method>post</method>
-                <parameters>
-                  <to>data.to</to>
-                </parameters>
+                <timeout>a</timeout>
               </parameters>
-              <manipulate output="result">        data.hotels &lt;&lt; result.value('id')
-          data.costs += result.value('costs').to_f</manipulate>
-            </call>
-          </parallel_branch>
-          <manipulate id="a3">      data.persons -= 1</manipulate>
-        </loop>
-      </parallel>
-      <choose>
-        <alternative condition="data.costs &gt; 700">
-          <call id="a4" endpoint="approve">
+            </parameters>
+          </call>
+        </parallel_branch>
+        <parallel_branch svg-label="">
+          <call id="a5" endpoint="timeout" svg-label="">
             <parameters>
+              <label/>
               <method>post</method>
               <parameters>
-                <costs>data.costs</costs>
+                <timeout>a</timeout>
               </parameters>
             </parameters>
           </call>
-        </alternative>
-      </choose>
+        </parallel_branch>
+      </parallel>
+      <call id="a2" endpoint="timeout">
+        <parameters>
+          <label/>
+          <method>post</method>
+          <parameters>
+            <timeout>b</timeout>
+          </parameters>
+        </parameters>
+        <manipulate>data.x += "a2,"</manipulate>
+      </call>
     </description>
   </description>
   <transformation>