jruby-hornetq 0.4.0 → 0.5.0.alpha

data/lib/hornetq/client/org_hornetq_core_client_impl_client_producer_impl.rb

@@ -2,30 +2,30 @@
 # TODO Support send(:data => string, :durable=>true, :address=>'MyAddress')
 #
 # See: http://hornetq.sourceforge.net/docs/hornetq-2.1.2.Final/api/index.html?org/hornetq/api/core/client/ClientProducer.html
-# 
+#
 # Other methods still directly accessible through this class:
 #
-# void 	send(Message message)
+# void   send(Message message)
 #          Sends a message to an address
-# void 	send(String address, Message message)
+# void   send(String address, Message message)
 #          Sends a message to the specified address instead of the ClientProducer's address
-#          
-#	close()
+#
+#  close()
 #          Closes the ClientProducer
-# boolean 	closed?
+# boolean   closed?
 #          Returns whether the producer is closed or not
-#          
-# SimpleString 	address()
+#
+# SimpleString   address()
 #          Returns the address where messages will be sent
-#          
-# int 	max_rate()
+#
+# int   max_rate()
 #          Returns the maximum rate at which a ClientProducer can send messages per second
-#          
-# boolean 	block_on_durable_send?
+#
+# boolean   block_on_durable_send?
 #          Returns whether the producer will block when sending durable messages
-# boolean 	block_on_non_durable_send?
+# boolean   block_on_non_durable_send?
 #          Returns whether the producer will block when sending non-durable messages
-#          
+#
 class Java::org.hornetq.core.client.impl::ClientProducerImpl
   def send_with_retry(message)
     first_time = true

data/lib/hornetq/client/org_hornetq_utils_typed_properties.rb

@@ -1,6 +1,6 @@
 # Used by HornetQ to move around HashMap messages
 # Ruby methods added to make it behave like a Ruby Hash
-class Java::org.hornetq.utils::TypedProperties 
+class Java::org.hornetq.utils::TypedProperties
   # Get a property
   def [](key)
     value = getProperty(key)
@@ -28,7 +28,7 @@ class Java::org.hornetq.utils::TypedProperties
       putSimpleStringProperty(key,val.to_s)
     end
   end
-  
+
   # Iterate through each key,value pair
   def each_pair(&proc)
     it = property_names.iterator
@@ -37,23 +37,23 @@ class Java::org.hornetq.utils::TypedProperties
       proc.call(key.to_string, self[key])
     end
   end
-  
+
   # Convert Properties to a Ruby Hash
   def to_h
     h = {}
-    each_pair do |key, value| 
+    each_pair do |key, value|
       h[key] = value
     end
     h
   end
-  
+
   # Write Hash values into this TyedProperties instance
   def from_h(hash)
     hash.each_pair do |key,value|
       self[key] = value
     end
   end
-  
+
   def inspect
     "#{self.class.name}: #{to_h.inspect}"
   end

data/lib/hornetq/client/requestor_pattern.rb

@@ -1,6 +1,6 @@
 module HornetQ::Client
 
-  # Implements the Requestor Pattern 
+  # Implements the Requestor Pattern
   #   Send a request to a server and wait for a reply
   # Parameters
   # * session
@@ -10,12 +10,12 @@ module HornetQ::Client
   #   Address to send requests to.
   #   It is expected that process listening to requests at this address has
   #   implemented the ServerPattern
-  # * reply_address 
-  #   If supplied the reply_address must already exist and will be used for 
+  # * reply_address
+  #   If supplied the reply_address must already exist and will be used for
   #   receiving responses
   #   If not supplied a temporary queue will be created and used by this instance
   #   of the RequestorPattern
-  #   This optional parameter is normally not used 
+  #   This optional parameter is normally not used
   # * reply_queue
   #   If a reply_address is supplied, the reply_queue name can be supplied if it
   #   differs from reply_address
@@ -37,26 +37,26 @@ module HornetQ::Client
         end
       end
     end
-    
+
     # Synchronous Request and wait for reply
-    #  
+    #
     # Returns the message received, or nil if no message was received in the
     # specified timeout.
-    # 
+    #
     # The supplied request_message is updated as follows
     # * The property JMSReplyTo is set to the name of the reply to address
     # * Creates and sets the message user_id if not already set
     # * #TODO: The expiry is set to the message timeout if not already set
-    # 
-    # Note: 
+    #
+    # Note:
     # * The request will only look for a reply message with the same
     #   user_id (message id) as the message that was sent. This is critical
     #   since a previous receive may have timed out and we do not want
