rservicebus 0.1.57 → 0.1.58

data/lib/rservicebus.rb

@@ -35,6 +35,7 @@ require "rservicebus/CronManager"
 require "rservicebus/CircuitBreaker"
 
 require "rservicebus/AppResource"
+require "rservicebus/ResourceManager"
 
 require "rservicebus/SubscriptionManager"
 require "rservicebus/SubscriptionStorage"
@@ -42,8 +43,14 @@ require "rservicebus/ConfigureSubscriptionStorage"
 
 require "rservicebus/ConfigureMonitor"
 
-require 'rservicebus/Agent'
+require "rservicebus/Agent"
 
+require "rservicebus/SagaLoader.rb"
+require "rservicebus/Saga/Manager.rb"
+require "rservicebus/Saga/Data.rb"
+require "rservicebus/Saga/Base.rb"
+
+require "rservicebus/SagaStorage"
 
 module RServiceBus
 

data/lib/rservicebus/AppResource/ScpUpload.rb

@@ -1,4 +1,5 @@
 require 'net/scp'
+require 'net/sftp'
 
 module RServiceBus
 
@@ -19,10 +20,23 @@ module RServiceBus
 		end
 
         end
-        
+
         def close
         end
 
+        def delete( path, filepattern )
+            RServiceBus.log "Host: #{@uri.host}, User: #{@uri.user}, File Pattern: #{filepattern}, Destination: #{@uri.path}", true
+            Net::SSH.start( @uri.host, @uri.user ) do |ssh|
+                ssh.sftp.connect do |sftp|
+                    files = sftp.dir.glob(path, filepattern)
+                    sftp.dir.foreach(path){
+                        |file|
+                        sftp.remove("#{path}/#{file.name}")
+                    }
+                end
+            end
+        end
+
     end
 
     class AppResource_ScpUpload<AppResource

data/lib/rservicebus/Config.rb

@@ -2,11 +2,12 @@ module RServiceBus
     
     #Marshals configuration information for an rservicebus host
     class Config
-        attr_reader :appName, :messageEndpointMappings, :handlerPathList, :errorQueueName, :maxRetries, :forwardReceivedMessagesTo, :subscriptionUri, :statOutputCountdown, :contractList, :libList, :forwardSentMessagesTo, :mqHost
+        attr_reader :appName, :messageEndpointMappings, :handlerPathList, :sagaPathList, :errorQueueName, :maxRetries, :forwardReceivedMessagesTo, :subscriptionUri, :statOutputCountdown, :contractList, :libList, :forwardSentMessagesTo, :mqHost
         
         @appName
         @messageEndpointMappings
         @handlerPathList
+        @sagaPathList
         @contractList
         
         @errorQueueName
@@ -50,14 +51,25 @@ module RServiceBus
             
             return self
         end
-
+        
+        def loadSagaPathList()
+            path = self.getValue( "SAGAPATH", "./Saga" )
+            @sagaPathList = Array.new
+            path.split( ";" ).each do |path|
+                path = path.strip.chomp( "/" )
+                @sagaPathList << path
+            end
+            
+            return self
+        end
+        
         def loadHostSection()
             @appName = self.getValue( "APPNAME", "RServiceBus" )
             @errorQueueName = self.getValue( "ERROR_QUEUE_NAME", "error" )
             @maxRetries = self.getValue( "MAX_RETRIES", "5" ).to_i
             @statOutputCountdown = self.getValue( "STAT_OUTPUT_COUNTDOWN", "100" ).to_i
             @subscriptionUri = self.getValue( "SUBSCRIPTION_URI", "file:///tmp/#{appName}_subscriptions.yaml" )
-
+            
             auditQueueName = self.getValue( "AUDIT_QUEUE_NAME" )
             if auditQueueName.nil? then
                 @forwardSentMessagesTo = self.getValue( "FORWARD_SENT_MESSAGES_TO" )
@@ -66,22 +78,22 @@ module RServiceBus
                 @forwardSentMessagesTo = auditQueueName
                 @forwardReceivedMessagesTo = auditQueueName
             end
-
+            
             return self
         end
         
         def ensureContractFileExists( path )
             if !( File.exists?( path ) ||
                  File.exists?( "#{path}.rb" ) ) then
