rboss 0.2.4 → 0.3.0

data/README.md

@@ -220,15 +220,31 @@ Use an array with the services to remove, the current supported are:
 * Admin Console       => :admin_console
 * Web Console         => :web_console
 * Mail Service        => :mail
-* Bsh Deployer        => :bsh_deployer
+* BeanShell           => :bean_shell
 * Hot Deploy          => :hot_deploy
-* JUDDI               => :juddi
+* UDDI                => :uddi
 * UUID Key Generator  => :key_generator
 * Scheduling          => :scheduling
 * JMX Console         => :jmx_console
 * JBoss WS            => :jboss_ws
 * JMX Remoting        => :jmx_remoting
 * ROOT Page           => :root_page
+* Management          => :management
+* IIOP                => :iiop
+* JBoss Web           => :jboss_web
+* SNMP                => :snmp
+* Profile Service     => :profile
+* EJB3                => :ejb3
+* EJB2                => :ejb2
+* JMX Invoker         => :jmx_invoker
+* HA HTTP Invoker     => :ha_http_invoker
+* Legacy Invoker      => :legacy_invoker
+* Transaction         => :transaction
+* Remoting            => :remoting
+* Properties Service  => :properties
+* Database/Datasource => :database
+* JSR-88              => :jsr88
+* XNIO                => :xnio
 
 Any slimmed service will be removed logically by using a ".rej" suffix in the files/directories.
 

data/bin/jboss-profile

@@ -38,7 +38,7 @@ end
 opts.on('-t', '--type TYPE', 'Defines the JBoss Type (org, eap, soa_p, epp)') do |type|
   params[:type] = type.to_sym
 end
-opts.on('-v', '--version VERSION', 'Defines the JBoss version (5, 6, 5.1, ...)') do |version|
+opts.on('-n', '--version VERSION', 'Defines the JBoss version (5, 6, 5.1, ...)') do |version|
   params[:version] = version
 end
 opts.on('-b', '--base-profile PROFILE', 'Defines the base profile') do |profile|
