rjack-jms 1.0.0-java → 1.1.0-java

data/History.rdoc

@@ -1,2 +1,8 @@
+=== 1.1.0 (2011-3-10)
+* Added JMSConnector and ConnectListener for JMS (re-)connect.
+* Added SessionExecutor, SessionStateFactory, SessionTask for client
+  session thread pool support.
+* slf4j (and dev: logback) dependency for logging in above.
+
 === 1.0.0 (2011-2-5)
 * Initial release.

data/Manifest.txt

@@ -6,5 +6,8 @@ Rakefile
 pom.xml
 lib/rjack-jms/base.rb
 lib/rjack-jms.rb
-test/test_jms.rb
-lib/rjack-jms/rjack-jms-1.0.0.jar
+test/mocks.rb
+test/setup.rb
+test/test_executor.rb
+test/test_jms_connector.rb
+lib/rjack-jms/rjack-jms-1.1.0.jar

data/README.rdoc

@@ -5,7 +5,7 @@
 
 == Description
 
-Java Messaging Service utilities, with gem packaging.
+Java Messaging Service (JMS) utilities, with gem packaging.
 
 == License
 

data/Rakefile

@@ -14,11 +14,13 @@ t = TarPit.new( 'rjack-jms', JMS::VERSION,
 
 t.specify do |h|
   h.developer( "David Kellum", "dek-oss@gravitext.com" )
+  h.extra_deps   += [ [ 'rjack-slf4j',    '>= 1.5.8',  '< 1.7' ],
+                      [ 'rjack-jms-spec', '~> 1.1.1' ] ]
+  h.rdoc_locations << "dekellum@rubyforge.org:/var/www/gforge-projects/rjack/jms"
 
-  h.extra_deps   += [ [ 'rjack-jms-spec', '~> 1.1.1' ] ]
-
-  h.rubyforge_name  = "rjack"
-  h.remote_rdoc_dir = "jms"
+  h.testlib = :minitest
+  h.extra_dev_deps += [ [ 'rjack-logback', '>= 0.9.18', '< 2.0' ],
+                        [ 'minitest',      '>= 1.7.1',  '< 2.1' ] ]
 end
 
 file 'Manifest.txt' => [ "lib/#{t.name}/base.rb" ]

data/lib/rjack-jms.rb

@@ -17,12 +17,21 @@
 require 'rjack-jms/base'
 
 require 'rjack-jms-spec'
+require 'rjack-slf4j'
+
+require 'java'
 
 module RJack
   module JMS
     require "rjack-jms/rjack-jms-#{VERSION}.jar"
 
+    import 'rjack.jms.ConnectListener'
+    import 'rjack.jms.JMSConnector'
     import 'rjack.jms.JMSContext'
-
+    import 'rjack.jms.JMSRuntimeException'
+    import 'rjack.jms.SessionExecutor'
+    import 'rjack.jms.SessionState'
+    import 'rjack.jms.SessionStateFactory'
+    import 'rjack.jms.SessionTask'
   end
 end

data/lib/rjack-jms/base.rb

@@ -16,6 +16,6 @@
 
 module RJack
   module JMS
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
   end
 end

data/pom.xml

@@ -4,7 +4,7 @@
   <groupId>rjack</groupId>
   <artifactId>rjack-jms</artifactId>
   <packaging>jar</packaging>
-  <version>1.0.0</version>
+  <version>1.1.0</version>
   <name>Java Message Service Utilizes</name>
 
   <developers>
@@ -48,6 +48,13 @@
       <version>[1.1.1,1.2)</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>[1.6.1,1.7)</version>
+      <scope>compile</scope>
+    </dependency>
+
   </dependencies>
 
   <build>

data/test/mocks.rb

@@ -0,0 +1,90 @@
+#--
+# Copyright (c) 2011 David Kellum
+#
+# 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.
+#++
+
+# Base class for mocks, keeps a called list
+class TrackingMock
+  attr_reader :called
+
+  def initialize
+    @called = []
+  end
+
+  def method_missing( name, *args )
+    called << name
+  end
+end
+
+class Connection < TrackingMock
+  include javax.jms.Connection
+
+  attr_accessor :exception_listener
+end
+
+class Context < TrackingMock
+  include RJack::JMS::JMSContext
+
+  def create_connection
+    called << :create_connection
+    Connection.new
+  end
+
+  def create_session( *args )
+    called << :create_session
+    TrackingMock.new
+  end
+
+end
+
+class Listener < TrackingMock
+  include RJack::JMS::ConnectListener
+end
+
+class TestSessionStateFactory < TrackingMock
+  include RJack::JMS::SessionStateFactory
+
+  attr_reader :last_session
+  attr_reader :session_count
+
+  def create_session_state( *args )
+    called << :create_session_state
+    @session_count ||= 0
+    @session_count += 1
+    @last_session = TestSessionState.new( *args )
+  end
+
+end
+
+class TestSessionState < RJack::JMS::SessionState
+  def close
+    super
+    @closed = true
+  end
+
+  def closed?
+    @closed
+  end
+end
+
+class TestSessionTask < RJack::JMS::SessionTask
+  def initialize( &block )
+    super()
+    @block = block
+  end
+
+  def runTask( state )
+    @block.call( state )
+  end
+end

data/test/setup.rb

@@ -0,0 +1,50 @@
+#--
+# Copyright (c) 2011 David Kellum
+#
+# 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.
+#++
+
+#### General test setup: LOAD_PATH, logging, console output ####
+
+test_dir = File.dirname( __FILE__ )
+ldir = File.join( test_dir, "..", "lib" )
+$LOAD_PATH.unshift( ldir ) unless $LOAD_PATH.include?( ldir )
+
+$LOAD_PATH.unshift( test_dir ) unless $LOAD_PATH.include?( test_dir )
+
+require 'rubygems'
+require 'rjack-logback'
+
+require 'rjack-jms'
+
+require 'minitest/unit'
+require 'minitest/autorun'
+
+RJack::Logback.config_console( :stderr => true )
+
+if ARGV.include?( '-v' ) || ARGV.include?( '-verbose' )
+
+  RJack::Logback.root.level = RJack::Logback::DEBUG
+  RJack::Logback[ 'rjack.jms.JMSConnector' ].level = RJack::Logback::INFO
+
+  # Make test output logging compatible: no partial lines.
+  class TestOut
+    def print( *a ); $stdout.puts( *a ); end
+    def puts( *a );  $stdout.puts( *a ); end
+  end
+  MiniTest::Unit.output = TestOut.new
+
+else
+  #Squelch test logging
+  RJack::Logback[ 'rjack.jms' ].level = RJack::Logback::ERROR
+end

data/test/test_executor.rb

@@ -0,0 +1,101 @@
+#!/usr/bin/env jruby
+#.hashdot.profile += jruby-shortlived
+#--
+# Copyright (c) 2011 David Kellum
+#
+# 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 File.join( File.dirname( __FILE__ ), "setup" )
+
+require 'mocks'
+
+class TestExecutor < MiniTest::Unit::TestCase
+  include RJack::JMS
+
+  import 'javax.jms.JMSException'
+
+  def setup
+    @connector = JMSConnector.new( @context = Context.new )
+    @session_factory = TestSessionStateFactory.new
+    @executor = SessionExecutor.new( @connector,
+                                     @session_factory,
+                                     3,  #queue length
+                                     1 ) #threads
+    @connector.start
+  end
+
+  def teardown
+    shutdown
+    @connector.stop
+    @connector = nil
+  end
+
+  def shutdown
+    if @executor
+      @executor.shutdown
+      @executor.awaitTermination( 3, java.util.concurrent.TimeUnit::SECONDS )
+      @executor = nil
+    end
+  end
+
+  def test_start_shutdown
+  end
+
+  def test_execute
+    ran = false
+
+    task = TestSessionTask.new do |session_state|
+      ran = true
+      assert_kind_of( TestSessionState, session_state )
+    end
+
+    @executor.execute( task )
+
+    shutdown
+    assert( ran, "Test task should have run by now" )
+
+    sleep 0.1 #FIXME: awaitTerminate can return before SessionThread.close
+    assert( @session_factory.last_session.closed?,
+            "SessionState should be closed" )
+  end
+
+  def test_execute_many
+
+    runs = 0
+    5.times { @executor.execute( TestSessionTask.new { runs += 1 } ) }
+
+    shutdown
+    assert_equal( 5, runs, "All 5 tasks should have run" )
+
+    sleep 0.1 #FIXME: awaitTerminate can return before SessionThread.close
+    assert( @session_factory.last_session.closed?,
+            "SessionState should be closed" )
+    assert_equal( 1, @session_factory.session_count,
+                     "Should run all in one session." )
+  end
+
+  def test_jms_exception
+    task = TestSessionTask.new { raise JMSException.new( "test" ) }
+    @executor.execute( task )
+
+    ran = false
+    @executor.execute( TestSessionTask.new { ran = true } )
+
+    shutdown
+    assert( ran, "Test task should have run by now" )
+    assert_equal( 2, @session_factory.session_count,
+                  "Two sessions given first task failure." )
+  end
+
+end

data/test/test_jms_connector.rb

@@ -0,0 +1,85 @@
+#!/usr/bin/env jruby
+#.hashdot.profile += jruby-shortlived
+#--
+# Copyright (c) 2011 David Kellum
+#
+# 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 File.join( File.dirname( __FILE__ ), "setup" )
+
+require 'mocks'
+
+class TestJMSConnector < MiniTest::Unit::TestCase
+  include RJack::JMS
+
+  import 'javax.jms.JMSException'
+  import 'javax.naming.NamingException'
+
+  def setup
+    @connector = JMSConnector.new( @context = Context.new )
+  end
+
+  def test_start_stop
+    @connector.start
+    # May or may not actually run in time before stop.
+    # But shouldn't deadlock.
+    @connector.stop
+  end
+
+  def test_start_await_stop
+    @connector.add_connect_listener( listener = Listener.new )
+    @connector.start
+
+    con = @connector.await_connection
+    assert_kind_of( Connection, con )
+    assert_includes( listener.called, :onConnect )
+    assert_includes( con.called, :start )
+
+    @connector.stop
+    assert_includes( @context.called, :close )
+  end
+
+  def test_on_exception
+    @connector.start
+
+    con = @connector.await_connection
+    assert_includes( con.called, :start )
+
+    con.exception_listener.on_exception( JMSException.new( "test" ) )
+
+    con2 = @connector.await_connection
+    assert_includes( con.called, :close ) # closed in connection loop
+
+    refute_equal( con, con2 )
+    assert_includes( con2.called, :start )
+
+    @connector.stop
+    assert_includes( @context.called, :close )
+  end
+
+  def test_failed_listener
+    @connector.add_connect_listener( listener = Listener.new )
+
+    def listener.on_connect( *args )
+      raise NamingException.new( "test" )
+    end
+
+    assert_raises( NativeException, NamingException ) do
+      @connector.connect_loop
+    end
+
+    assert_includes( @context.called, :close )
+  end
+
+end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rjack-jms
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-    - 1
-    - 0
-    - 0
-  version: 1.0.0
+  prerelease: 
+  version: 1.1.0
 platform: java
 authors: 
   - David Kellum
@@ -14,38 +10,74 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-05 00:00:00 -08:00
+date: 2011-03-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
-    name: rjack-jms-spec
+    name: rjack-slf4j
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.5.8
+        - - <
+          - !ruby/object:Gem::Version 
+            version: "1.7"
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: rjack-jms-spec
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 1
-              - 1
             version: 1.1.1
     type: :runtime
-    version_requirements: *id001
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: rjack-logback
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.9.18
+        - - <
+          - !ruby/object:Gem::Version 
+            version: "2.0"
+    type: :development
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: minitest
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.7.1
+        - - <
+          - !ruby/object:Gem::Version 
+            version: "2.1"
+    type: :development
+    version_requirements: *id004
   - !ruby/object:Gem::Dependency 
     name: rjack-tarpit
     prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
+    requirement: &id005 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 3
-              - 0
             version: 1.3.0
     type: :development
-    version_requirements: *id002
-description: Java Messaging Service utilities, with gem packaging.
+    version_requirements: *id005
+description: Java Messaging Service (JMS) utilities, with gem packaging.
 email: 
   - dek-oss@gravitext.com
 executables: []
@@ -66,8 +98,11 @@ files:
   - pom.xml
   - lib/rjack-jms/base.rb
   - lib/rjack-jms.rb
-  - test/test_jms.rb
-  - lib/rjack-jms/rjack-jms-1.0.0.jar
+  - test/mocks.rb
+  - test/setup.rb
+  - test/test_executor.rb
+  - test/test_jms_connector.rb
+  - lib/rjack-jms/rjack-jms-1.1.0.jar
 has_rdoc: true
 homepage: http://rjack.rubyforge.org
 licenses: []
@@ -79,25 +114,24 @@ rdoc_options:
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 requirements: []
 
-rubyforge_project: rjack
-rubygems_version: 1.3.6
+rubyforge_project: rjack-jms
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
-summary: Java Messaging Service utilities, with gem packaging.
+summary: Java Messaging Service (JMS) utilities, with gem packaging.
 test_files: 
-  - test/test_jms.rb
+  - test/test_jms_connector.rb
+  - test/test_executor.rb

data/test/test_jms.rb

@@ -1,33 +0,0 @@
-#!/usr/bin/env jruby
-#.hashdot.profile += jruby-shortlived
-#--
-# Copyright (c) 2011 David Kellum
-#
-# 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.
-#++
-
-$LOAD_PATH.unshift File.join( File.dirname(__FILE__), "..", "lib" )
-
-require 'java'
-require 'rubygems'
-
-require 'rjack-jms'
-
-require 'test/unit'
-
-class TestJMS < Test::Unit::TestCase
-
-  def test_load
-    assert( true ) #FIXME: Just asserting that the load works for now
-  end
-end