-                puts "Error while processing contracts"
-                puts "*** path, #{path}, provided does not exist as a file"
-                abort()
+                 puts "Error while processing contracts"
+                 puts "*** path, #{path}, provided does not exist as a file"
+                 abort()
             end
             if !( File.extname( path ) == "" ||
                  File.extname( path ) == ".rb" ) then
-                puts "Error while processing contracts"
-                puts "*** path, #{path}, should point to a ruby file, with extention .rb"
-                abort()
+                 puts "Error while processing contracts"
+                 puts "*** path, #{path}, should point to a ruby file, with extention .rb"
+                 abort()
             end
         end
         
@@ -134,7 +146,7 @@ module RServiceBus
             end
             return self
         end
-
+        
         def configureMq
             @mqHost = self.getValue( "MQ", "beanstalk://localhost" )
             return self
@@ -153,7 +165,7 @@ module RServiceBus
             pathList.split( ";" ).each do |path|
                 
                 path = path.strip.chomp( "/" )
-
+                
                 if !Dir.exists?( "#{path}" ) then
                     puts "Error while processing working directory list"
                     puts "*** path, #{path}, does not exist"

data/lib/rservicebus/ConfigureAppResource.rb

@@ -5,56 +5,57 @@ module RServiceBus
     #Configure AppResources for an rservicebus host
     class ConfigureAppResource
 
-        def getResources( env, host )
-            resources = Hash.new
+        def getResources( env, host, stateManager, sagaStorage )
+            resourceManager = ResourceManager.new( stateManager, sagaStorage )
+
 
             env.each do |k,v|
                 if v.is_a?(String) and
 					k.start_with?( "RSBFDB_" ) then
                     uri = URI.parse( v )
                     require "rservicebus/AppResource/FluidDb"
-                    resources[k.sub( "RSBFDB_", "" )] = AppResource_FluidDb.new( host, uri )
+                    resourceManager.add k.sub( "RSBFDB_", "" ), AppResource_FluidDb.new( host, uri )
                 elsif v.is_a?(String) and
 					k.start_with?( "RSB_" ) then
                     uri = URI.parse( v )
                     case uri.scheme
                         when "redis"
                     require "rservicebus/AppResource/Redis"
-						resources[k.sub( "RSB_", "" )] = AppResource_Redis.new( host, uri )
+						resourceManager.add k.sub( "RSB_", "" ), AppResource_Redis.new( host, uri )
                         
                         when "mysql"
                         require "rservicebus/AppResource/Mysql"
-                        resources[k.sub( "RSB_", "" )] = AppResource_Mysql.new( host, uri )
+                        resourceManager.add k.sub( "RSB_", "" ), AppResource_Mysql.new( host, uri )
                         
                         when "fluiddbmysql"
                         require "rservicebus/AppResource/FluidDbMysql"
-                        resources[k.sub( "RSB_", "" )] = AppResource_FluidDbMysql.new( host, uri )
+                        resourceManager.add k.sub( "RSB_", "" ), AppResource_FluidDbMysql.new( host, uri )
                         when "fluiddbmysql2"
                         require "rservicebus/AppResource/FluidDbMysql2"
-                        resources[k.sub( "RSB_", "" )] = AppResource_FluidDbMysql2.new( host, uri )
+                        resourceManager.add k.sub( "RSB_", "" ), AppResource_FluidDbMysql2.new( host, uri )
                         when "fluiddbpgsql"
                         require "rservicebus/AppResource/FluidDbPgsql"
-                        resources[k.sub( "RSB_", "" )] = AppResource_FluidDbPgsql.new( host, uri )
+                        resourceManager.add k.sub( "RSB_", "" ), AppResource_FluidDbPgsql.new( host, uri )
                         when "fluiddbtinytds"
                         require "rservicebus/AppResource/FluidDbTinyTds"
-                        resources[k.sub( "RSB_", "" )] = AppResource_FluidDbTinyTds.new( host, uri )
+                        resourceManager.add k.sub( "RSB_", "" ), AppResource_FluidDbTinyTds.new( host, uri )
 
                         when "fluiddbfirebird"
                         require "rservicebus/AppResource/FluidDbFirebird"