-    #   to pickup the reponse to an earlier request 
-    # 
+    #   to pickup the reponse to an earlier request
+    #
     # To receive a message after a timeout, call wait_for_reply with a nil message
     # id to receive any message on the queue
-    # 
+    #
     # Use: submit_request & then wait_for_reply to break it into
     #      two separate calls
     def request(request_message, timeout)
@@ -64,19 +64,19 @@ module HornetQ::Client
       message_id = submit_request(request_message)
       wait_for_reply(message_id, timeout)
     end
-    
+
     # Asynchronous Request
     #  Use: submit_request & then wait_for_reply to break the request into
     #       two separate calls.
-    #       
+    #
     # For example, submit the request now, do some work, then later on
     # in the same thread wait for the reply.
-    # 
+    #
     # The supplied request_message is updated as follows
     # * The property JMSReplyTo is set to the name of the reply to address
     # * Creates and sets the message user_id if not already set
     # * #TODO: The expiry is set to the message timeout if not already set
-    # 
+    #
     # Returns Message id of the message that was sent
     def submit_request(request_message)
       request_message.reply_to_address = @reply_address
@@ -84,16 +84,16 @@ module HornetQ::Client
       @producer.send(request_message)
       request_message.user_id
     end
-    
+
     # Asynchronous wait for reply
-    # 
+    #
     # Parameters:
-    #   user_id: the user defined id to correlate a response for 
-    # 
+    #   user_id: the user defined id to correlate a response for
+    #
     # Supply a nil user_id to receive any message from the queue
-    #  
+    #
     # Returns the message received
-    # 
+    #
     # Note: Call submit_request before calling this method
     def wait_for_reply(user_id, timeout)
       # We only want the reply to the supplied message_id, so set filter on message id
@@ -102,11 +102,11 @@ module HornetQ::Client
         consumer.receive(timeout)
       end
     end
-    
+
     def close
       @session.delete_queue(@reply_queue) if @destroy_temp_queue
       @producer.close if @producer
     end
   end
-  
+
 end

data/lib/hornetq/client/server_pattern.rb

@@ -1,5 +1,5 @@
 module HornetQ::Client
-  # Create a Server following the ServerPattern for receiving requests and 
+  # Create a Server following the ServerPattern for receiving requests and
   # replying to arbitrary queues
   # Create an instance of this class per thread
   class ServerPattern
@@ -9,13 +9,13 @@ module HornetQ::Client
       @producer = session.create_producer
       @timeout = timeout
     end
-  
+
     def run(&block)
       while request_message = @consumer.receive(@timeout)
         # Block should return a message reply object, pass in request
         # TODO: ensure..
         reply_message = block.call(request_message)
-      
+
         # Send a reply?
         reply(request_message, reply_message) if request_message.request?
         request_message.acknowledge
@@ -42,7 +42,7 @@ module HornetQ::Client
       end
       request_message.acknowledge
     end
-  
+
     # Close out resources
     def close
       @consumer.close if @consumer

data/lib/hornetq/client/session_pool.rb

@@ -58,11 +58,11 @@ module HornetQ::Client
         @pool.with_connection &block
       end
 
-      # Obtain a session from the pool and create a ClientConsumer. 
-      # Pass both into the supplied block. 
+      # Obtain a session from the pool and create a ClientConsumer.
+      # Pass both into the supplied block.
       # Once the block is complete the consumer is closed and the session is
       # returned to the pool.
-      # 
+      #
       # See  HornetQ::Client::ClientConsumer for more information on the consumer
       #      parameters
       #
@@ -82,12 +82,12 @@ module HornetQ::Client
           end
         end
       end
-      
-      # Obtain a session from the pool and create a ClientProducer. 
-      # Pass both into the supplied block. 
+
+      # Obtain a session from the pool and create a ClientProducer.
+      # Pass both into the supplied block.
       # Once the block is complete the consumer is closed and the session is
       # returned to the pool.
-      # 
+      #
       # See  HornetQ::Client::ClientProducer for more information on the producer
       #      parameters
       #
@@ -108,12 +108,12 @@ module HornetQ::Client
           end
         end
       end
-      
+
       # Obtain a session from the pool and create a Client::Requestor.
-      # Pass both into the supplied block. 
+      # Pass both into the supplied block.
       # Once the block is complete the requestor is closed and the session is
       # returned to the pool.
-      # 
+      #
       # See  HornetQ::Client::Requestor for more information on the requestor
       #
       # Example
@@ -131,12 +131,12 @@ module HornetQ::Client
           end
         end
       end
-      
+
       # Obtain a session from the pool and create a Client::Server.
-      # Pass both into the supplied block. 
+      # Pass both into the supplied block.
       # Once the block is complete the requestor is closed and the session is
       # returned to the pool.
