torquebox-stomp 2.3.2 → 3.0.0.beta1

data/lib/torquebox/stomp/ext/subscriber.rb

@@ -0,0 +1,25 @@
+
+# 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.
+
+module org.projectodd.stilts.stomplet::Subscriber
+
+  def [](name)
+    self.getParameter( name.to_s )
+  end
+
+end

data/lib/torquebox/stomp/jms_stomplet.rb

@@ -19,41 +19,33 @@ module TorqueBox
   module Stomp
     class JmsStomplet
 
-      include TorqueBox::Injectors
-    
       def initialize()
-        @connection_factory = fetch( 'xa-connection-factory' )
+        @connection_factory = TorqueBox.fetch( 'xa-connection-factory' )
         @subscriptions = {}
       end
-    
-      def xa_resources
-        @xa_resources 
-      end
-    
+
+      #def xa_resources
+      #  @xa_resources
+      #end
+
       def configure(stomplet_config)
-        @connection = @connection_factory.create_connection
+        @connection = @connection_factory.create_xa_connection
         @connection.start
-        @session = @connection.create_session
+        @session = @connection.create_session( false )
         @xa_resources = [ @session.xa_resource ]
       end
-    
+
       def destroy
         @session.close
         @connection.close
       end
 
-      # -----
-      # -----
-    
       def on_unsubscribe(subscriber)
         subscriptions = @subscriptions.delete( subscriber )
         (subscriptions || []).each do |subscription|
           subscription.close
         end
       end
-    
-      # -----
-      # -----
 
       def queue(name)
         jms_session = @session.jms_session
@@ -69,30 +61,30 @@ module TorqueBox
         return queue(name) if ( type.to_sym == :queue )
         topic(name)
       end
-    
-      def subscribe_to(subscriber, destination, selector=nil)
+
+      def subscribe_to(subscriber, destination, selector=nil, options={})
         jms_session = @session.jms_session
         java_destination = @session.java_destination( destination )
         consumer = @session.jms_session.create_consumer( java_destination.to_java, selector )
-        consumer.message_listener = MessageListener.new( subscriber )
+        consumer.message_listener = MessageListener.new( subscriber, options )
         @subscriptions[ subscriber ] ||= []
         @subscriptions[ subscriber ] << consumer
       end
-    
-      def send_to(destination, stomp_message, headers={})
+
+      def send_to(destination, stomp_message, headers={}, options={})
         jms_session = @session.jms_session
         java_destination = @session.java_destination( destination )
-    
+
         producer    = @session.jms_session.create_producer( java_destination.to_java )
 
-        case ( stomp_message ) 
+        case ( stomp_message )
         when org.projectodd.stilts.stomp::StompMessage
           content = stomp_message.content_as_string
         else
-          content = stomp_message.to_s
+          content = stomp_message
         end
 
-        encoded_message = TorqueBox::Messaging::Message.new( @session.jms_session, content )
+        encoded_message = TorqueBox::Messaging::Message.new( @session.jms_session, content, options[:encoding] )
         jms_message = encoded_message.jms_message
 
         if ( stomp_message.is_a?( org.projectodd.stilts.stomp::StompMessage ) )
@@ -110,26 +102,37 @@ module TorqueBox
 
         producer.send( jms_message )
       end
-    
+
+      # @api private
       class MessageListener
         include javax.jms.MessageListener
-    
-        def initialize(subscriber)
+
+        def initialize(subscriber, options={})
           @subscriber = subscriber
+          @encoding = options[:encoding] 
         end
-    
+
         def onMessage(jms_message)
-          stomp_message = TorqueBox::Stomp::Message.new( TorqueBox::Messaging::Message.new( jms_message ).decode )
+          content = TorqueBox::Messaging::Message.new( jms_message ).decode
+          ( content = TorqueBox::Codecs.encode( content, @encoding ) ) if @encoding
+          stomp_message = TorqueBox::Stomp::Message.new( content )
           jms_message.property_names.each do |name|
             value = jms_message.getObjectProperty( name ).to_s
             stomp_message.headers.put( name.to_s.to_java( java.lang.String ), value.to_java( java.lang.String) ) if value
           end
+          if ( stomp_message.headers[ 'content-type' ] == nil )
+            if ( @encoding == :json )
+              stomp_message.headers.put( "content-type", "application/json" )
+            else
+              stomp_message.headers.put( "content-type", "text/plain" )
+            end
+          end
           @subscriber.send( stomp_message )
         end
-    
+
       end
-    
+
     end
 
   end
-end 
+end