torquebox-messaging 3.2.0-java → 4.0.0.alpha1-java

data/lib/torquebox/messaging/topic.rb

@@ -1,65 +1,103 @@
-# Copyright 2008-2013 Red Hat, Inc, and individual contributors.
-# 
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-# 
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+# Copyright 2014 Red Hat, Inc, and individual contributors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
-require 'torquebox/messaging/destination'
-require 'torquebox/service_registry'
 
 module TorqueBox
   module Messaging
+    # Represents a messaging topic.
+    #
+    # Obtain a topic object by calling {TorqueBox::Messaging.topic}.
     class Topic < Destination
 
-      DEFAULT_SUBSCRIBER_NAME = 'subscriber-1'
+      # Valid options for topic creation.
+      TOPIC_OPTIONS = optset(WBMessaging::CreateTopicOption, :default_options)
 
-      class << self
+      # Valid options for {#subscribe}.
+      SUBSCRIBE_OPTIONS = optset(WBTopic::SubscribeOption)
 
-        # Creates the topic, starts and return a Topic object.
-        #
-        # @param name The name of the topic
-        # @param options Optional parameters (a Hash), including:
-        # @option options [Boolean] :exported If the topic should be visible in remote JNDI lookups
-        # @return [Topic] if the service is created and started
-        # @return [nil] if the service is not created in the specified time (30 s)
-        def start(name, options={})
-          exported = options.fetch(:exported, false)
-
-          with_destinationizer do |destinationizer|
-            destinationizer.create_topic(name, exported)
-          end
+      # Sets up a durable subscription to this topic, and registers a
+      # listener with the given block to receive messages on the
+      # subscription.
+      #
+      # A name is used to identify the subscription, allowing you to
+      # stop the listener and resubscribe with the same name in the
+      # future without losing messages sent in the interim.
+      #
+      # If a selector is provided, then only messages having
+      # properties matching that expression may be received.
+      #
+      # If no context is provided, a new context is created for this
+      # subscriber. If a context is provided, it must have its :client_id
+      # set (see Context).
+      #
+      # Subscriptions should be torn down when no longer needed - (see
+      # #unsubscribe).
 
-          new(name, options)
+      # @param name [String] The name of the subscription.
+      # @param options [Hash] Options for the subscription.
+      # @option options :decode [true, false] If true, the decoded
+      #   message body is passed to the block. Otherwise, the
+      #   base message object is passed.
+      # @option options :context [Context] a context to use;
+      #   caller expected to close.
+      # @return A listener object that can be stopped by
+      #   calling .close on it.
+      def subscribe(name, options = {}, &block)
+        validate_options(options, SUBSCRIBE_OPTIONS)
+        options = apply_default_options(options)
+        options = coerce_context(options)
+        handler = MessageHandler.new do |message|
+          block.call(options.fetch(:decode, true) ? message.body : message)
         end
+        @internal_destination.subscribe(name, handler,
+                                        Codecs.java_codecs,
+                                        extract_options(options, WBTopic::SubscribeOption))
       end
 
-      # Unsubscribes the selected subscriber from the topic
+      # Valid options for {#unsubscribe}.
+      UNSUBSCRIBE_OPTIONS = optset(WBTopic::UnsubscribeOption)
+
+      # Tears down a durable topic subscription.
       #
-      # @param subscriber_name The subscriber name to unsubscribe
-      # @param options Optional parameters (a Hash)
+      # If no context is provided, a new context is created for
+      # this action. If a context is provided, it must have its
+      # :client_id set to the same value used when creating the
+      # subscription (see #subscribe).
+      #
+      # @param name [String] The name of the subscription.
+      # @param options [Hash] Options for the subscription.
+      # @option options :context [Context] a context to use;
+      #   caller expected to close.
       # @return [void]
-      def unsubscribe(subscriber_name = DEFAULT_SUBSCRIBER_NAME, options = { })
-        wait_for_destination(options[:startup_timeout]) do
-          with_session do |session|
-            session.unsubscribe( subscriber_name )
-          end
-        end
+      def unsubscribe(name, options = {})
+        validate_options(options, UNSUBSCRIBE_OPTIONS)
+        options = apply_default_options(options)
+        options = coerce_context(options)
+        @internal_destination.unsubscribe(name,
+                                          extract_options(options, WBTopic::UnsubscribeOption))
       end
