cpee 1.3.111 → 1.3.115

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.111"
+  s.version          = "1.3.115"
   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

@@ -100,6 +100,10 @@ module CPEE
     attr_reader :notifications
     attr_reader :callbacks
     attr_reader :mutex
+
+    def instance_url 
+      "#{@opts[:url]}/#{@id}"
+    end
     
     def sim # {{{
       @thread.join if !@thread.nil? && @thread.alive?
@@ -302,6 +306,7 @@ module CPEE
     end #}}}
     def unserialize_description! #{{{
       dsl = nil
+      nots = []
       @properties.modify do |doc|
         dsl   = doc.find("/p:properties/p:dsl").first
         dslx  = doc.find("/p:properties/p:dslx").first
@@ -356,6 +361,7 @@ module CPEE
             @instance.data[k.value] = ValueHelper::parse(v.value)
             node.add(k.value,ValueHelper::generate(v.value))
           end  
+          nots << ["properties/dataelements/change", {:instance => instance_url, :changed => JSON::generate(@instance.data)}]
         end  
 
         ### enpoints extraction
@@ -380,8 +386,10 @@ module CPEE
             @instance.endpoints[k.value] = ValueHelper::parse(v.value)
             node.add(k.value,ValueHelper::generate(v.value))
           end  
+          nots << ["properties/endpoints/change", {:instance => instance_url, :changed => JSON::generate(@instance.endpoints)}]
         end  
       end
+      nots
     end #}}}
 
     def notify(what,content={})# {{{

data/lib/cpee/handler_notifications.rb

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

data/lib/cpee/handler_properties.rb

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

data/lib/cpee/implementation.rb

@@ -35,13 +35,14 @@ module CPEE
     opts[:transformation_service]     ||= File.expand_path(File.dirname(__FILE__) + '/../../server/resources/transformation.xml')
 
     Proc.new do
+      Dir[opts[:handlerwrappers] + "/*.rb"].each do |h|
+        require h
+      end
+
       controller = {}
       Dir[opts[:instances] + '/*/properties.xml'].map{|e|::File::basename(::File::dirname(e))}.each do |id|
         controller[id.to_i] = Controller.new(id,opts)
       end
-      Dir[opts[:handlerwrappers] + "/*.rb"].each do |h|
-        require h
-      end
 
       interface 'properties' do |r|
         id = r[:h]['RIDDL_DECLARATION_PATH'].split('/')[1].to_i

data/server/resources/properties.schema.active

@@ -61,6 +61,7 @@
   <state type="state" modifiable="true">
     <ready>
       <running putable="true"/>
+      <ready putable="true"/>
       <simulating putable="true"/>
     </ready>  
     <running>
@@ -72,6 +73,7 @@
       <stopped putable="false"/>
     </stopping>
     <stopped>
+      <stopped putable="true"/>
       <running putable="true"/>
       <simulating putable="true"/>
     </stopped>  

data/server/resources/properties.schema.finished

@@ -60,6 +60,7 @@
   </transformation>
   <state type="state" modifiable="false" mutable="false">
     <ready>
+      <ready putable="true"/>
       <running putable="true"/>
       <simulating putable="true"/>
     </ready>  
@@ -72,6 +73,7 @@
       <stopped putable="false"/>
     </stopping>
     <stopped>
+      <stopped putable="true"/>
       <running putable="true"/>
       <simulating putable="true"/>
     </stopped>  

data/server/resources/properties.schema.inactive

@@ -61,6 +61,7 @@
   <state type="state" modifiable="true">
     <ready>
       <running putable="true"/>
+      <ready putable="true"/>
       <simulating putable="true"/>
     </ready>  
     <running>
@@ -72,6 +73,7 @@
       <stopped putable="false"/>
     </stopping>
     <stopped>
+      <stopped putable="true"/>
       <running putable="true"/>
       <simulating putable="true"/>
     </stopped>  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.3.111
+  version: 1.3.115
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-13 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl