adaptation 0.1.3 → 0.1.4

data/CHANGELOG

@@ -39,3 +39,10 @@
       will send messages to other subscribers.
 * 0.1.3
     - solved loop that comsuned lots of cpu in mom command
+* 0.1.4
+    - subscribers with a message buffer too; mom just delivers messages without waiting
+      subscriber to finnish oprocessing it
+    - if when subscribing desired address is in use just log it and return
+    - settings.yml template improved
+    - added support to subscribe/publish to Xmlblaster (http://www.xmlblaster.org)
+      via XML-RPC

data/bin/mom

@@ -24,25 +24,16 @@ if %w(--file -f).include? ARGV.first
   file = ARGV[1]
 end
 
-#if %w(--environment -e).include? ARGV.first
-#  environment = ARGV[1]
-#end
-environment = "development"
+mom = "druby"
 
 if file.nil?
-  config = {"mom" => {"type" => "druby", "host" => DEFAULT_HOST, "port" => DEFAULT_PORT}}
+  config = {"mom" => {"host" => DEFAULT_HOST, "port" => DEFAULT_PORT, "topics" => "all"}}
 else
-  config = YAML::load(File.open(file))[environment]
+  config = YAML::load(File.open(file))[mom]
 end
 
-Signal.trap("INT") { puts "Shutting down MOM server (#{config["mom"]["type"]})"; exit }
+Signal.trap("INT") { puts "Shutting down MOM server (#{mom})"; exit }
 
-case config["mom"]["type"]
-  when "druby"
-    mom_uri = "druby://#{config["mom"]["host"]}:#{config["mom"]["port"]}"
-    mom = Adaptation::Mom::Mom.new mom_uri
-    mom.start
-  #when "xmlblaster"
-  else
-    puts "Unknown MOM server type: #{config["mom"]["type"]}"
-end
+mom_uri = "druby://#{config["mom"]["host"]}:#{config["mom"]["port"]}"
+mom = Adaptation::Mom::Mom.new mom_uri
+mom.start

data/bin/publish

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+unless defined? ADAPTOR_ROOT
+  ADAPTOR_ROOT = File.expand_path(File.dirname(__FILE__) + '/..')
+end
+require 'rubygems'
+require 'adaptation'
+
+require 'commands/publish'

data/configs/mom.yml

@@ -1,10 +1,23 @@
-development:
+druby:
   mom:
-    type: druby 
     port: 8080
     host: 127.0.0.1
   subscriber:
-    type: druby
     port: 8081
     host: 127.0.0.1
     topics: all
+
+xmlblaster:
+  mom:
+    port: 8080
+    host: 127.0.0.1
+    publish_user: publisher
+    publish_password: secret
+  subscriber:
+    port: 8081
+    host: 127.0.0.1
+    public_host:
+    public_port:
+    topics: TOPIC1, TOPIC2
+    subscriber_user: subscriber
+    subscriber_password: secret

data/configs/settings.yml

@@ -1,6 +1,6 @@
 development:
-  group: group_id
-  application: APPLICATION_ID
+  # setting: value
+  # The line above makes possible to access the setting
+  # in the Adaptor class with: $config["setting"]
 test:
-  group: group_id
-  application: APPLICATION_ID
+  # setting: test value

data/lib/adaptation/adaptor.rb

@@ -29,9 +29,12 @@ module Adaptation
       end
       
       xml = message_object.to_xml.to_s.gsub("'", "\"")
-      unless system("#{$config["oappublish"]} '#{$config["application"]}' '#{xml}'")
-        puts "Problem publishing: #{xml}"
+      publish_method = $config["oappublish"] || "#{ADAPTOR_ROOT}/script/publish"
+      topic = $config["application"] || "ADAPTATION"
+      unless system("#{publish_method} '#{$config["application"]}' '#{xml}'")
+        logger.error "Problem publishing: #{xml}"
       end
+
     end
 
     def self.get_class_object(adaptor_class) # nodoc

data/lib/adaptation/druby_subscriber.rb

@@ -7,39 +7,33 @@ module Adaptation
 
     class DrubySubscriber
 
+      # constructor, called from the subscribe command
       def initialize subscriber_uri, mom_uri, topics
         @subscriber_uri = subscriber_uri
         @mom_uri = mom_uri
         @topics = topics
-        @adaptors_list = Array.new
+        @messages = []
       end
 
-      def process message, topic
-        if ( (@topics.include?(topic)) or (@topics.include?("all")) )
-          system("ruby public/dispatch.rb '#{message}'") 
-        end
-        puts "#{topic} => #{message}"
+      # method to receive messages, called from the mom
+      def send_message message, topic 
+        # Insert message into messages buffer, and awake
+        # message processor (@sleeper) if paused
+        puts "-----------------------------------"
+        puts "Received message in topic: #{topic}"
+        puts "#{message}"
+        puts "-----------------------------------"
+        @messages << {:message => message, :topic => topic}
+        @sleeper.run if @sleeper.stop?
       end
-
+      
       def subscription_result subscribed
         if subscribed
           puts "Subscribed to mom (#{@mom_uri}). Listening at #{@subscriber_uri}"
         end
       end
 
-      # TODO: Think what exactly is this subscriber:
-      #       - path to file
-      #       - combination of a path and a set of conditions <- looks better...
-      #       - ...
-      def note_me_down adaptor
-        unless @adaptors_list.include? adaptor
-	  @adaptors_list << adaptor
-          puts "Added adaptor: #{adaptor}"
-	end	
-      end
-
       def start
-        uri_owner = false
 	begin
 	  # try to start the subscriber service,
 	  # using the uri specified in config/mom.yml
@@ -48,33 +42,33 @@ module Adaptation
 	  # subscribe that uri to the mom
 	  mom = DRbObject.new(nil, @mom_uri)
           mom.subscribe @subscriber_uri
-          uri_owner = true
 	rescue Exception => e
-          # desired uri already in use...
-          # if the process using it is a subscriber, this
-          # shouldn't be a problem
-          uri_owner = false
+          # desired uri already in use
+          puts "Couldn't start subscriber at #{@subscriber_uri}. Address already in use?"
+          return
 	end	
+ 
+        @sleeper = Thread.new{
+          loop do 
 
-	# try to tell to the subscriber using the uri
-	# (may be this self instance of DrubySubscriber),
-	# that we want to be executed when the MOM
-	# calls its process method
-	begin
-          subscriber = DRbObject.new(nil, @subscriber_uri)
-	  routes_file = File.expand_path(File.dirname(__FILE__) + '/../config/routes.rb')
-          subscriber.note_me_down routes_file
-        rescue Exception => e
-	  # the process using @subscriber_uri is not
-	  # an instance of DrubySubsciber...
-          puts "Couldn't start or find subscriber at #{@subscriber_uri}:" 
-          puts "#{e}"
-          return
-	end
+            # process all messages
+            while !@messages.empty?
+              @messages.each do |message|         
+                if ( (@topics.include?(message[:topic])) or (@topics.include?("all")) )
+                  system("ruby public/dispatch.rb '#{message[:message]}'") 
+                end
+                @messages.delete message
+              end
+            end
 
-        if uri_owner
-          DRb.thread.join # Don't exit just yet!
-        end
+            # go to sleep
+            Thread.stop
+          
+          end
+        }
+
+        @sleeper.join
+        Drb.thread.join
 
       end
 

data/lib/adaptation/mom.rb

@@ -16,13 +16,15 @@ module Adaptation
         unless get_subscribers.include?(drb_uri)
           add_subscriber drb_uri
           puts "Added new subscriber: #{drb_uri}"
-          oapdaemon = DRbObject.new(nil, drb_uri)
-          oapdaemon.subscription_result true
         end
+
+        oapdaemon = DRbObject.new(nil, drb_uri)
+        oapdaemon.subscription_result(true)
       end
 
       def publish message, topic
-        # Tell subscribed hosts to execute their adaptors
+       # Insert message into messages buffer, and awake
+       # deliverer process (@sleeper) if paused  
         puts "-----------------------------------"
         puts "Received message in topic: #{topic}"
         puts "#{message}"
@@ -46,7 +48,7 @@ module Adaptation
                     puts "Calling #{uri}"
                     DRb.start_service
                     oapdaemon = DRbObject.new(nil, uri)
-                    oapdaemon.process message[0], message[1]
+                    oapdaemon.send_message message[0], message[1]
                   rescue
                     puts "Couldn't send message to subscriber: #{uri}"
                   end

data/lib/adaptation/xmlblaster/xmlblaster_callback_client.rb

@@ -0,0 +1,141 @@
+require "adaptation/xmlblaster/xmlblaster_client.rb"
+require "adaptation/xmlblaster/xmlblaster_callback_server.rb"
+
+class XmlblasterCallbackClient < XmlblasterClient
+
+  attr_reader :callback_server
+
+  def initialize( xmlblaster_ip = nil, xmlblaster_port = "8080", callback_ip = "127.0.0.1", callback_port = "8081", callback_public_ip = nil, callback_public_port = nil, audit = nil)
+    super xmlblaster_ip, xmlblaster_port, audit
+    @xmlblaster_ip = xmlblaster_ip
+    @xmlblaster_port = xmlblaster_port
+    @callback_ip = callback_ip
+    @callback_port = callback_port
+    @callback_public_ip = callback_public_ip || @callback_ip
+    @callback_public_port = callback_public_port || @callback_port
+    @callback_server = nil
+    @audit = audit
+
+    begin
+      @callback_server = XmlblasterCallbackServer.new( @callback_ip, @callback_port, @callback_public_ip, @callback_public_port, self, @audit )
+    rescue => e
+      @audit.warn( "XMLBlasterCallbackClient: Could not create CallbackServer" )
+      raise e
+    end
+
+    begin
+      @callback_server.start()
+    rescue => e
+      @audit.warn( "XMLBlasterCallbackClient: Error creating XMLRPC Server" )
+      raise e
+    end
+  end
+
+  def login( username='guest', password='guest' )
+    qos = "<qos>
+      <securityService type='htpasswd' version='1.0'>
+        <![CDATA[
+        <user>#{username}</user>
+        <passwd>#{password}</passwd>
+        ]]>
+      </securityService>
+      <session name ='#{username}/1' timeout='0' maxSessions='1' clearSessions='true' />
+      <persistent/>
+      <callback type='XMLRPC' retries='-1' delay='60000'>#{@callback_server.callback_url}</callback>
+    </qos>"
+    @audit.debug( "XmlblasterCallbackClient: authenticate.connect QoS = #{qos}" )
+    returnQos = @proxy.call("authenticate.connect", qos)
+    @audit.debug( "XmlblasterCallbackClient: authenticate.connect returnQos = #{returnQos}" )
+    xml = REXML::Document.new(returnQos)
+    @sessionId = xml.elements["//session"].attributes["sessionId"]
+  end
+
+  def subscribe( xmlKey, qos )
+    begin
+      returnValue = @proxy.call("xmlBlaster.subscribe", @sessionId, xmlKey, qos )
+      puts "Subscribed to mom (xmlblaster at #{@xmlblaster_ip}:#{@xmlblaster_port}). Listening at #{@callback_public_ip || @callback_ip}:#{@callback_public_port || @callback_port}"
+      @audit.info( "==> ::SUBSCRIBE:: <==      Success subscribing with sessionID #{@sessionId}" )
+    rescue  => e
+      @audit.warn( "XMLBlasterClient: Error subscribing to MOM: #{e}" )
+      raise e
+    end
+    return returnValue
+  end
+
+  def unsubscribe( xmlKey, qos )
+    begin
+      returnValue = @proxy.call("xmlBlaster.unSubscribe", @sessionId, xmlKey,  qos )
+      @audit.info( "==> ::UNSUBSCRIBE:: <==      Success unSubscribing with sessionID #{@sessionId}" )
+    rescue  => e
+      @audit.warn( "XMLBlasterClient: Error unsubscribing from MOM: #{e}" )
+      raise e
+    end
+    return true
+  end
+
+  def update( *args )
+    key =args[0]
+    content = args[1]
+    qos = args[2]
+    @audit.info( "XMLBlasterCallbackClient: Received UPDATE." )
+
+    begin
+      qos_xml = REXML::Document.new args[2]
+    rescue => e
+      @audit.warn( "XMLBlasterCallbackClient: Could not open QOS of message." )
+    end
+
+    if qos_xml.elements['qos'].elements['state'] != nil then
+      begin
+        value = qos_xml.elements['qos'].elements['state'].attributes['id'].to_s
+        if value == "ERASED" then
+          @audit.debug( "XMLBlasterCallbackClient: TOPIC GOT ERASED" )
+        else
+          @audit.debug( "XMLBlasterCallbackClient: SOMETHING STRANGE" )
+        end
+      rescue  => e
+        @audit.warn( "XMLBlasterCallbackClient: Error: #{e}" )
+      end
+    end
+
+    begin
+      key_xml = REXML::Document.new key
+      topic = key_xml.elements['key'].attributes["oid"]
+      @audit.debug( "Topic #{topic}" )
+      puts "-----------------------------------"
+      puts "Received message in topic: #{topic}"
+      puts "#{content}"
+      puts "-----------------------------------"
+      # process message
+      Adaptation::Base.new.process content
+    rescue => e
+      @audit.warn( "XMLBlasterCallbackClient: Could not access content of message." )
+    end   
+
+    return "<qos><state>OK</state></qos>"
+  end
+
+  def ping( *args )
+    @audit.debug( "XMLBlasterClient: received PING - PONG" )
+    return "<qos><state>OK</state></qos>"
+  end
+
+  def logout
+    super
+    if @callback_server then
+      begin
+        @callback_server.shutdown()
+      rescue => e
+        @audit.warn( "XMLBlasterCallbackClient: Error could not stop CallbackServer" )
+        raise e
+      end
+    else
+      return false
+    end   
+    return true
+  end
+
+end
+
+
+

data/lib/adaptation/xmlblaster/xmlblaster_callback_server.rb

@@ -0,0 +1,79 @@
+require 'xmlrpc/server'
+require 'socket'
+require 'logger'
+
+class XmlblasterCallbackServer
+
+  attr_reader :thread
+  attr_reader :callback_url
+
+  def initialize( ip, port, public_ip, public_port, callbackInstance, audit = nil )
+    if audit == nil then
+      @audit = Logger.new($stdout)
+    else
+      @audit = audit
+    end
+    @thread = nil
+    @callback_server = nil
+    @callback_url = "http://#{public_ip}:#{public_port}/RPC2"
+    @port = port
+    @ip = ip
+    @callback_instance = callbackInstance
+  end
+
+  def start
+    
+    begin
+      @callback_server = XMLRPC::Server.new( @port, @ip, 4, @audit, false )
+      @audit.debug( "CallBackServer started")
+    rescue => e
+      msg = e.message + ": " + e.backtrace.join("\n")
+      @audit.error( "CallBackServer: Could not create XMLRPC Server: " + msg)
+      return false
+    end
+
+    @thread = Thread.new( @port, @callback_instance ) { | port, callback_instance | 
+      Thread.current['name'] = "MOM-CallbackServer"
+      STDOUT.sync = true
+
+
+      if @callback_server then      
+
+        @audit.debug( "MOM-CallBackServer: " + @callback_url )
+        
+        @callback_server.add_handler("ping") do |name, *args|
+          @callback_instance.ping( *args )
+        end
+
+        @callback_server.add_handler("update") do |name, *args|
+          @callback_instance.update( *args )
+        end
+
+        @callback_server.set_default_handler do |name, *args|
+          raise XMLRPC::FaultException.new(-99, "MOM-CallBackServer: Method #{name} missing or wrong number of parameters!")
+        end
+
+        # listening
+        @audit.debug( "MOM-CallBackServer: XMLRPC Server serving." )
+        @callback_server.serve()
+
+      else
+        return false
+      end
+      
+    }
+    
+    return true
+  end
+
+
+  def shutdown
+    if @callback_server then
+      @callback_server.shutdown()
+      @thread.kill
+    end
+    return true
+  end
+
+end
+

data/lib/adaptation/xmlblaster/xmlblaster_client.rb

@@ -0,0 +1,122 @@
+require 'xmlrpc/client'
+require 'rexml/document'
+require 'logger'
+
+# Implements http://www.xmlblaster.org/xmlBlaster/doc/requirements/interface.html
+
+class XmlblasterClient
+
+  attr_reader :xmlblaster_ip
+
+  def initialize( xmlblaster_ip = nil, xmlblaster_port = nil, audit = nil )
+
+    if audit == nil then
+      @audit = Logger.new(STDOUT)
+      @audit.level = Logger::INFO
+    else
+      @audit = audit
+    end
+
+    @xmlblaster_ip = xmlblaster_ip
+    @xmlblaster_port = xmlblaster_port
+
+    @proxy = nil
+    @sessionId = nil
+
+    if @xmlblaster_ip then
+      begin
+        self.connect(@xmlblaster_ip, @xmlblaster_port)
+      rescue => e
+        @audit.warn( "XMLBlasterClient: Error connecting to XMLBlasterServer." )
+        raise e
+      end
+    end
+
+  end
+
+  def connect( ip, port )
+    rpc="/RPC2"
+    begin
+      @proxy =   XMLRPC::Client.new( ip, rpc, port, nil, nil, nil, nil, nil,nil) 
+    rescue => e
+      @audit.warn( "XMLBlasterClient: new XMLRPC client creation failed.")
+      raise e
+    end
+    @audit.debug( "XMLBlasterClient: XMLBlaster client to http://#{ip}:#{port}#{rpc}")
+    return true
+  end
+
+  def login( username='guest', password='guest')
+    qos = "<qos>
+      <securityService type='htpasswd' version='1.0'>
+        <![CDATA[
+        <user>#{username}</user>
+        <passwd>#{password}</passwd>
+        ]]>
+      </securityService>
+      <session timeout='30000' maxSessions='99' clearSessions='false' />
+    </qos>"
+    @audit.debug( "XmlbasterClient: authenticate.connect QoS = #{qos}" )
+    returnQos = @proxy.call("authenticate.connect", qos)
+    @audit.debug( "XmlblasterClient:: authenticate.connect returnQos = #{returnQos}" )
+    xml = REXML::Document.new(returnQos)
+    @sessionId = xml.elements["//session"].attributes["sessionId"]
+  end
+
+  def logout
+    begin
+      returnValue = @proxy.call("authenticate.logout", @sessionId)
+      @audit.info( "==> ::LOGOUT:: <==      Success with sessionID #{@sessionId}, return Value: #{returnValue.to_s}" )
+    rescue  => e
+      @audit.warn( "XMLBlasterClient: Error logging out: #{e}" )
+      raise e
+    end
+    return true
+  end
+
+  def publish( xmlKey, content, qos )
+    begin
+      returnValue = @proxy.call("xmlBlaster.publish", @sessionId, xmlKey, content, qos )
+      @audit.info( "==> ::PUBLISH:: <==      Success publishing with sessionID #{@sessionId}")
+    rescue  => e
+      @audit.warn( "XMLBlasterClient: Error publishing to MOM: #{e}" )
+      raise e
+    end
+    return true
+  end
+
+  def get( xmlKey, qos )
+    begin
+      returnValue = @proxy.call("xmlBlaster.get", @sessionId, xmlKey,  qos )
+      @audit.info( "==> ::GET:: <==      Success get with sessionID #{@sessionId}" )
+    rescue  => e
+      @audit.warn( "XMLBlasterClient: Error get from MOM: #{e}" )
+      raise e
+    end
+    return returnValue
+  end
+  
+  def erase( xmlKey, qos )
+    begin
+      returnValue = @proxy.call("xmlBlaster.erase", @sessionId, xmlKey,  qos )
+      @audit.info( "==> ::ERASE:: <==      Success get with sessionID #{@sessionId}" )
+    rescue XMLRPC::FaultException => e
+      @audit.warn( "XMLBlasterClient: Error erase from MOM: #{e}" )
+      raise e
+    end
+    return true
+  end
+  
+  def printMessage( messages )
+    @audit.info( "Received #{messages.length} messages.")
+    messages.each{ | message |
+      key = message[0]
+      content = message[1]
+      qos = message[2]
+      @audit.info "     Key = " + key.to_s
+      @audit.info "     Content = " + content.lenght + " bytes"
+      @audit.info "     QOS = " + qos.to_s
+    }
+  end
+
+end

data/{dispatches → lib/commands}/publish.rb

@@ -4,17 +4,19 @@ unless defined? ADAPTOR_ROOT
   ADAPTOR_ROOT = File.expand_path(File.dirname(__FILE__) + '/..')
 end
 
-environment = "development"
+args = ARGV
+mom = "druby"
 ARGV.each do |arg|
-  if arg[0..14] == "ADAPTATION_ENV="
-    environment = arg[15..arg.length]
+  if arg[0..3] == "MOM="
+    mom = arg[4..arg.length]
+    args = ARGV.reject{|p| p == "MOM=#{mom}"}
   end
 end
 
 require 'yaml'
-config = YAML::load(File.open("#{ADAPTOR_ROOT}/config/mom.yml"))[environment.to_s]
+config = YAML::load(File.open("#{ADAPTOR_ROOT}/config/mom.yml"))[mom]
 
-case config["mom"]["type"]
+case mom
   when "druby"
     require 'drb'
 
@@ -25,11 +27,13 @@ case config["mom"]["type"]
 
   when "xmlblaster"
     require "rubygems"
-    require "adaptation/xmlblaster_client"
+    require "adaptation"
+    require "adaptation/xmlblaster/xmlblaster_client"
 
     xbc = XmlblasterClient.new(config["mom"]["host"], config["mom"]["port"])
-    xbc.login( "OAP_USER", "OAP_PASS" )
-    xbc.publish( "<key oid='#{ARGV[0]}' contentMime='text/xml'/>", ARGV[1] , "<qos></qos>" )
+    xbc.login( config["mom"]["publish_user"], config["mom"]["publish_password"] )
+    puts args
+    xbc.publish( "<key oid='#{args[0]}' contentMime='text/xml'/>", args[1] , "<qos></qos>" )
     xbc.logout
 end
   

data/lib/commands/subscribe.rb

@@ -1,25 +1,82 @@
 require 'adaptation'
 
-environment = "development" # TODO: "un-hardcode" this
-config = YAML::load(File.open("config/mom.yml"))["development"]
+args = ARGV
+mom = "druby"
+ARGV.each do |arg|
+  if arg[0..3] == "MOM="
+    mom = arg[4..arg.length]
+    args = ARGV.reject{|p| p == "MOM=#{mom}"}
+  end
+end
+
+config = YAML::load(File.open("config/mom.yml"))[mom]
 
-case config["mom"]["type"]
+case mom
   when "druby"
     require 'adaptation/druby_subscriber'
 
     mom_uri = "druby://#{config["mom"]["host"]}:#{config["mom"]["port"]}"
     subscriber_uri = "druby://#{config["subscriber"]["host"]}:#{config["subscriber"]["port"]}"
-    topics = config["subscriber"]["topics"].split(' ')
+    topics = config["subscriber"]["topics"].gsub(" ", "").split(',')
     
-    Signal.trap("INT") { puts "Shutting down subscriber (#{config["mom"]["type"]})"; exit }
+    Signal.trap("INT") { puts "Shutting down subscriber (#{mom})"; exit }
 
     oapdaemon = Adaptation::Mom::DrubySubscriber.new subscriber_uri, mom_uri, topics
     oapdaemon.start
 
-  #when "xmlblaster"
-    #
+  when "xmlblaster"
+    require 'adaptation/xmlblaster/xmlblaster_callback_client' 
+   
+    xbcc = XmlblasterCallbackClient.new(
+             config["mom"]["host"],
+             config["mom"]["port"],
+             config["subscriber"]["host"],
+             config["subscriber"]["port"],
+             config["subscriber"]["public_host"],
+             config["subscriber"]["public_port"],
+             Logger.new("#{ADAPTOR_ROOT}/log/subscriber.log")     
+           )
+
+    Signal.trap("INT") { 
+      puts "Shutting down subscriber (#{mom})" 
+      begin
+        xbcc.unsubscribe( 
+          "<key oid='#{topic}'/>",
+          "<qos><persistent/><initialUpdate>false</initialUpdate>
+           <duplicateUpdates>false</duplicateUpdates><multiSubscribe>false</multiSubscribe>
+           <history numEntries='1'/></qos>"
+        )
+      rescue
+      end
+      xbcc.logout
+      exit 
+    }
+ 
+    user = config["subscriber"]["subscriber_user"].nil? ? config["subscriber"]["host"] : config["subscriber"]["subscriber_user"]
+    password = config["subscriber"]["subscriber_password"].nil? ? "empty" : config["subscriber"]["subscriber_password"]
+    xbcc.login(user, password)
+
+    topics = (config["subscriber"]["topics"].nil? or config["subscriber"]["topics"] == "all") ? nil : config["subscriber"]["topics"].gsub(" ","").split(',')
+    if topics.nil?
+      xbcc.subscribe(  
+        "<key oid='' queryType='XPATH'> /xmlBlaster/key[starts-with(@oid,'.')] </key>",
+        "<qos><persistent/><initialUpdate>false</initialUpdate>
+         <duplicateUpdates>false</duplicateUpdates><multiSubscribe>false</multiSubscribe>
+         <history numEntries='1'/></qos>" 
+      )
+    else
+      topics.each do |topic|
+        xbcc.subscribe( 
+          "<key oid='#{topic}'/>", 
+          "<qos><persistent/><initialUpdate>false</initialUpdate>
+           <duplicateUpdates>false</duplicateUpdates><multiSubscribe>false</multiSubscribe>
+           <history numEntries='1'/></qos>"
+        )
+      end
+    end
+
+    sleep
 
   else
-    puts "Unknown MOM server type: #{config["mom"]["type"]}"
+    puts "Unknown MOM server type: #{mom}"
 end
-

data/lib/rails_generator/generators/applications/app/app_generator.rb

@@ -58,19 +58,18 @@ class AppGenerator < Rails::Generator::Base
       #m.file "environments/test.rb",        "config/environments/test.rb"
 
       # Scripts
-      %w( generate destroy about subscribe breakpointer console ).each do |file|
+      %w( generate destroy about publish subscribe breakpointer console ).each do |file|
         m.file "bin/#{file}", "script/#{file}", script_options
       end
 
       # Dispatches
       m.file "dispatches/dispatch.rb", "public/dispatch.rb", script_options
-      m.file "dispatches/publish.rb", "public/publish.rb", script_options
 
       # Docs
       m.file "doc/README_FOR_APP", "doc/README_FOR_APP"
 
       # Logs
-      %w(server production development test).each { |file|
+      %w(subscriber development test).each { |file|
         m.file "configs/empty.log", "log/#{file}.log", :chmod => 0666
       }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: adaptation
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Xavi Vila Morell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-23 00:00:00 +01:00
+date: 2009-01-27 00:00:00 +01:00
 default_executable: adaptation
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +47,7 @@ files:
 - bin/breakpointer
 - bin/about
 - bin/adaptation
+- bin/publish
 - bin/generate
 - bin/console
 - bin/mom
@@ -58,6 +59,10 @@ files:
 - lib/adaptation/mom.rb
 - lib/adaptation/message.rb
 - lib/adaptation/adaptor.rb
+- lib/adaptation/xmlblaster
+- lib/adaptation/xmlblaster/xmlblaster_client.rb
+- lib/adaptation/xmlblaster/xmlblaster_callback_server.rb
+- lib/adaptation/xmlblaster/xmlblaster_callback_client.rb
 - lib/adaptation/druby_subscriber.rb
 - lib/adaptation/test
 - lib/adaptation/test/fake_fixtures.rb
@@ -117,6 +122,7 @@ files:
 - lib/commands/subscribe.rb
 - lib/commands/destroy.rb
 - lib/commands/generate.rb
+- lib/commands/publish.rb
 - helpers/application.rb
 - helpers/test.rb
 - helpers/publish.rb
@@ -129,7 +135,6 @@ files:
 - configs/empty.log
 - configs/boot.rb
 - dispatches/dispatch.rb
-- dispatches/publish.rb
 - README
 - CHANGELOG
 - fresh_rakefile