-      
-      def to_s
-        "[Topic: #{super}]"
+
+      protected
+
+      def initialize(name, options = {})
+        validate_options(options, TOPIC_OPTIONS)
+        coerced_opts = coerce_context(options)
+        create_options = extract_options(coerced_opts, WBMessaging::CreateTopicOption)
+        super(default_broker.find_or_create_topic(name, create_options),
+              options)
       end
+
     end
   end
 end

metadata

@@ -1,136 +1,133 @@
 --- !ruby/object:Gem::Specification
 name: torquebox-messaging
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 4.0.0.alpha1
 platform: java
 authors:
 - The TorqueBox Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: torquebox-core
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0
-  version_requirements: !ruby/object:Gem::Requirement
+        version: 4.0.0.alpha1
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0.alpha1
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: torquebox-transactions
-  requirement: !ruby/object:Gem::Requirement
+  name: jbundler
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
-  version_requirements: !ruby/object:Gem::Requirement
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
   prerelease: false
-  type: :runtime
+  type: :development
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '0'
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '0'
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: newrelic_rpm
+  name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.3.2
+        version: '2.14'
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.3.2
+        version: '4.2'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.2'
   prerelease: false
   type: :development
-description: ''
-email:
-- torquebox-dev@torquebox.org
+description:
+email: torquebox-dev@torquebox.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/gem_hook.rb
-- lib/hornetq-commons-2.3.1.Final.jar
-- lib/hornetq-core-client-2.3.1.Final.jar
-- lib/hornetq-jms-client-2.3.1.Final.jar
-- lib/hornetq-journal-2.3.1.Final.jar
-- lib/jboss-jms-api_1.1_spec-1.0.1.Final.jar
-- lib/jboss-logging-3.1.2.GA.jar
-- lib/jboss-logmanager-1.4.0.Final.jar
-- lib/jboss-transaction-api_1.1_spec-1.0.1.Final.jar
-- lib/netty-3.6.2.Final.jar
-- lib/org.torquebox.messaging-client.rb
-- lib/torquebox-messaging.jar
 - lib/torquebox-messaging.rb
+- lib/wunderboss-jars/jboss-jms-api_2.0_spec-1.0.0.Final.jar
+- lib/wunderboss-jars/hornetq-server-2.4.5.Final.jar
+- lib/wunderboss-jars/hornetq-core-client-2.4.5.Final.jar
+- lib/wunderboss-jars/javax.inject-1.jar
+- lib/wunderboss-jars/netty-all-4.0.13.Final.jar
+- lib/wunderboss-jars/jboss-connector-api_1.5_spec-1.0.0.Final.jar
+- lib/wunderboss-jars/hornetq-native-2.4.5.Final.jar
+- lib/wunderboss-jars/jboss-common-core-2.2.10.GA.jar
+- lib/wunderboss-jars/jboss-transaction-spi-7.0.0.Final.jar
+- lib/wunderboss-jars/hornetq-jms-server-2.4.5.Final.jar
+- lib/wunderboss-jars/hornetq-jms-client-2.4.5.Final.jar
+- lib/wunderboss-jars/hornetq-commons-2.4.5.Final.jar
+- lib/wunderboss-jars/jnpserver-5.0.3.GA.jar
+- lib/wunderboss-jars/hornetq-journal-2.4.5.Final.jar
+- lib/wunderboss-jars/jboss-transaction-api_1.1_spec-1.0.0.Final.jar
+- lib/wunderboss-jars/wunderboss-messaging-1.x.incremental.174.jar
 - lib/torquebox/messaging.rb