-                        resources[k.sub( "RSB_", "" )] = AppResource_FluidDbFirebird.new( host, uri )
+                        resourceManager.add k.sub( "RSB_", "" ), AppResource_FluidDbFirebird.new( host, uri )
                         
                         when "dir"
                         require "rservicebus/AppResource/Dir"
-                        resources[k.sub( "RSB_", "" )] = AppResource_Dir.new( host, uri )
+                        resourceManager.add k.sub( "RSB_", "" ), AppResource_Dir.new( host, uri )
                         when "file"
                         require "rservicebus/AppResource/File"
-                        resources[k.sub( "RSB_", "" )] = AppResource_File.new( host, uri )
+                        resourceManager.add k.sub( "RSB_", "" ), AppResource_File.new( host, uri )
                         when "scpupload"
                         require "rservicebus/AppResource/ScpUpload"
-                        resources[k.sub( "RSB_", "" )] = AppResource_ScpUpload.new( host, uri )
+                        resourceManager.add k.sub( "RSB_", "" ), AppResource_ScpUpload.new( host, uri )
                         when "smbfile"
                         require "rservicebus/AppResource/SmbFile"
-                        resources[k.sub( "RSB_", "" )] = AppResource_SmbFile.new( host, uri )
+                        resourceManager.add k.sub( "RSB_", "" ), AppResource_SmbFile.new( host, uri )
                         else
 						abort("Scheme, #{uri.scheme}, not recognised when configuring app resource, #{k}=#{v}");
                     end
@@ -62,7 +63,7 @@ module RServiceBus
                 
             end
             
-            return resources
+            return resourceManager
         end
         
     end

data/lib/rservicebus/ConfigureMonitor.rb

@@ -3,7 +3,7 @@ module RServiceBus
     require 'rservicebus/Monitor'
     require 'rservicebus/Monitor/Message'
 
-    #Configure AppResources for an rservicebus host
+    #Configure Monitors for an rservicebus host
     class ConfigureMonitor
         
         @resourceList
@@ -11,10 +11,10 @@ module RServiceBus
         # Constructor
         #
         # @param [RServiceBus::Host] host instance
-        # @param [Hash] appResources As hash[k,v] where k is the name of a resource, and v is the resource
-        def initialize( host, appResources )
+        # @param [Hash] resourceManager As hash[k,v] where k is the name of a resource, and v is the resource
+        def initialize( host, resourceManager )
             @host = host
-            @appResources = appResources
+            @resourceManager = resourceManager
             
             @handlerList = Hash.new
             @resourceList = Hash.new
@@ -23,11 +23,10 @@ module RServiceBus
         # Assigns appropriate resources to writable attributes in the handler that match keys in the resource hash
         #
         # @param [RServiceBus::Handler] handler
-        ## @param [Hash] appResources As hash[k,v] where k is the name of a resource, and v is the resource
         def setAppResources( monitor )
             RServiceBus.rlog "Checking app resources for: #{monitor.class.name}"
             RServiceBus.rlog "If your attribute is not getting set, check that it is in the 'attr_accessor' list"
-            @appResources.each do |k,v|
+            @resourceManager.getAll.each do |k,v|
                 if monitor.class.method_defined?( k ) then
                     monitor.instance_variable_set( "@#{k}", v.getResource() )
                     @resourceList[monitor.class.name] = Array.new if @resourceList[monitor.class.name].nil?

data/lib/rservicebus/HandlerManager.rb

@@ -10,9 +10,9 @@ module RServiceBus
         #
         # @param [RServiceBus::Host] host instance
         # @param [Hash] appResources As hash[k,v] where k is the name of a resource, and v is the resource
-        def initialize( host, appResources, stateManager )
+        def initialize( host, resourceManager, stateManager )
             @host = host
-            @appResources = appResources
+            @resourceManager = resourceManager
             @stateManager = stateManager
             
             @handlerList = Hash.new
@@ -56,9 +56,9 @@ module RServiceBus
         def interrogateHandlerForAppResources( handler )
             RServiceBus.rlog "Checking app resources for: #{handler.class.name}"
             RServiceBus.rlog "If your attribute is not getting set, check that it is in the 'attr_accessor' list"
