jmx 0.2 → 0.3

data/Manifest.txt

@@ -3,12 +3,14 @@ Rakefile
 README.txt
 LICENSE.txt
 lib/jmx
+lib/jmx.rb
+lib/rmi.rb
 lib/jmx/dynamic_mbean.rb
 lib/jmx/server.rb
 lib/jmx/version.rb
-lib/jmx.rb
-lib/rmi.rb
 samples/memory.rb
 test/jmx_attribute_test.rb
 test/jmx_client_test.rb
+test/jmx_notification_test.rb
 test/jmx_server_test.rb
+test/object_name_test.rb

data/lib/jmx.rb

@@ -6,17 +6,19 @@ require 'jmx/server'
 
 import java.util.ArrayList
 import javax.management.Attribute
-import javax.management.DynamicMBean
 import javax.management.MBeanInfo
-import javax.management.ObjectName
+import javax.management.DynamicMBean
 
-class ObjectName
-  def [](key)
-    get_key_property(key.to_s)
-  end
+module JMX
+  import javax.management.ObjectName
+  class ObjectName
+    def [](key)
+      get_key_property(key.to_s)
+    end
   
-  def info(server)
-    server.getMBeanInfo(self)
+    def info(server)
+      server.getMBeanInfo(self)
+    end
   end
 end
 

data/lib/jmx/dynamic_mbean.rb

@@ -70,10 +70,10 @@ module JMX
   end
 end
 
-#  The Ruby-Java JMX utilities work throught the DynamicMBean concept.  Creators of Ruby based MBeans must inherit this
+#  The Ruby-Java JMX utilities work throughout the DynamicMBean concept.  Creators of Ruby based MBeans must inherit this
 # class (<tt>RubyDynamicMBean</tt>) in their own bean classes and then register them with a JMX mbean server.  
 #  Here is an example:
-#       class MyMBean < DynamicMBean
+#       class MyMBean < RuybDynamicMBean
 #         rw_attribute :status, :string, "Status information for this process"
 #         
 #         operation "Shutdown this process"
@@ -83,18 +83,27 @@ end
 #            "shutdown requests more time"
 #         end
 #       end
-# Once you have defined your bean class you can start declaring attributes and operations.  Attributes come in three flavors: 
-# read, write, and read write.  Simmilar to the <tt>attr*</tt> helpers, there are helpers that are used to create management 
-# attributes. Use +r_attribute+, +w_attribute+, and +rw_attribute+ to declare attributes, and the +operation+, +returns+, and +parameter+
-# helpers to define a management operation.
+# Once you have defined your bean class you can start declaring attributes and operations.  
+# Attributes come in three flavors: read, write, and read write.  Simmilar to the <tt>attr*</tt>
+# helpers, there are helpers that are used to create management attributes. Use +r_attribute+,
+# +w_attribute+, and +rw_attribute+ to declare attributes, and the +operation+, +returns+, 
+# and +parameter+ helpers to define a management operation.
 # Creating attributes with the *_attribute convention ALSO creates ruby accessors 
-# (it invokes the attr_accessor/attr_reader/attr_writer ruby helpers) to create ruby methods like: user_name= and username.  
-# So in your ruby code you can treat the attributes as "regular" ruby accessors
+# (it invokes the attr_accessor/attr_reader/attr_writer ruby helpers) to create ruby methods 
+# like: user_name= and username.  So in your ruby code you can treat the attributes 
+# as "regular" ruby accessors
 class RubyDynamicMBean
   import javax.management.MBeanOperationInfo
   import javax.management.MBeanAttributeInfo
+  import javax.management.DynamicMBean
+  import javax.management.MBeanInfo
   include JMX::JavaTypeAware
   
+  #NOTE this will not be needed when JRuby-3164 is fixed.
+  def self.inherited(cls)
+    cls.send(:include, DynamicMBean)
+  end
+  
   # TODO: preserve any original method_added?
   # TODO: Error handling here when it all goes wrong?
   def self.method_added(name) #:nodoc:
@@ -120,8 +129,6 @@ class RubyDynamicMBean
   # patterns of creating getters and setters in ruby
   #++
   def self.rw_attribute(name, type, description)
-    #QUESTION: Is this here to ensure that our type implements the interface?
-    include DynamicMBean
     attributes << JMX::Attribute.new(name, type, description, true, true).to_jmx
     attr_accessor name    
     #create a "java" oriented accessor method
@@ -140,15 +147,14 @@ class RubyDynamicMBean
     define_method("jmx_set_#{name.to_s.downcase}") do |value| 
       blck = to_ruby(type)
       eval "@#{name.to_s} = #{blck.call(value)}"
-    end
-    
+    end    
   end
+  
   # the <tt>r_attribute</tt> method is used to declare a JMX read only attribute.
   # see the +JavaSimpleTypes+ module for more information about acceptable types
   # usage: 
   #  r_attribute :attribute_name, :string, "Description displayed in a JMX console"
   def self.r_attribute(name, type, description)
-    include DynamicMBean        
     attributes << JMX::Attribute.new(name, type, description, true, false).to_jmx
     attr_reader name
     #create a "java" oriented accessor method
