torquebox-lite 0.1.1 → 0.1.2

data/bin/torquebox-lite

@@ -19,7 +19,6 @@
 
 require 'fileutils'
 require 'rubygems'
-gem 'thor', '0.14.6'
 
 require 'thor'
 require 'torquebox-rake-support'
@@ -34,10 +33,12 @@ class TorqueBoxLiteCommand < Thor
   method_option 'extra', :aliases => '-e', :type => :string, :desc => 'Extra options to pass through to JBoss AS, you will need to escape dashes with \ (e.g. \--help)'
   method_option 'max-threads', :type => :numeric, :desc => "Maximum number of HTTP threads"
   method_option 'bind-address', :aliases => '-b', :type => :string, :desc => "IP address to bind to"
-  method_option 'port', :aliases => '-p', :type => :numeric, :desc => "HTTP port to listen on"
+  method_option 'port', :aliases => '-p', :type => :numeric, :default => 8080, :desc => "HTTP port to listen on"
   method_option 'node-name', :type => :string, :desc => 'Override the name of the node (which by default is the hostname)'
   method_option 'port-offset', :type => :numeric, :desc => 'Offset all port numbers listened on by TorqueBox Lite by this number'
   method_option 'jvm-options', :aliases => '-J', :type => :string, :desc => 'Pass options on to the JVM'
+  method_option 'min-runtimes', :type => :numeric, :default => 1, :desc => 'Min. JRuby runtimes'
+  method_option 'max-runtimes', :type => :numeric, :default => 1, :desc => 'Max. JRuby runtimes'
   def start
     setup_environment
     run_server(:max_threads => options['max-threads'],
@@ -47,7 +48,9 @@ class TorqueBoxLiteCommand < Thor
                :pass_through => options['extra'],
                :node_name => options['node-name'],
                :data_directory => options['data-directory'],
-               :jvm_options => options['jvm-options'])
+               :jvm_options => options['jvm-options'],
+               :min_runtimes => options['min-runtimes'],
+               :max_runtimes => options['max-runtimes'])
   end
 
   no_tasks {
@@ -84,13 +87,7 @@ class TorqueBoxLiteCommand < Thor
       FileUtils.mkdir_p(base_dir)
       FileUtils.mkdir_p(deploy_dir)
 
-      opts = {:root => Dir.pwd, :dest_dir => deploy_dir}
-      descriptor = TorqueBox::DeployUtils.basic_deployment_descriptor(opts)
-      deployed_name = TorqueBox::DeployUtils.deploy_yaml(descriptor, opts).first
-      failed_file = File.join(deploy_dir, "#{deployed_name}.failed")
-      if File.exists?(failed_file)
-        FileUtils.rm(failed_file)
-      end
+      create_deployment_descriptor(options, deploy_dir)
 
       options[:pass_through] ||= ''
       options[:pass_through] << " -Djboss.server.base.dir=#{base_dir}"
@@ -107,6 +104,33 @@ class TorqueBoxLiteCommand < Thor
       end
     end
 
+    def create_deployment_descriptor(options, deploy_dir)
+      opts = {:root => Dir.pwd, :dest_dir => deploy_dir}
+      descriptor = TorqueBox::DeployUtils.basic_deployment_descriptor(opts)
+      min_runtimes = options[:min_runtimes]
+      max_runtimes = options[:max_runtimes]
+      if min_runtimes != 1 && max_runtimes != 1
+        if max_runtimes < 1
+          $stderr.puts 'ERROR: max_runtimes must be greater than 0'
+          exit 1
+        end
+        if max_runtimes < min_runtimes
+          $stderr.puts 'ERROR: max_runtimes must be greater than min_runtimes'
+          exit 1
+        end
+        descriptor['pooling'] = {}
+        descriptor['pooling']['web'] = {}
+        descriptor['pooling']['web']['lazy'] = false
+        descriptor['pooling']['web']['min'] = min_runtimes
+        descriptor['pooling']['web']['max'] = max_runtimes
+      end
+      deployed_name = TorqueBox::DeployUtils.deploy_yaml(descriptor, opts).first
+      failed_file = File.join(deploy_dir, "#{deployed_name}.failed")
+      if File.exists?(failed_file)
+        FileUtils.rm(failed_file)
+      end
+    end
+
     def strip_jvm_properties_from_jruby_opts
       jruby_opts = ENV['JRUBY_OPTS']
       return '' if jruby_opts.nil?
@@ -115,7 +139,7 @@ class TorqueBoxLiteCommand < Thor
       properties.each do |property|
         if property =~ /^-J.+/
           jvm_properties << property.sub(/-J/, '')
-          ENV['JRUBY_OPTS'] = ENV['JRUBY_OPTS'].sub(property, '')
+          ENV['JRUBY_OPTS'] = ENV['JRUBY_OPTS'].sub(property, '').strip
         end
       end
       jvm_properties.join(' ')

data/jboss/bin/standalone.conf

@@ -47,7 +47,7 @@ fi
 # Specify options to pass to the Java VM.
 #
 if [ "x$JAVA_OPTS" = "x" ]; then
-   JAVA_OPTS="-Xms64m -Xmx512m -XX:MaxPermSize=128m -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000"
+   JAVA_OPTS="-Xms64m -Xmx512m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000"
    JAVA_OPTS="$JAVA_OPTS -Djboss.modules.system.pkgs=$JBOSS_MODULES_SYSTEM_PKGS -Djava.awt.headless=true"
    JAVA_OPTS="$JAVA_OPTS -Djboss.server.default.config=standalone.xml"
 else

data/jboss/bin/standalone.conf.bat

@@ -46,7 +46,7 @@ rem # options that are always passed by run.bat.
 rem #
 
 rem # JVM memory allocation pool parameters - modify as appropriate.
-set "JAVA_OPTS=-Xms64M -Xmx512M -XX:MaxPermSize=128m"
+set "JAVA_OPTS=-Xms64M -Xmx512M -XX:MaxPermSize=256M"
 
 rem # Reduce the RMI GCs to once per hour for Sun JVMs.
 set "JAVA_OPTS=%JAVA_OPTS% -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Djava.net.preferIPv4Stack=true"

data/jboss/standalone/configuration/standalone.xml

@@ -110,7 +110,11 @@
                 <alias name='localhost'/>
                 <alias name='example.com'/>
             </virtual-server>
+            <configuration>
+                <jsp-configuration disabled='true'/>
+            </configuration>
         </subsystem>
+        <subsystem xmlns='urn:jboss:domain:torquebox-bootstrap:1.0'/>
         <subsystem xmlns='urn:jboss:domain:torquebox-core:1.0'/>
         <subsystem xmlns='urn:jboss:domain:torquebox-web:1.0'/>
     </profile>

metadata

@@ -2,7 +2,7 @@
 name: torquebox-lite
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
   - The TorqueBox Team
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-07 00:00:00 -04:00
+date: 2012-09-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -52,7 +52,7 @@ dependencies:
     requirement: &id004 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - "="
+        - - ">="
           - !ruby/object:Gem::Version 
             version: 0.14.6
     type: :runtime