-            
+
             @resourceListByHandlerName[handler.class.name] = Array.new
-            @appResources.each do |k,v|
+            @resourceManager.getAll.each do |k,v|
                 if handler.class.method_defined?( k ) then
                     @resourceListByHandlerName[handler.class.name] << k
                     RServiceBus.log "Resource attribute, #{k}, found for: " + handler.class.name
@@ -78,26 +78,13 @@ module RServiceBus
             self.interrogateHandlerForAppResources( handler )
         end
         
-        # Assigns appropriate resources to writable attributes in the handler that match keys in the resource hash
+        # As named
         #
-        # @param [RServiceBus::Handler] handler
-        ## @param [Hash] appResources As hash[k,v] where k is the name of a resource, and v is the resource
-        def setAppResources_to_be_removed( handler )
-            RServiceBus.rlog "Checking app resources for: #{handler.class.name}"
-            RServiceBus.rlog "If your attribute is not getting set, check that it is in the 'attr_accessor' list"
-            @appResources.each do |k,v|
-                if handler.class.method_defined?( k ) then
-                    v._connect
-                    #                    v.Begin
-                    handler.instance_variable_set( "@#{k}", v.getResource() )
-                    RServiceBus.log "App resource attribute, #{k}, set for: " + handler.class.name
-                end
-            end
-            
-            return self
-        end
-        
+        # @param [String] msgName
+        ## @param [Array] appResources A list of appResource
         def getListOfResourcesNeededToProcessMsg( msgName )
+            return Array.new if @handlerList[msgName].nil?
+
             list = Array.new
             @handlerList[msgName].each do |handler|
                 list = list + @resourceListByHandlerName[handler.class.name] unless @resourceListByHandlerName[handler.class.name].nil?
@@ -106,14 +93,14 @@ module RServiceBus
             
             return list
         end
-        
+
         def setResourcesForHandlersNeededToProcessMsg( msgName )
             @handlerList[msgName].each do |handler|
                 self.setStateAttributeIfRequested( handler )
                 
                 next if @resourceListByHandlerName[handler.class.name].nil?
                 @resourceListByHandlerName[handler.class.name].each do |k|
-                    handler.instance_variable_set( "@#{k}", @appResources[k].getResource() )
+                    handler.instance_variable_set( "@#{k}", @resourceManager.get(k).getResource() )
                     RServiceBus.rlog "App resource attribute, #{k}, set for: " + handler.class.name
                 end
             end
@@ -121,54 +108,16 @@ module RServiceBus
         end
         
         def getHandlerListForMsg( msgName )
-            raise NoHandlerFound.new( msgName ) if @handlerList[msgName].nil?
-            
-            @stateManager.Begin
+            #            raise NoHandlerFound.new( msgName ) if @handlerList[msgName].nil?
+            return Array.new if @handlerList[msgName].nil?
+
+
             list = self.getListOfResourcesNeededToProcessMsg( msgName )
-            list.each do |resourceName|
-                r = @appResources[resourceName]
-                r._connect
-                r.Begin
-                RServiceBus.rlog "Preparing resource: #{resourceName}. Begin"
-            end
-            
             self.setResourcesForHandlersNeededToProcessMsg( msgName )
             
             return @handlerList[msgName]
         end
         
-        def commitResourcesUsedToProcessMsg( msgName )
-            RServiceBus.rlog "HandlerManager.commitResourcesUsedToProcessMsg, #{msgName}"
-            list = self.getListOfResourcesNeededToProcessMsg( msgName )
-            list.each do |resourceName|
-                r = @appResources[resourceName]
-                RServiceBus.rlog "Commit resource, #{r.class.name}"
-                r.Commit
-                r.finished
-            end
-            @stateManager.Commit
-        end
-        
-        def rollbackResourcesUsedToProcessMsg( msgName )
-            RServiceBus.rlog "HandlerManager.rollbackResourcesUsedToProcessMsg, #{msgName}"
-            list = self.getListOfResourcesNeededToProcessMsg( msgName )
-            list.each do |resourceName|
-                begin
-                    r = @appResources[resourceName]
-                    RServiceBus.rlog "Rollback resource, #{r.class.name}"
-                    r.Rollback
-                    r.finished
-                    rescue Exception => e1
-                    @host.log "Caught nested exception rolling back, #{r.class.name}, for msg, #{msgName}"
-                    @host.log "****"
-                    @host.log e1.message
-                    @host.log e1.backtrace
-                    @host.log "****"
-                end
-            end
-            
-        end
-        
         def canMsgBeHandledLocally( msgName )
             return @handlerList.has_key?(msgName)
         end