@@ -164,12 +170,12 @@ class RubyDynamicMBean
       attribute = javax.management.Attribute.new(name.to_s, value)
     end
   end
+  
   # the <tt>w_attribute</tt> method is used to declare a JMX write only attribute.
   # see the +JavaSimpleTypes+ module for more information about acceptable types
   # usage: 
   #  w_attribute :attribute_name, :string, "Description displayed in a JMX console"
   def self.w_attribute(name, type, description)
-    include DynamicMBean        
     attributes << JMX::Attribute.new(name, type, description, false, true).to_jmx
     attr_writer name
     define_method("jmx_set_#{name.to_s.downcase}") do |value|
@@ -187,7 +193,6 @@ class RubyDynamicMBean
   # Last operation wins if more than one
   #++
   def self.operation(description)
-    include DynamicMBean
 
     # Wait to error check until method_added so we can know method name
     Thread.current[:op] = JMX::Operation.new description
@@ -221,7 +226,8 @@ class RubyDynamicMBean
     @info = MBeanInfo.new name, description, attributes, nil, operations, nil
   end
 
-  # Retrieve the value of the requested attribute (where attribute is a javax.management.Attribute class)
+  # Retrieve the value of the requested attribute (where attribute is a 
+  # javax.management.Attribute class)
   def getAttribute(attribute)
     send("jmx_get_"+attribute.downcase)
   end

data/lib/jmx/server.rb

@@ -69,12 +69,16 @@ module JMX
 
       @server.query_names(object_name, query)
     end
+    
+    def unregister_mbean(object_name)
+      name = make_object_name object_name
+      @server.unregisterMBean(name)
+      
+    end
 
     def register_mbean(object, object_name)
       name = make_object_name object_name
-
       @server.registerMBean(object, name)
-
       MBeanProxy.generate(@server, name)
     end
     

data/lib/jmx/version.rb

@@ -1,3 +1,3 @@
 module JMX
-  VERSION = "0.2"
+  VERSION = "0.3"
 end

data/test/jmx_attribute_test.rb

@@ -1,11 +1,8 @@
-
 $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 
 require 'test/unit'
-require 'rmi'
 require 'jmx'
 
-
 class MyAttributeDynamicBean < RubyDynamicMBean
   rw_attribute :name1, :string, "My sample attribute"
   r_attribute :number1, :int, "My sample integer based attribute that is read only"
@@ -23,86 +20,9 @@ class MyAttributeDynamicBean < RubyDynamicMBean
   end
 end
 
-class JMXAttributeTest < Test::Unit::TestCase
-  
-  def setup
-    @madb = MyAttributeDynamicBean.new("test.MyTestBean","Mwahahahahahah")    
-  end
-  
-  #make sure we didn't break anything from a ruby perspective
-  def test_can_create_bean_and_access_accessor_type_methods
-    @madb.set_number1 4
-    assert_nil(@madb.name1)
-    @madb.name1 = "Name"
-    assert_equal("Name", @madb.name1)
-    assert_equal(4, @madb.number1)
-    @madb.number2 = 4
-    assert_equal(4, @madb.fetch_number2)    
-    assert_raise(NoMethodError) { @madb.number2 }    
-  end
-
-  def test_get_attributes_via_dynamicmbeaninterface
-    @madb.set_number1 4
-    @madb.name1 = "Name"
-
-    assert_equal(@madb.name1, @madb.getAttribute("name1").get_value.to_s)
-    assert_equal(@madb.number1, @madb.getAttribute("number1").get_value)    
-    atts = ["name1", "number1"]
-    retrieved = @madb.getAttributes(atts)
-    assert_equal(2, retrieved.length)
-    #TODO: assertion comparing the types in teh array to java types
-  end
-  
-  def test_set_attributes_via_dynamicbeaninterface
-    @madb.name1 = "blue"
-    red = java.lang.String.new("red")
-    attribute = javax.management.Attribute.new("name1", red)
-    @madb.setAttribute(attribute)
-
-    assert_equal("String", @madb.name1.class.to_s )
-    assert_equal("red", @madb.name1)
-  end
-  
-  def test_set_multiple_attributes_via_dynamicbeaninterface
-    @madb.name1 = "blue"
-    three = java.lang.Integer.new(3)
-    red = java.lang.String.new("red")
-    attribute1 = javax.management.Attribute.new("name1", red)
-    attribute2 = javax.management.Attribute.new("number2", three)
-    
-    @madb.setAttributes([attribute1, attribute2])    
-    assert_equal("red", @madb.name1)
-    assert_equal(3, @madb.fetch_number2)
-  end
-  
-end
-
-$:.unshift File.join(File.dirname(__FILE__),'..','lib')
-
-require 'test/unit'
-require 'rmi'
-require 'jmx'
-
-
-class MyAttributeDynamicBean < RubyDynamicMBean
-  rw_attribute :name1, :string, "My sample attribute"
-  r_attribute :number1, :int, "My sample integer based attribute that is read only"
-  w_attribute :number2, :int, "My sample integer based attribute that is write only"
-
-  def intialize(type, text)
-    super(type,text)
-  end
-  def set_number1(val)
-    @number1 = val
-  end
-  
-  def fetch_number2
-    @number2
-  end
-end
 
 class JMXAttributeTest < Test::Unit::TestCase