@@ -61,13 +61,25 @@ opts.on('-c', '--config-file FILE', 'Defines the configuration file for the inst
     end
   end
 end
-opts.on('-d', '--debug', '--verbose', 'Displays shell commands') do
-  include FileUtils::Verbose
-  params[:log_level] = Logger::DEBUG
-end
 opts.on("--encrypt PASSWORD", "Encrypts the given password for using with a SecureIdentityLoginModule") do |password|
   params[:encrypt] = password
 end
+opts.on("--slim SERVICES", "--slimming SERVICES", Array, "Slim the desired JBoss profile") do |services|
+  params[:slimming] = services
+end
+opts.on("--restore SERVICES", Array, "Restores slimmed services in the desired JBoss profile") do |services|
+  params[:restore] = services
+  create = false
+end
+opts.on("--this", "Defines the current dir as the profile folder and update mode") do
+  params[:jboss_home] = File.dirname(File.dirname(Dir.pwd))
+  params[:profile] = Dir.pwd.split('/')[-1]
+  create = false
+end
+opts.on('-v', '--verbose', 'Displays shell commands') do
+  include FileUtils::Verbose
+  params[:log_level] = Logger::DEBUG
+end
 opts.on("-h", "--help", "Shows this help message") { puts opts; exit }
 opts.parse!(ARGV) rescue abort 'Invalid Option! Use --help or -h for usage help.'
 
@@ -79,8 +91,16 @@ end
 params[:jboss_home] ||= Dir.pwd unless ENV["JBOSS_HOME"]
 profile = JBoss::Profile::new params
 
+if params[:slimming]
+  profile.slim *params[:slimming]
+end
+
+if params[:restore]
+  profile.add :restore, *params[:restore]
+end
+
 if params[:encrypt]
-  puts "Encrypted password: " + profile.jboss.encrypt(params.delete :encrypt)
+  puts "Encrypted password: " + profile.jboss.encrypt(params[:encrypt])
   exit
 end
 
@@ -88,7 +108,7 @@ if config
   config.each do |var|
     if var.is_a? Hash
       var.each do |key, value|
-        key = key.to_sym if key.is_a? String
+        key = key.gsub(/-/, '_').to_sym if key.is_a? String
         profile.add key, value
       end
     else

data/bin/twiddle

@@ -24,6 +24,7 @@
 
 require_relative '../lib/rboss'
 require 'optparse'
+require 'logger'
 require 'yaml'
 require 'fileutils'
 
@@ -131,6 +132,9 @@ end
 opts.on('-p', '--password PASSWORD', 'Defines the JMX Password') do |password|
   params[:password] = password
 end
+opts.on('-v', '--verbose', 'Shows the twiddle commands before execution') do
+  params[:log_level] = Logger::DEBUG
+end
 opts.on("-h", "--help", "Shows this help message") do
   puts opts; exit
 end
@@ -139,8 +143,6 @@ opts.parse!(ARGV) rescue abort 'Invalid Option! Use --help or -h for usage help.
 twiddle = JBoss::Twiddle::Invoker::new params
 monitor = twiddle.monitor
 
-no_process = mbeans.empty? and commands.empty?
-
 if save
   config = load_yaml
   config[save] ||= {}
@@ -154,15 +156,7 @@ if save
   f = File.open(@servers_file, 'w')
   YAML::dump(config, f)
   f.close
-  if no_process
-    puts "Configuration saved!"
-    exit
-  end
-end
-
-if no_process
-  puts opts
-  exit
+  puts "Configuration saved!"
 end
 
 def extract resource
@@ -177,6 +171,8 @@ def normalize args
   end
 end
 
+puts opts if mbeans.empty? and commands.empty?
+
 if commands[:set]
   array = commands[:set]
   raise "Wrong number of arguments" if array.size != 3
@@ -219,7 +215,6 @@ if commands[:info]
                     :args => normalize(array[1..-1])
 end
 
-
 mbeans.each do |mbean_id, resources|
   puts "  - #{defaults[mbean_id][:description]}"
   if resources.is_a? TrueClass

data/lib/rboss/components/component.rb

@@ -24,6 +24,8 @@ require_relative "../file_processor"
 require_relative "../jboss_path"
 require_relative "../utils"
 
+require 'yaml'
+
 module JBoss
 
   # A base helper module for JBoss Components
@@ -48,5 +50,9 @@ module JBoss
       FileProcessor::new :logger => @logger, :var => @jboss
     end
 
+    def load_yaml resource
+      YAML::load_file File::join(File.dirname(__FILE__), "#{resource}.yaml")
+    end
+
   end
 end

data/lib/rboss/components/jbossweb.rb

@@ -27,7 +27,7 @@ require "rexml/document"
 include REXML
 
 module JBoss
-  class Web
+  class JBossWeb
     include Component
 
     def defaults
@@ -53,7 +53,9 @@ module JBoss
         :https => {
           :addres => "${jboss.bind.address}",
           :port => 8443,
+          :protocol => "HTTP/1.1",
           :scheme => "https",
+          'SSLEnabled' => true,
           :secure => true,
           :ssl_protocol => "TLS",
           :client_auth => false,

data/lib/rboss/components/restore_slimming.rb

@@ -0,0 +1,46 @@
+#                         The MIT License
+#
+# Copyright (c) 2011 Marcelo Guimarães <ataxexe@gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require_relative 'slimming'
+
+module JBoss
+  # A class for restore slimmed services in a JBoss profile
+  #
+  # Configuration:
+  #
+  # See the JBoss::Slimming class for supported services
+  #
+  # author: Marcelo Guimarães <ataxexe@gmail.com>
+  class Restore < JBoss::Slimming
+
+    def log service
+      @logger.info "Enabling #{service}"
+    end
+
+    def handle file
+      file = "#{@jboss.profile}/" + file unless file.start_with? '/'
+      mv(file + ".rej", file) if File.exist?(file + ".rej")
+    end
+
+  end
+
+end

data/lib/rboss/components/run_conf.rb

@@ -77,7 +77,7 @@ module JBoss
     end
 
     def parse_config
-      map = YAML::load File.open(File::join(File.dirname(__FILE__), "run_conf.yaml"))
+      map = load_yaml "run_conf"
 
       (@config.find_all { |key, value| map.has_key? key.to_s }).each do |key, value|
         @jvm_args << "-D#{map[key.to_s]}=#{value}"

data/lib/rboss/components/slimming.rb

@@ -32,91 +32,74 @@ module JBoss
   #   Admin Console       => :admin_console
   #   Web Console         => :web_console
   #   Mail Service        => :mail
-  #   Bsh Deployer        => :bsh_deployer
+  #   BeanShell           => :bean_shell
   #   Hot Deploy          => :hot_deploy
-  #   JUDDI               => :juddi
+  #   UDDI                => :uddi
   #   UUID Key Generator  => :key_generator
   #   Scheduling          => :scheduling
   #   JMX Console         => :jmx_console
   #   JBoss WS            => :jboss_ws
   #   JMX Remoting        => :jmx_remoting
   #   ROOT Page           => :root_page
-  #
-  # Each service is binded to a remove_$SERVICE_ID method so you can easily add
-  # more services by modifying this class
+  #   Management          => :management
+  #   IIOP                => :iiop
+  #   JBoss Web           => :jboss_web
+  #   SNMP                => :snmp
+  #   Profile Service     => :profile
+  #   EJB3                => :ejb3
+  #   EJB2                => :ejb2
+  #   JMX Invoker         => :jmx_invoker
+  #   HA HTTP Invoker     => :ha_http_invoker
+  #   Legacy Invoker      => :legacy_invoker
+  #   Transaction         => :transaction
+  #   Remoting            => :remoting
+  #   Properties Service  => :properties
+  #   Database/Datasource => :database
+  #   JSR-88              => :jsr88
+  #   XNIO                => :xnio
   #
   # author: Marcelo Guimarães <ataxexe@gmail.com>
   class Slimming
     include Component, FileUtils
 
     def configure services_to_remove
-      @services_to_remove = services_to_remove
+      @services_to_remove = services_to_remove.is_a?(Array) ? services_to_remove : [services_to_remove]
+      @mapping = {}
+      load_yaml('slimming').each do |key, values|
+        @mapping[key.to_sym] = values
+      end
     end
 
     def process
       @services_to_remove.each do |service|
-        message = "remove_#{service}".to_sym
-        @logger.info "Removing #{service}"
-        self.send message
+        log service
+        slim service
       end
     end
 
-    def remove_hot_deploy
-      reject("#{@jboss.profile}/deploy/hdscanner-jboss-beans.xml")
-    end
-
-    def remove_juddi
-      reject("#{@jboss.profile}/deploy/juddi-service.sar")
-    end
-
-    def remove_key_generator
-      reject("#{@jboss.profile}/deploy/uuid-key-generator.sar")
-    end
-
-    def remove_mail
-      reject("#{@jboss.profile}/deploy/mail-ra.rar")
-      reject("#{@jboss.profile}/deploy/mail-service.xml")
-    end
-
-    def remove_scheduling
-      reject("#{@jboss.profile}/deploy/scheduler-manager-service.xml")
-      reject("#{@jboss.profile}/deploy/scheduler-service.xml")
-    end
-
-    def remove_bsh_deployer
-      reject("#{@jboss.profile}/deployers/bsh.deployer")
-    end
-
-    def remove_jboss_ws
-      reject("#{@jboss.profile}/conf/jax-ws-catalog.xml")
-      reject("#{@jboss.profile}/conf/props/jbossws-users.properties")
-      reject("#{@jboss.profile}/conf/props/jbossws-roles.properties")
-      reject("#{@jboss.profile}/deploy/jbossws.sar")
-      reject("#{@jboss.profile}/deployers/jbossws.deployer")
-    end
-
-    def remove_jmx_console
-      reject("#{@jboss.profile}/deploy/jmx-console.war")
-    end
-
-    def remove_admin_console
-      reject("#{@jboss.profile}/deploy/admin-console.war")
-    end
-
-    def remove_web_console
-      reject("#{@jboss.profile}/deploy/management")
-    end
-
-    def remove_jmx_remoting
-      reject("#{@jboss.profile}/deploy/jmx-remoting.sar")
+    def slim service
+      sym = service.to_s.gsub(/-/, '_').to_sym
+      entry = @mapping[sym]
+      method = "remove_#{service}".to_sym
+      if respond_to? method
+        self.send method
+      elsif entry
+        entry.each do |file|
+          handle file if file.is_a? String
+          slim file if file.is_a? Symbol
+        end
+      else
+        raise "Unrecognized service: #{service}"
+      end
     end
 
-    def remove_root_page
-      reject("#{@jboss.profile}/deploy/ROOT.war")
+    def log service
+      @logger.info "Disabling #{service}"
     end
 
-    def reject file
-      mv(file, file + ".rej")
+    def handle file
+      file = "#{@jboss.profile}/" + file unless file.start_with? '/'
+      mv(file, file + ".rej") if File.exist? file
     end
 
   end

data/lib/rboss/components/slimming.yaml

@@ -0,0 +1,110 @@
+hot_deploy:
+    - deploy/hdscanner-jboss-beans.xml
+
+uddi:
+    - deploy/juddi-service.sar
+
+key_generator:
+    - deploy/uuid-key-generator.sar
+
+mail:
+    - deploy/mail-ra.rar
+    - deploy/mail-service.xml
+
+scheduling:
+    - deploy/scheduler-manager-service.xml
+    - deploy/scheduler-service.xml
+
+bean_shell:
+    - deployers/bsh.deployer
+
+jboss_ws:
+    - conf/jax-ws-catalog.xml
+    - conf/props/jbossws-users.properties
+    - conf/props/jbossws-roles.properties
+    - deploy/jbossws.sar
+    - deployers/jbossws.deployer
+
+jmx_console:
+    - deploy/jmx-console.war
+
+admin_console:
+    - deploy/admin-console.war
+
+web_console:
+    - deploy/management
+
+jmx_remoting:
+    - deploy/jmx-remoting.sar
+
+root_page:
+    - deploy/ROOT.war
+
+management:
+    - :admin_console
+    - :web_console
+    - :root_page
+    - :jmx_console
+    - deploy/monitoring-service.xml
+
+iiop:
+    - deploy/iiop-service.xml
+
+jboss_web:
+    - deploy/jbossweb.sar
+    - deployers/jbossweb.deployer
+
+snmp:
+    - deploy/snmp-adaptor.sar
+
+profile:
+    - deploy/profileservice-jboss-beans.xml
+
+ejb3:
+
+    - deploy/ejb3-connectors-jboss-beans.xml
+    - deploy/ejb3-container-jboss-beans.xml
+    - deploy/ejb3-interceptors-aop.xml
+    - deploy/ejb3-timerservice-jboss-beans.xml
+    - deploy/quartz-ra.rar
+    - deployers/ejb3.deployer
+    - deployers/ejb3-deployers-jboss-beans.xml
+    - deployers/jboss-ejb3-endpoint-deployer.jar
+    - deployers/jboss-ejb3-metrics-deployer.jar
+
+ejb2:
+    - deploy/ejb2-container-jboss-beans.xml
+    - deploy/ejb2-timer-service.xml
+    - deployers/ejb-deployer-jboss-beans.xml
+
+jmx_invoker:
+    - jmx-invoker-service.xml
+
+ha_http_invoker:
+    - deploy/httpha-invoker.sar
+
+legacy_invoker:
+    - deploy/legacy-invokers-service.xml
+
+transaction:
+    - deploy/transaction-jboss-beans.xml
+    - deploy/transaction-service.xml
+
+remoting:
+    - deploy/remoting-jboss-beans.xml
+
+properties:
+    - deploy/properties-service.xml
+
+database:
+    - deploy/hsqldb-ds.xml
+    - deploy/jboss-local-jdbc.rar
+    - deploy/jboss-xa-jdbc.jar
+    - deploy/sqlexception-service.xml
+
+jsr88:
+    - deploy/jsr88-service.xml
+
+xnio:
+    - deploy/xnio-provider.jar
+    - deployers/xnio.deployer

data/lib/rboss/jboss_path.rb

@@ -42,6 +42,7 @@ module JBoss
       @profile_name = params[:profile].to_s
       @type = params[:type]
       @version = params[:version]
+      @logger = params[:logger]
     end
 
     def to_s
@@ -62,7 +63,9 @@ module JBoss
 
     # Encrypts the given password using the SecureIdentityLoginModule
     def encrypt password
-      encrypted = `java -cp #{jboss_logging_lib_path}:#{jbosssx_lib_path} org.jboss.resource.security.SecureIdentityLoginModule #{password}`
+      command = "java -cp #{jboss_logging_lib_path}:#{jbosssx_lib_path} org.jboss.resource.security.SecureIdentityLoginModule #{password}"
+      @logger.debug command if @logger
+      encrypted = `#{command}`
       encrypted.chomp.split(/:/)[1].strip
     end
 

data/lib/rboss/jboss_profile.rb

@@ -123,7 +123,7 @@ module JBoss
       @logger = @opts[:logger]
       unless @logger
         @logger = Logger::new STDOUT
-        @logger.level = opts[:log_level] if opts[:log_level]
+        @logger.level = opts[:log_level] || Logger::INFO
         formatter = Logger::Formatter.new
 
         def formatter.call(severity, time, program_name, message)
@@ -137,7 +137,8 @@ module JBoss
       @jboss = JBoss::Path::new @jboss_home,
         :profile => @profile,
         :type => @opts[:type],
-        :version => @opts[:version]
+        :version => @opts[:version],
+        :logger => @logger
       initialize_components
     end
 
@@ -299,9 +300,9 @@ module JBoss
                  :path => "#{@base_dir}/resources/mod_cluster.sar",
                }
 
-      register :jboss_web,
+      register :jbossweb,
 
-               :type => JBoss::Web,
+               :type => JBoss::JBossWeb,
                :priority => @@setup
 
       register :run_conf,
@@ -324,6 +325,11 @@ module JBoss
                :type => JBoss::Slimming,
                :priority => @@post_setup
 
+      register :restore,
+
+               :type => JBoss::Restore,
+               :priority => @@post_setup + 5
+
       register :init_script,
 
                :type => JBoss::ServiceScript,

data/lib/rboss/twiddle/twiddle.rb

@@ -20,6 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'logger'
+
 module JBoss
   module Twiddle
     class Invoker
@@ -47,6 +49,19 @@ module JBoss
         @password = params[:password]
 
         @command = "#{@jboss_home}/bin/twiddle.sh -s #{@server} -u '#{@user}' -p '#{@password}'"
+
+        @logger = params[:logger]
+        unless @logger
+          @logger = Logger::new STDOUT
+          @logger.level = params[:log_level] || Logger::INFO
+          formatter = Logger::Formatter.new
+
+          def formatter.call(severity, time, program_name, message)
+            "#{severity} : #{message}\n"
+          end
+
+          @logger.formatter = formatter
+        end
       end
 
       def home
@@ -58,7 +73,9 @@ module JBoss
       end
 
       def execute command, *arguments
-        result = `#{shell command, arguments}`.chomp
+        exec = shell command, arguments
+        @logger.debug exec
+        result = `#{exec}`.chomp
         return nil if result["ERROR [Twiddle] Command failure"]
         result
       end

data/lib/rboss/version.rb

@@ -21,5 +21,5 @@
 # THE SOFTWARE.
 
 module RBoss
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

data/test/jbossweb_test.rb

@@ -0,0 +1,101 @@
+#                         The MIT License
+#
+# Copyright (c) 2011 Marcelo Guimarães <ataxexe@gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require_relative 'test_helper'
+
+class JBossWebTest < Test::Unit::TestCase
+
+  def test_http_connector
+    for_test_with :all do |profile|
+      profile.add :jbossweb,
+                  :connectors => {
+                    :http => {
+                      :max_threads => 600
+                    }
+                  }
+    end
+
+    for_assertions_with :all do |jboss|
+      xml = xml(jboss)
+      max_threads = XPath::first xml, "//Connector[@port='8080'][@protocol='HTTP/1.1'][@maxThreads='600']"
+      assert max_threads
+    end
+
+    do_test
+  end
+
+  def test_https_connector
+    for_test_with :all do |profile|
+      profile.add :jbossweb,
+                  :connectors => {
+                    :https => {
+                      :max_threads => 600
+                    }
+                  }
+    end
+
+    for_assertions_with :all do |jboss|
+      xml = xml(jboss)
+      max_threads = XPath::first xml, "//Connector[@port='8443'][@protocol='HTTP/1.1'][@maxThreads='600']"
+      assert max_threads
+    end
+
+    do_test
+  end
+
+  def test_ajp_connector
+    for_test_with :all do |profile|
+      profile.add :jbossweb,
+                  :connectors => {
+                    :ajp => {
+                      :max_threads => 600
+                    }
+                  }
+    end
+
+    for_assertions_with :all do |jboss|
+      xml = xml(jboss)
+      max_threads = XPath::first xml, "//Connector[@port='8009'][@protocol='AJP/1.3'][@maxThreads='600']"
+      assert max_threads
+    end
+
+    do_test
+  end
+
+
+  def test_engine
+    for_test_with :all do |profile|
+      profile.add :jbossweb,
+                  :jvm_route => 'route'
+    end
+    for_assertions_with :all do |jboss|
+      xml = xml(jboss)
+      jvm_route = XPath::first xml, "//Engine[@name='jboss.web'][@jvmRoute='route']"
+      assert jvm_route
+    end
+  end
+
+  def xml(jboss)
+    REXML::Document::new File::new("#{jboss.profile}/deploy/jbossweb.sar/server.xml")
+  end
+
+end

data/test/mbean_test.rb

@@ -27,9 +27,11 @@ class MBeanTest < Test::Unit::TestCase
 
   def twiddle
     twiddle = Object.new
-    def twiddle.invoke command, *args
+
+    def twiddle.execute command, *args
       "#{command} #{args.join " "}".strip
     end
+
     twiddle
   end
 
@@ -46,8 +48,8 @@ class MBeanTest < Test::Unit::TestCase
 
   def test_invoke
     mbean = JBoss::MBean::new :pattern => 'jboss.system:type=Server', :twiddle => twiddle
-    assert_equal "invoke jboss.system:type=Server shutdown", mbean.shutdown
-    assert_equal "invoke jboss.system:type=Server traceInstructions true", mbean.traceInstructions(true)
+    assert_equal "invoke jboss.system:type=Server shutdown", mbean.invoke(:shutdown)
+    assert_equal "invoke jboss.system:type=Server traceInstructions true", mbean.invoke(:traceInstructions, true)
   end
 
 end

data/test/test_helper.rb

@@ -34,10 +34,9 @@ module TestHelper
 
   def all
     @all ||= {
-      :org => [5.1, 6.0],
-      :eap => [5.0, 5.1],
-      :soa_p => 5,
-      :epp => 5.1
+      :org => [5.1],
+      :eap => [5.1],
+      :soa_p => 5
     }
     @all
   end
@@ -93,9 +92,14 @@ module TestHelper
                                   :profile => :rboss,
                                   :logger => @logger
     @jboss = @jboss_profile.jboss
-    blocks[:configure].call @jboss_profile
-    @jboss_profile.create
-    blocks[:assertion].call @jboss
+    block = blocks[:configure]
+    if block
+      block.call @jboss_profile
+      puts "Creating #{type} #{version}"
+      @jboss_profile.create
+      puts "Running assertion block"
+      blocks[:assertion].call @jboss
+    end
   end
 
   def create_file_processor

data/test/test_suite.rb

@@ -24,12 +24,13 @@ require 'test/unit'
 require 'test/unit/testsuite'
 require_relative 'deploy_folder_test'
 require_relative 'datasource_test'
+require_relative 'jbossweb_test'
 require_relative 'mbean_test'
 
 class TestSuite < Test::Unit::TestSuite
 
   def initialize
-    self << DeployFolderTest << DatasourceTest << MBeanTest
+    self << DeployFolderTest << DatasourceTest << JBossWebTest << MBeanTest
   end
 
 end

metadata

@@ -2,7 +2,7 @@
 name: rboss
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors: 
 - Ataxexe
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-06 00:00:00 Z
+date: 2011-09-29 00:00:00 Z
 dependencies: []
 
 description: |-
@@ -45,10 +45,12 @@ files:
 - lib/rboss/components/org/jmx.rb
 - lib/rboss/components/profile_folder.rb
 - lib/rboss/components/resource.rb
+- lib/rboss/components/restore_slimming.rb
 - lib/rboss/components/run_conf.rb
 - lib/rboss/components/run_conf.yaml
 - lib/rboss/components/service_script.rb
 - lib/rboss/components/slimming.rb
+- lib/rboss/components/slimming.yaml
 - lib/rboss/components/soa-p/hypersonic_replacer.rb
 - lib/rboss/components/soa-p/jmx.rb
 - lib/rboss/components/xadatasource.rb
@@ -69,6 +71,7 @@ files:
 - rboss.gemspec
 - test/datasource_test.rb
 - test/deploy_folder_test.rb
+- test/jbossweb_test.rb
 - test/mbean_test.rb
 - test/test_helper.rb
 - test/test_suite.rb
@@ -102,6 +105,7 @@ summary: A Ruby way to do a JBoss work!
 test_files: 
 - test/datasource_test.rb
 - test/deploy_folder_test.rb
+- test/jbossweb_test.rb
 - test/mbean_test.rb
 - test/test_helper.rb
 - test/test_suite.rb