data/lib/rservicebus/Host.rb

@@ -9,9 +9,12 @@ module RServiceBus
     end
     class PropertyNotSet<StandardError
     end
-
+    
     #Host process for rservicebus
     class Host
+        attr_accessor :sagaData
+        
+        @sagaData
         
         @handlerList
         @resourceListByHandlerName
@@ -20,7 +23,7 @@ module RServiceBus
         
         @mq
         
-        @appResources
+        @resourceManager
         
         @config
         
@@ -30,8 +33,8 @@ module RServiceBus
         
         
         @queueForMsgsToBeSentOnComplete
-        
-        
+
+
         #Provides a thin logging veneer
         #
         # @param [String] string Log entry
@@ -39,11 +42,11 @@ module RServiceBus
         def log(string, ver=false)
             RServiceBus.log( string, ver )
         end
-
+        
         #Thin veneer for Configuring external resources
         #
         def configureAppResource
-            @appResources = ConfigureAppResource.new.getResources( ENV, self )
+            @resourceManager = ConfigureAppResource.new.getResources( ENV, self, @stateManager, @sagaStorage )
             return self;
         end
         
@@ -54,18 +57,31 @@ module RServiceBus
             return self;
         end
         
+        #Thin veneer for Configuring state
+        #
+        def configureSagaStorage
+            string = RServiceBus.getValue( "SAGA_URI" )
+            if string.nil? then
+                string = "dir:///tmp"
+            end
+            
+            uri = URI.parse( string )
+            @sagaStorage = SagaStorage.Get( uri )
+            return self;
+        end
+        
         #Thin veneer for Configuring Cron
         #
         def configureCircuitBreaker
             @circuitBreaker = CircuitBreaker.new( self )
             return self;
         end
-
-
+        
+        
         #Thin veneer for Configuring external resources
         #
         def configureMonitors
-            @monitors = ConfigureMonitor.new( self, @appResources ).getMonitors( ENV )
+            @monitors = ConfigureMonitor.new( self, @resourceManager ).getMonitors( ENV )
             return self;
         end
         
@@ -81,9 +97,9 @@ module RServiceBus
         #msg endpoint mapping
         def sendSubscriptions
             log "Send Subscriptions"
-
+            
             @endpointMapping.getSubscriptionEndpoints.each { |eventName| self.Subscribe( eventName ) }
-
+            
             return self
         end
         
@@ -91,7 +107,7 @@ module RServiceBus
         #
         def loadHandlers()
             log "Load Message Handlers"
-            @handlerManager = HandlerManager.new( self, @appResources, @stateManager )
+            @handlerManager = HandlerManager.new( self, @resourceManager, @stateManager )
             @handlerLoader = HandlerLoader.new( self, @handlerManager )
             
             @config.handlerPathList.each do |path|
@@ -101,6 +117,19 @@ module RServiceBus
             return self
         end
         
+        #Load and configure Sagas
+        def loadSagas()
+            log "Load Sagas"
+            @sagaManager = Saga_Manager.new( self, @resourceManager, @sagaStorage )
+            @sagaLoader = SagaLoader.new( self, @sagaManager )
+            
+            @config.sagaPathList.each do |path|
+                @sagaLoader.loadSagasFromPath(path)
+            end
+            
+            return self
+        end
+        
         #Thin veneer for Configuring Cron
         #
         def configureCronManager
@@ -155,25 +184,28 @@ module RServiceBus
 			.loadHostSection()
 			.loadContracts()
 			.loadHandlerPathList()
+            .loadSagaPathList()
             .loadLibs()
             .loadWorkingDirList();
-
+            
             self.connectToMq()
-
+            
             @endpointMapping = EndpointMapping.new.Configure( @mq.localQueueName )
             
             self.configureStatistics()
             .loadContracts()
             .loadLibs()