-  
+
   def setup
     @madb = MyAttributeDynamicBean.new("test.MyTestBean","Mwahahahahahah")    
   end
@@ -154,3 +74,4 @@ class JMXAttributeTest < Test::Unit::TestCase
   end
   
 end
+

data/test/jmx_notification_test.rb

@@ -0,0 +1,29 @@
+$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+
+require 'test/unit'
+require 'rmi'
+require 'jmx'
+
+class MyAttributeDynamicBean < RubyDynamicMBean
+  rw_attribute :name1, :string, "My sample attribute"
+  r_attribute :number1, :int, "My sample integer based attribute that is read only"
+  w_attribute :number2, :int, "My sample integer based attribute that is write only"
+
+  def intialize(type, text)
+    super(type,text)
+  end
+  def set_number1(val)
+    @number1 = val
+  end
+  
+  def fetch_number2
+    @number2
+  end
+end
+
+
+
+#interface NotificationEmitter
+#v addNotificationListener listener, filter, handback
+#MBEanNotificationInfo getNotificationInfo
+#v removeNotificationListener listener, filter, handback

data/test/jmx_server_test.rb

@@ -68,4 +68,17 @@ class JMXServerTest < Test::Unit::TestCase
     assert_equal("hehheh", bean.string_double("heh"))
     assert_equal("123", bean.concat([1,2,3]))
   end
+  def test_ruby_mbean_twice
+    dyna = MyDynamicMBean.new("domain.MySuperBean", "Heh")
+    domain = @server.default_domain
+    @server.unregister_mbean "#{domain}:type=MyDynamicMBean"
+    @server.register_mbean dyna, "#{domain}:type=MyDynamicMBean"        
+    # Get bean from client connector connection
+    bean = @client["#{domain}:type=MyDynamicMBean"]
+    assert_equal("foo", bean.foo)
+    assert_equal(6, bean.double(3))
+    assert_raise(TypeError) { puts bean.double("HEH") }
+    assert_equal("hehheh", bean.string_double("heh"))
+    assert_equal("123", bean.concat([1,2,3]))
+  end
 end

data/test/object_name_test.rb

@@ -0,0 +1,12 @@
+$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+require "test/unit"
+
+require "jmx"
+
+class TestObjectName < Test::Unit::TestCase
+  def test_create_object_name
+    MObjectName.ancestors.each {|method| p method}
+    x = MObjectName.new "foo:d=bar"
+    assert_not_nil(x)
+  end
+end

metadata

@@ -1,69 +1,71 @@
 --- !ruby/object:Gem::Specification 
-name: jmx
-version: !ruby/object:Gem::Version 
-  version: "0.2"
-platform: ruby
-authors: 
-- Thomas Enebo
-autorequire: 
-bindir: bin
-cert_chain: []
-
-date: 2008-07-28 00:00:00 +09:00
-default_executable: 
-dependencies: []
-
-description: Install this gem and require 'jmx' to load the library.
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - '>='
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 email: enebo@acm.org
-executables: []
-
-extensions: []
+cert_chain: []
 
+summary: Package for interacting/creating Java Management Extensions
+post_install_message: 
 extra_rdoc_files: 
 - Manifest.txt
 - README.txt
 - LICENSE.txt
+homepage: http://jruby-extras.rubyforge.org/jmx
+signing_key: 
+name: jmx
+rdoc_options: 
+- --main
+- README.txt
+autorequire: 
+rubyforge_project: jruby-extras
+executables: []
+
+description: Install this gem and require 'jmx' to load the library.
+specification_version: 2
+default_executable: 
 files: 
 - Manifest.txt
 - Rakefile
 - README.txt
 - LICENSE.txt
 - lib/jmx
+- lib/jmx.rb
+- lib/rmi.rb
 - lib/jmx/dynamic_mbean.rb
 - lib/jmx/server.rb
 - lib/jmx/version.rb
-- lib/jmx.rb
-- lib/rmi.rb
 - samples/memory.rb
 - test/jmx_attribute_test.rb
 - test/jmx_client_test.rb
+- test/jmx_notification_test.rb
 - test/jmx_server_test.rb
-has_rdoc: true
-homepage: http://jruby-extras.rubyforge.org/jmx
-post_install_message: 
-rdoc_options: 
-- --main
-- README.txt
-require_paths: 
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+- test/object_name_test.rb
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version 
       version: "0"
   version: 
+extensions: []
+
+rubygems_version: 1.3.1
 requirements: []
 
-rubyforge_project: jruby-extras
-rubygems_version: 1.0.1
-signing_key: 
-specification_version: 2
-summary: Package for interacting/creating Java Management Extensions
+authors: 
+- Thomas Enebo
+date: 2008-11-21 05:00:00 +00:00
+platform: ruby
 test_files: []
 
+version: !ruby/object:Gem::Version 
+  version: "0.3"
+require_paths: 
+- lib
+dependencies: []
+
+bindir: bin
+has_rdoc: true