-      # 
+      #
       # See  HornetQ::Client::Server for more information on the server
       #
       # Example
@@ -154,10 +154,10 @@ module HornetQ::Client
           end
         end
       end
-      
+
       # Immediately Close all sessions in the pool and release from the pool
-      # 
-      # TODO: Allow an option to wait for active sessions to be returned before 
+      #
+      # TODO: Allow an option to wait for active sessions to be returned before
       #       closing
       def close
         @pool.each do |s|
@@ -166,9 +166,9 @@ module HornetQ::Client
           #@pool.remove(s)
         end
       end
-      
+
     end
-    
+
   end
 
 end

data/lib/hornetq/common/logging.rb

@@ -2,20 +2,13 @@
 module HornetQ
   # Returns the logger being used by both HornetQ and jruby-hornetq
   def self.logger
-    @logger ||= (self.rails_logger || self.default_logger)
+    @logger ||= (self.rails_logger || self.ruby_logger)
   end
 
   # Replace the logger for both HornetQ and jruby-hornetq
   # TODO Directly support Log4J as logger since HornetQ has direct support for Log4J
   def self.logger=(logger)
     @logger = logger
-    # Also replace the HornetQ logger
-    if @logger
-      Java::org.hornetq.core.logging::Logger.setDelegateFactory(HornetQ::LogDelegateFactory.new)
-    else
-      Java::org.hornetq.core.logging::Logger.reset      
-    end
-    # TODO org.hornetq.core.logging.Logger.setDelegateFactory(org.hornetq.integration.logging.Log4jLogDelegateFactory.new)
   end
 
   # Use the ruby logger, but add needed trace level logging which will result
@@ -36,10 +29,4 @@ module HornetQ
       (defined?(RAILS_DEFAULT_LOGGER) && RAILS_DEFAULT_LOGGER.respond_to?(:debug) && RAILS_DEFAULT_LOGGER)
   end
 
-  # By default we use the HornetQ Logger
-  def self.default_logger
-    # Needs an actual Java class, so give it: org.hornetq.api.core.client::HornetQClient
-    Java::org.hornetq.core.logging::Logger.getLogger(org.hornetq.api.core.client::HornetQClient)
-  end
- 
 end

data/lib/hornetq/server.rb

@@ -2,8 +2,11 @@ module HornetQ
   module Server
     # Only load as needed
     def self.load_requirements
-      HornetQ.require_jar 'hornetq-core'
+      HornetQ.require_jar 'jnp-client'
       HornetQ.require_jar 'netty'
+      HornetQ.require_jar 'hornetq-commons'
+      HornetQ.require_jar 'hornetq-journal'
+      HornetQ.require_jar 'hornetq-server'
       require 'hornetq/server/org_hornetq_core_server_hornet_q_server'
     end
 

data/lib/hornetq/version.rb

@@ -0,0 +1,3 @@
+module HornetQ
+  VERSION = "0.5.0.alpha"
+end

data/nbproject/private/private.properties

@@ -0,0 +1,4 @@
+file.reference.jruby-hornetq-bin=/Users/rmorrison/Sandbox/jruby-hornetq/bin
+file.reference.jruby-hornetq-examples=/Users/rmorrison/Sandbox/jruby-hornetq/examples
+file.reference.jruby-hornetq-lib=/Users/rmorrison/Sandbox/jruby-hornetq/lib
+file.reference.jruby-hornetq-test=/Users/rmorrison/Sandbox/jruby-hornetq/test

data/nbproject/private/private.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
+</project-private>

data/nbproject/private/rake-d.txt

@@ -0,0 +1,4 @@
+clean=Remove any temporary products.
+clobber=Remove any generated file.
+gem=Build gem
+test=Run Test Suite

data/nbproject/project.properties

@@ -0,0 +1,11 @@
+bin.dir=${file.reference.jruby-hornetq-bin}
+examples.dir=${file.reference.jruby-hornetq-examples}
+file.reference.jruby-hornetq-bin=bin
+file.reference.jruby-hornetq-examples=examples
+file.reference.jruby-hornetq-lib=lib
+file.reference.jruby-hornetq-test=test
+main.file=
+platform.active=JRuby
+source.encoding=UTF-8
+src.dir=${file.reference.jruby-hornetq-lib}
+test.src.dir=${file.reference.jruby-hornetq-test}

data/nbproject/project.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.ruby.rubyproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/ruby-project/1">
+            <name>jruby-hornetq</name>
+            <source-roots>
+                <root id="src.dir"/>
+                <root id="examples.dir"/>
+                <root id="bin.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+    </configuration>
+</project>