-			.configureAppResource()
             .configureStateManager()
+            .configureSagaStorage()
+			.configureAppResource()
             .configureCircuitBreaker()
 			.configureMonitors()
 			.loadHandlers()
+            .loadSagas()
             .configureCronManager()
 			.configureSubscriptions()
 			.sendSubscriptions()
-
+            
             
             return self
         end
@@ -202,7 +234,7 @@ module RServiceBus
             #            statOutputCountdown = 0
             messageLoop = true
             retries = @config.maxRetries
-
+            
             while messageLoop do
                 #Popping a msg off the queue should not be in the message handler, as it affects retry
                 begin
@@ -219,10 +251,10 @@ module RServiceBus
                         @msg = YAML::load(body)
                         if @msg.msg.class.name == "RServiceBus::Message_Subscription" then
                             @subscriptionManager.add( @msg.msg.eventName, @msg.returnAddress )
-                        elsif @msg.msg.class.name == "RServiceBus::Message_StatisticOutputOn" then
+                            elsif @msg.msg.class.name == "RServiceBus::Message_StatisticOutputOn" then
                             @stats.output = true
                             log "Turn on Stats logging"
-                        elsif @msg.msg.class.name == "RServiceBus::Message_StatisticOutputOff" then
+                            elsif @msg.msg.class.name == "RServiceBus::Message_StatisticOutputOff" then
                             @stats.output = false
                             log "Turn off Stats logging"
                             elsif @msg.msg.class.name == "RServiceBus::Message_VerboseOutputOn" then
@@ -231,10 +263,12 @@ module RServiceBus
                             elsif @msg.msg.class.name == "RServiceBus::Message_VerboseOutputOff" then
                             ENV.delete( "VERBOSE" )
                             log "Turn off Verbose logging"
-                        
-
+                            
+                            
                             else
+                            
                             self.HandleMessage()
+                            
                             if !@config.forwardReceivedMessagesTo.nil? then
                                 self._SendAlreadyWrappedAndSerialised(body,@config.forwardReceivedMessagesTo)
                             end
@@ -248,11 +282,11 @@ module RServiceBus
                         serialized_object = YAML::dump(@msg)
                         self._SendAlreadyWrappedAndSerialised(serialized_object, @config.errorQueueName)
                         @mq.ack
-
+                        
                         rescue NoHandlerFound => e
                         puts "*** Handler not found for msg, #{e.message}"
                         puts "*** Ensure a handler named, #{e.message}, is present in the MessageHandler directory."
-
+                        
                         @msg.addErrorMsg( @mq.localQueueName, e.message )
                         serialized_object = YAML::dump(@msg)
                         self._SendAlreadyWrappedAndSerialised(serialized_object, @config.errorQueueName)
@@ -279,7 +313,7 @@ module RServiceBus
                             else
                             
                             @circuitBreaker.Failure
-
+                            
                             @stats.incTotalErrored
                             if e.class.name == "Beanstalk::NotConnected" then
                                 puts "Lost connection to beanstalkd."
@@ -342,13 +376,15 @@ module RServiceBus
             #Send the current msg to the appropriate handlers
             #
             def HandleMessage()
+                @resourceManager.Begin
                 msgName = @msg.msg.class.name
                 handlerList = @handlerManager.getHandlerListForMsg(msgName)
                 
+                
                 RServiceBus.rlog "Handler found for: " + msgName
                 begin
                     @queueForMsgsToBeSentOnComplete = Array.new
-
+                    
                     log "Started processing msg, #{msgName}"
                     handlerList.each do |handler|
                         begin
@@ -356,50 +392,60 @@ module RServiceBus
                             handler.Handle( @msg.msg )
                             log "Handler, #{handler.class.name}, Finished"
                             rescue PropertyNotSet => e
-                                raise PropertyNotSet.new( "Property, #{e.message}, not set for, #{handler.class.name}" )
+                            raise PropertyNotSet.new( "Property, #{e.message}, not set for, #{handler.class.name}" )
                             rescue Exception => e
                             puts "E #{e.message}"
                             log "An error occurred in Handler: " + handler.class.name
                             raise e
                         end
                     end