-- lib/torquebox/messaging/backgroundable.rb
-- lib/torquebox/messaging/backgroundable_processor.rb
-- lib/torquebox/messaging/connection.rb
-- lib/torquebox/messaging/connection_factory.rb
-- lib/torquebox/messaging/const_missing.rb
-- lib/torquebox/messaging/core.rb
-- lib/torquebox/messaging/datamapper_marshaling.rb
-- lib/torquebox/messaging/destination.rb
-- lib/torquebox/messaging/echo_processor.rb
-- lib/torquebox/messaging/edn_message.rb
-- lib/torquebox/messaging/ext/javax_jms_queue_browser.rb
-- lib/torquebox/messaging/future.rb
-- lib/torquebox/messaging/future_responder.rb
-- lib/torquebox/messaging/future_status.rb
-- lib/torquebox/messaging/json_message.rb
-- lib/torquebox/messaging/marshal_base64_message.rb
-- lib/torquebox/messaging/marshal_message.rb
-- lib/torquebox/messaging/message.rb
-- lib/torquebox/messaging/message_processor.rb
-- lib/torquebox/messaging/processor_middleware/chain.rb
-- lib/torquebox/messaging/processor_middleware/default_middleware.rb
-- lib/torquebox/messaging/processor_middleware/with_transaction.rb
 - lib/torquebox/messaging/queue.rb
-- lib/torquebox/messaging/session.rb
-- lib/torquebox/messaging/task.rb
-- lib/torquebox/messaging/text_message.rb
+- lib/torquebox/messaging/context.rb
+- lib/torquebox/messaging/helpers.rb
 - lib/torquebox/messaging/topic.rb
-- lib/torquebox/messaging/xa_connection.rb
-- lib/torquebox/messaging/xa_connection_factory.rb
-- lib/torquebox/messaging/xa_session.rb
-- licenses/cc0-1.0.txt
-- spec/backgroundable_spec.rb
-- spec/chain_spec.rb
-- spec/datamapper_marshaling_spec.rb
-- spec/default_middleware_spec.rb
-- spec/destination_spec.rb
-- spec/future_responder_spec.rb
-- spec/future_spec.rb
-- spec/message_processor_spec.rb
-- spec/message_spec.rb
-- spec/task_spec.rb
-homepage: http://torquebox.org/
+- lib/torquebox/messaging/hornetq.rb
+- lib/torquebox/messaging/destination.rb
+- lib/torquebox/messaging/hornetq/address_settings.rb
+homepage: http://torquebox.org/torqbox
 licenses:
-- Public Domain
+- Apache-2.0
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -138,28 +135,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
-requirements: []
+      version: 1.3.1
+requirements:
+- jar org.projectodd.wunderboss:wunderboss-ruby, 1.x.incremental.174
+- jar org.projectodd.wunderboss:wunderboss-messaging, 1.x.incremental.174
 rubyforge_project:
-rubygems_version: 2.6.6
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
-summary: TorqueBox Messaging Client
-test_files:
-- spec/future_spec.rb
-- spec/future_responder_spec.rb
-- spec/destination_spec.rb
-- spec/message_processor_spec.rb
-- spec/datamapper_marshaling_spec.rb
-- spec/backgroundable_spec.rb
-- spec/default_middleware_spec.rb
-- spec/task_spec.rb
-- spec/chain_spec.rb
-- spec/message_spec.rb
+summary: TorqueBox Next Generation
+test_files: []
+has_rdoc:

data/lib/gem_hook.rb

@@ -1,51 +0,0 @@
-# Copyright 2008-2013 Red Hat, Inc, and individual contributors.
-# 
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-# 
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
-begin
-  javax.jms::Session
-rescue
-  # $stderr.puts "Will not load torquebox-messaging: javax.jms.* cannot be loaded"
-  return 
-end
-
-require 'torquebox/messaging/connection_factory'
-require 'torquebox/messaging/connection'
-require 'torquebox/messaging/session'
-
-require 'torquebox/messaging/message'
-require 'torquebox/messaging/json_message'
-require 'torquebox/messaging/edn_message'
-require 'torquebox/messaging/text_message'
-require 'torquebox/messaging/marshal_base64_message'
-require 'torquebox/messaging/marshal_message'
-
-require 'torquebox/messaging/destination'
-require 'torquebox/messaging/queue'
-require 'torquebox/messaging/topic'
-
-require 'torquebox/messaging/xa_connection_factory'
-require 'torquebox/messaging/xa_connection'
-require 'torquebox/messaging/xa_session'
-
-require 'torquebox/messaging/processor_middleware/chain'
-require 'torquebox/messaging/processor_middleware/with_transaction'
-require 'torquebox/messaging/message_processor'
-require 'torquebox/messaging/task'
-require 'torquebox/messaging/backgroundable'
-
-
-require 'torquebox/messaging/datamapper_marshaling'