-
-                    @handlerManager.commitResourcesUsedToProcessMsg( msgName )
+                    
+                    
+                    if @sagaManager.Handle( @msg ) == false then
+                        raise NoHandlerFound.new( msgName ) if handlerList.length == 0
+                    end
+                    
+                    
+                    
+                    @resourceManager.Commit( msgName )
                     
                     self.sendQueuedMsgs
                     log "Finished processing msg, #{msgName}"
                     
                     rescue Exception => e
                     
-                    @handlerManager.rollbackResourcesUsedToProcessMsg( msgName )
+                    @resourceManager.Rollback( msgName )
                     @queueForMsgsToBeSentOnComplete = nil
                     
                     raise e
                 end
             end
             
+            #######################################################################################################
+            # All msg sending Methods
+            
             #Sends a msg across the bus
             #
             # @param [String] serialized_object serialized RServiceBus::Message
             # @param [String] queueName endpoint to which the msg will be sent
             def _SendAlreadyWrappedAndSerialised( serialized_object, queueName )
                 RServiceBus.rlog "Bus._SendAlreadyWrappedAndSerialised"
-
+                
                 if !@config.forwardSentMessagesTo.nil? then
                     @mq.send( @config.forwardSentMessagesTo, serialized_object )
                 end
-
+                
                 @mq.send( queueName, serialized_object )
             end
-
+            
             #Sends a msg across the bus
             #
             # @param [RServiceBus::Message] msg msg to be sent
             # @param [String] queueName endpoint to which the msg will be sent
-            def _SendNeedsWrapping( msg, queueName )
+            def _SendNeedsWrapping( msg, queueName, correlationId )
                 RServiceBus.rlog "Bus._SendNeedsWrapping"
-
-                rMsg = RServiceBus::Message.new( msg, @mq.localQueueName )
+                
+                rMsg = RServiceBus::Message.new( msg, @mq.localQueueName, correlationId )
                 if queueName.index( "@" ).nil? then
                     q = queueName
                     RServiceBus.rlog "Sending, #{msg.class.name} to, queueName"
@@ -410,19 +456,21 @@ module RServiceBus
                     q = 'transport-out'
                     RServiceBus.rlog "Sending, #{msg.class.name} to, #{queueName}, via #{q}"
                 end
-
+                
                 serialized_object = YAML::dump(rMsg)
                 self._SendAlreadyWrappedAndSerialised( serialized_object, q )
             end
-
+            
             def sendQueuedMsgs
                 @queueForMsgsToBeSentOnComplete.each do |row|
-                    self._SendNeedsWrapping( row["msg"], row["queueName"] )
+                    self._SendNeedsWrapping( row["msg"], row["queueName"], row["correlationId"] )
                 end
             end
             
             def queueMsgForSendOnComplete( msg, queueName )
-                @queueForMsgsToBeSentOnComplete << Hash["msg", msg, "queueName", queueName]
+                correlationId = sagaData.nil? ? nil : sagaData.correlationId
+                correlationId = @msg.correlationId.nil? ? correlationId : @msg.correlationId
+                @queueForMsgsToBeSentOnComplete << Hash["msg", msg, "queueName", queueName, "correlationId", correlationId]
             end
             
             #Sends a msg back across the bus
@@ -433,7 +481,7 @@ module RServiceBus
             def Reply( msg )
                 RServiceBus.rlog "Reply with: " + msg.class.name + " To: " + @msg.returnAddress
                 @stats.incTotalReply
-
+                
                 self.queueMsgForSendOnComplete( msg, @msg.returnAddress )
             end
             
@@ -447,8 +495,8 @@ module RServiceBus
                 log "**** Check environment variable MessageEndpointMappings contains an entry named : " + msgName
                 raise "No end point mapping found for: " + msgName
             end
-
-
+            
+            
             #Send a msg across the bus
             #msg destination is specified at the infrastructure level
             #
@@ -482,7 +530,7 @@ module RServiceBus
             # @param [String] eventName event to be subscribes to
             def Subscribe( eventName )
                 RServiceBus.rlog "Bus.Subscribe: " + eventName
-
+                
                 queueName = self.getEndpointForMsg( eventName )
                 subscription = Message_Subscription.new( eventName )